changeset 9082:761f6129730e

[gaim-migrate @ 9858] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 27 May 2004 04:03:05 +0000
parents 68712f777fa4
children 2185ced3b087
files po/ChangeLog po/fi.po
diffstat 2 files changed, 3322 insertions(+), 1944 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu May 27 03:36:21 2004 +0000
+++ b/po/ChangeLog	Thu May 27 04:03:05 2004 +0000
@@ -7,6 +7,7 @@
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (British) translation updated (Luke Ross (lukeross))
 	* English (Canadian) translation added (Adam Weinberger)
+	* Finnish translation updated (Arto Alakulju)
 	* French translation updated (Eric Boumaour)
 	* German Translation updated (Bjoern Voigt)
 	* Portuguese translation updated (Duarte Serrano Goncalves Henriques)
--- a/po/fi.po	Thu May 27 03:36:21 2004 +0000
+++ b/po/fi.po	Thu May 27 04:03:05 2004 +0000
@@ -7,10 +7,10 @@
 # NOTE gftt is http://gnome-fi.sourceforge.net/
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.77\n"
+"Project-Id-Version: gaim 0.78\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
-"PO-Revision-Date: 2004-04-21 06:41+0300\n"
+"POT-Creation-Date: 2004-05-24 21:09-0400\n"
+"PO-Revision-Date: 2004-05-26 18:44+0300\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "Virheilmoitusten vaimennus"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "Piilota yhteydenkatkaisu-virheilmoitukset"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "Piilota sisäänkirjautumis-virheet"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -25,7 +37,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "Uudelleenyhdistäjä"
 
@@ -33,7 +45,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kun yhteys palvelimelle katkeaa, tämä luo yhteyden uudelleen."
 
@@ -152,20 +164,22 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: 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:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: 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:5440
+#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Poissa"
 
 # src/menus.c:327
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
 msgid "Back"
 msgstr "Palaa"
 
@@ -175,16 +189,15 @@
 msgstr "Vaimenna äänet"
 
 # NOTE source: gnomeicu
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "Tiedostosiirtot"
 
-#. 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 "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -405,15 +418,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:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: 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 "Ei mitään"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 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 "Nimi"
 
@@ -428,13 +441,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
 msgid "Search"
 msgstr "Etsi"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4312
 msgid "Group:"
 msgstr "Ryhmä:"
 
@@ -473,27 +486,27 @@
 msgid "_Associate Buddy"
 msgstr "_Assosioi tuttava"
 
-#: 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:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: 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 "Tuttavat"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:352
 msgid "Evolution Integration Configuration"
 msgstr "Evolution -integrointiasetukset"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:355
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit joihin tuttavat lisätään automaattisesti."
 
-#: 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 "Tili"
 
@@ -504,7 +517,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:466
 msgid "Evolution Integration"
 msgstr "Evolution integrointi"
 
@@ -512,7 +525,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 "Mahdollistaa integroinnin Ximian Evolution:in kanssa."
 
@@ -539,7 +552,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 "Tuttavakuvake"
 
@@ -555,15 +568,15 @@
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "Historia"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Näyttää osan edellistä keskustelua uudessa keskustelussa."
 
-#: 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."
@@ -590,35 +603,28 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
 
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "Joutoaika"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "Aseta"
-
-# please check (load the Idle plugin and check the text. I don't think)
-# this sentence (the previous string, this, plus the next) makes sense)
-# - checked it and makes sense
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "Jouten"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "minuuttia."
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "Minuuttia"
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "Joutenoloajan säätö"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "Aseta tilin joutenoloaika"
 
 # src/menus.c:280
-#: plugins/idle.c:96
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "_Aseta"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "Joutenoloajan säätö"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:793
+msgid "_Cancel"
+msgstr "_Peruuta"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten."
 
@@ -869,7 +875,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:554
 msgid "Signals Test"
 msgstr "Signaalitesti"
 
@@ -877,7 +883,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 "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
 
@@ -990,7 +996,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:910
 #, c-format
 msgid "%s has gone away."
 msgstr "%s on poissa."
@@ -1032,11 +1038,11 @@
 msgstr ""
 "Ilmoittaa keskusteluikkunassa kun tuttava on poissa/jouten ja kun hän palaa."
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-plugin lataaja"
 
-#: 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 "Mahdollistaa Tcp-pluginien latauksen."
 
@@ -1067,6 +1073,10 @@
 msgid "Delay"
 msgstr "Viive"
 
+#: plugins/timestamp.c:109
+msgid "minutes."
+msgstr "minuuttia."
+
 # NOTE source: dia
 #: plugins/timestamp.c:115
 msgid "_Apply"
@@ -1093,34 +1103,34 @@
 
 # NOTE source: gimp
 #: 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 "Peitto:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
 msgstr "Pikaviesti-keskusteluikkunat"
 
 # NOTE source: gimp + google
 # XXX
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
 msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
 # NOTE source: gimp + google
 # XXX
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
 msgstr "_Tuttavalistaikkunan läpinäkyvyys"
 
@@ -1133,24 +1143,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:466
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:468
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"Tämä plugin mahdollistaa alpha-läpinäkyvyyden keskusteluikkunoissa.\n"
+"Tämä plugin mahdollistaa alpha-läpinäkyvyyden keskusteluikkunoissa sekä "
+"tuttavalistassa.\n"
 "\n"
-"HUOM: Tämä plugin vaatiin Win2000 tai WinXP:n."
+"HUOM: Tämä plugin vaatii Win2000 tai WinXP:n."
 
 #: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
@@ -1166,8 +1181,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
+#: src/gtkprefs.c:2503
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1186,8 +1201,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
+#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1203,16 +1218,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Spesifiset asetukset Windows Gaimille."
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: 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 "
@@ -1223,323 +1238,350 @@
 "protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:aa ja on lisensoitu "
 "GPL:n mukaisesti.<BR><BR>"
 
-#: src/about.c:104
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
 # NOTE source: 0.59.8
-#: src/about.c:109
+#: src/about.c:110
 msgid "Active Developers"
 msgstr "Aktiiviset kehittäjät"
 
 # NOTE source: 0.59.8
-#: src/about.c:110
+#: src/about.c:111
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: src/about.c:115
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "Kehittäjä & verkkosivujen ylläpitäjä"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "win32 port"
 msgstr "win32 käännös"
 
 # NOTE source: 0.59.8 (plural -> singular)
-#: 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 "kehittäjä"
 
-#: src/about.c:122
+#: src/about.c:124
 msgid "support"
 msgstr "tuki"
 
-#: src/about.c:129
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:144
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:145
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:146
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:149
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "entinen ylläpitäjä"
 
-#: src/about.c:150
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "entinen Jabber-ylläpitäjä"
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:154
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri sekä määrätty kuljettaja [laiska pummi]"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
 # NOTE source: netscape
-#: src/about.c:163 src/about.c:197
+#: src/about.c:165 src/about.c:202
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:164 src/about.c:198
+#: src/about.c:166 src/about.c:203
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/about.c:165
+#: src/about.c:167
 msgid "Danish"
 msgstr "Tanska"
 
-#: src/about.c:166
+#: src/about.c:168
 msgid "British English"
 msgstr "Brittienglanti"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:169
+msgid "Canadian English"
+msgstr "Kanadan Englanti"
+
+#: src/about.c:170 src/about.c:204
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:171 src/about.c:205
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:172 src/about.c:206
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:173 src/about.c:207
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:171
+#: src/about.c:174
+msgid "Hebrew"
+msgstr "Heprea"
+
+#: src/about.c:175
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:172
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:177 src/about.c:208
 msgid "Italian"
 msgstr "Italia"
 
 # NOTE source: netscape
-#: src/about.c:174 src/about.c:206
+#: src/about.c:178 src/about.c:210
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:175
+#: src/about.c:179
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
-#: src/about.c:176
+#: src/about.c:180
 msgid "Macedonian"
 msgstr "Makedonia"
 
 # NOTE source: netscape
-#: src/about.c:177
+#: src/about.c:181
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:178 src/about.c:207
+#: src/about.c:182 src/about.c:211
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:179
+#: src/about.c:183
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:180
+#: src/about.c:184
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:181
+#: src/about.c:185
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:186 src/about.c:212
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:183
+#: src/about.c:187
 msgid "Serbian"
 msgstr "Serbia"
 
-#: src/about.c:184 src/about.c:210
+# NOTE source: netscape
+#: src/about.c:188
+msgid "Slovenian"
+msgstr "Sloveeni"
+
+#: src/about.c:189 src/about.c:214
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: src/about.c:185
+#: src/about.c:190
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: src/about.c:185
+#: src/about.c:190
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi-työryhmä"
 
 # XXX source: netscape + google
-#: src/about.c:186
+#: src/about.c:191
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:187
+#: src/about.c:192
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
-#: src/about.c:194
+#: src/about.c:199
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: src/about.c:195
+#: src/about.c:200
 msgid "Amharic"
 msgstr "Amhara"
 
-#: src/about.c:196
+#: src/about.c:201
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "Heprea"
-
-#: src/about.c:205
+#: src/about.c:209
 msgid "Japanese"
 msgstr "Japani"
 
 # NOTE source: netscape
-#: src/about.c:209
+#: src/about.c:213
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:211
+#: src/about.c:215
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:278 src/protocols/jabber/jabber.c:998
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: src/account.c:288
+#: src/account.c:287
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: src/account.c:313
+#: src/account.c:312
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: src/account.c:327
+#: src/account.c:326
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/account.c:333
+#: src/account.c:332
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: src/account.c:341
+#: src/account.c:340
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 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:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: 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:3331 src/protocols/oscar/oscar.c:3425
+#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
+#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: 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:345 src/account.c:383 src/connection.c:199 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:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 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/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:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: 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: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: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:3291
+#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
+#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
+#: src/protocols/silc/buddy.c:1126 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 "Peruuta"
 
-#: src/account.c:374
+#: src/account.c:373
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
 # src/menus.c:280
-#: src/account.c:382 src/dialogs.c:839 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 "Tallenna"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "Poissa!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "Olen palannut!"
 
-#: src/away.c:375
-msgid "New Away Message"
-msgstr "Uusi poissaoloviesti"
-
-#: src/away.c:395
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Oletko varma että haluat poistaa poissaoloviestin \"%s\"?"
+
+#: src/away.c:332 src/away.c:423
 msgid "Remove Away Message"
 msgstr "Poista poissaoloviesti"
 
-#: src/away.c:590
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
+#: src/gtkrequest.c:241
+msgid "Remove"
+msgstr "Poista"
+
+#: src/away.c:403
+msgid "New Away Message"
+msgstr "Uusi poissaoloviesti"
+
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:590 src/gtkprefs.c:2506
 msgid "Chats"
 msgstr "Chatit"
 
@@ -1558,110 +1600,117 @@
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: 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:2159
+#: 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 "Tuntematon"
 
-#: src/blist.c:1578
+#: src/blist.c:1579
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmänimi"
 
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr "Virhe jäsenneltäessä tuttavalistaa. Sitä ei ole ladattu."
+#: 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~."
+msgstr ""
+"Tuttavalistan kokoamisessa tapahtui virhe. Sitä ei ladattu ja vanha tiedosto "
+"on siirretty tiedostoon blist.xml~."
 
 # XXX probably better than forming yet another new compound?
-#: src/blist.c:2222
+#: src/blist.c:2239
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
-#: 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 "%s-protokollaplugin puuttuu"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Rekisteröintivirhe"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
 # XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:296
+#: src/conversation.c:293
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:304
+#: src/conversation.c:301
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1969
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1972
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:2064
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2112
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2185
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2467
+#: src/conversation.c:2487
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
 # XXX
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2489 src/gtkprefs.c:1438
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2491
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2493
 msgid "By account"
 msgstr "Tilin mukaan"
 
+#: src/conversation.c:2495
+msgid "By conversation count"
+msgstr "Keskustelujen määrän mukaan"
+
 #: src/dialogs.c:154
 msgid "Warn User"
 msgstr "Varoita käyttäjää"
@@ -1738,11 +1787,11 @@
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
 msgid "_Screen name"
 msgstr "_Näyttönimi"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
@@ -1763,75 +1812,78 @@
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Syötä sen henkilön näyttönimi, jonka tiedot haluat nähdä."
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "Valitse tekstin väri"
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "Valitse taustaväri"
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "Valitse kirjasin"
-
-#: src/dialogs.c:692
+#: src/dialogs.c:575
+msgid "Get User Log"
+msgstr "Hae käyttäjäloki"
+
+#: src/dialogs.c:577
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
+
+#: src/dialogs.c:632
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviestiä tyhjällä otsikolla"
 
-#: src/dialogs.c:694
+#: src/dialogs.c:634
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Anna viestille otsikko, tai valitse \"Käytä\" käyttääksesi tallentamatta."
 
-#: src/dialogs.c:704
+#: src/dialogs.c:644
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:706
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:727
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:843
-msgid "Save & Use"
-msgstr "Tallenna ja käytä"
-
-#: src/dialogs.c:847
-msgid "Use"
-msgstr "Käytä"
-
-#: src/dialogs.c:868
+# src/menus.c:280
+#: src/dialogs.c:781
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: src/dialogs.c:785
+msgid "Sa_ve & Use"
+msgstr "Tallenna ja _käytä"
+
+#: src/dialogs.c:789
+msgid "_Use"
+msgstr "_Käytä"
+
+#: src/dialogs.c:811
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:812
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: 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:885
+#: src/dialogs.c:828
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:829
 msgid "Enter an alias for this contact."
 msgstr "Anna alias tälle kontaktiryhmälle."
 
 # XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
-#: src/dialogs.c:903
+#: src/dialogs.c:846
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: src/dialogs.c:905
+#: src/dialogs.c:848
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
@@ -1943,19 +1995,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Hetkisen poissa."
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:372 src/gaimrc.c:1411
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1221 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1223 src/gtkblist.c:2961
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1225 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
@@ -1979,7 +2031,7 @@
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
@@ -1987,7 +2039,7 @@
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2050,7 +2102,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -2066,15 +2118,15 @@
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:937 src/gtkprefs.c:1233
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:946 src/gtkprefs.c:1263
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:950 src/gtkprefs.c:1281
 msgid "_Port:"
 msgstr "_Portti:"
 
@@ -2082,7 +2134,7 @@
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:963 src/gtkprefs.c:1318
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
@@ -2104,7 +2156,7 @@
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
 msgid "Register"
 msgstr "Rekisteröi"
 
@@ -2117,14 +2169,15 @@
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:6620 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 "Linjoilla"
 
@@ -2156,97 +2209,89 @@
 msgstr "Lisää tuttava listalle?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: 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:3588
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
-"ryhmäkeskustelua."
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:812
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:833
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Anna tiedot chatistä johon haluat liittyä.\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1132 src/gtkblist.c:3152
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1135 src/gtkblist.c:3143
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1137
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1139
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: 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 "_Poista"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1197
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1199
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1201
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. 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 "_Liity"
 
 # XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1249 src/gtkblist.c:1278
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1283
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#: 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 ""
@@ -2254,126 +2299,134 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2292
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2293
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2294
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2295
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2296
+msgid "/Buddies/View User _Log..."
+msgstr "/Tuttavat/Näytä käyttäjä_loki..."
+
+#: src/gtkblist.c:2298
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2299
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2301
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2302
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2304
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2305
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2308
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2309
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2310
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/Työkalut/P_rotokollatoiminnot"
-
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2311
+msgid "/Tools/Account Ac_tions"
+msgstr "/Työkalut/_Käyttäjätilitoiminnot"
+
+#: src/gtkblist.c:2312
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Työkalut/_Liitännäistoiminnot"
+
+#: src/gtkblist.c:2314
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2315
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirtot..."
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2316
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Chat-huone_lista"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2317
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2318
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2323
 msgid "/_Help"
 msgstr "/_Ohje"
 
 # XXX fuzzy tag accidentally removed before it was ready :-(
 # XXX but the bot on #finnish seems to say the original fuzzy is correct
 # XXX note: http://www.tt-tori.fi/atk-sanakirja/ lists "Suoraohje" (n.)
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2324
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2325
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2326
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2343
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2371
 #, c-format
 msgid ""
 "\n"
@@ -2382,16 +2435,20 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>Tila:</b> Poissa linjoilta"
-
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2435
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>Tila:</b> Poissa linjoilta"
+
+#: src/gtkblist.c:2450
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2399,7 +2456,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2407,7 +2464,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2415,7 +2472,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2423,7 +2480,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2431,7 +2488,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> "
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2439,7 +2496,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2447,7 +2504,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2455,7 +2512,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2475
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2463,7 +2520,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2471,78 +2528,97 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2747
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2749
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2754
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2757
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
-#: src/gtkblist.c:3032
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2875
+msgid "/Buddies/Join a Chat..."
+msgstr "/Tuttavat/Liity Chattiin..."
+
+#: src/gtkblist.c:2878
+msgid "/Tools/Room List"
+msgstr "/Työkalut/Chat-lista"
+
+#: src/gtkblist.c:2881
+msgid "/Tools/Privacy"
+msgstr "/Työkalut/Yksityisyys"
+
+#: src/gtkblist.c:3026
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3029
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/Työkalut/Protokollatoiminnot"
+#: src/gtkblist.c:3032
+msgid "/Tools/Account Actions"
+msgstr "/Työkalut/Käyttäjätilitoiminnot"
+
+#: src/gtkblist.c:3035
+msgid "/Tools/Plugin Actions"
+msgstr "/Työkalut/Liitännäistoiminnot"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3123
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/_Tuttavat/Näytä poissaolevat tuttavat"
-
-#: src/gtkblist.c:3128
+msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
+
+#: src/gtkblist.c:3125
 msgid "/Buddies/Show Empty Groups"
-msgstr "/_Tuttavat/Näytä tyhjät ryhmät"
-
-#: src/gtkblist.c:3152
+msgstr "/Tuttavat/Näytä tyhjät ryhmät"
+
+#: src/gtkblist.c:3149
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
+#: src/gtkblist.c:3158
+msgid "Get information on the selected buddy"
+msgstr "Hae tietoja valitusta tuttavasta"
+
 #: src/gtkblist.c:3161
-msgid "Get information on the selected buddy"
-msgstr "Hae tietoja valitusta tuttavasta"
-
-#: src/gtkblist.c:3164
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3166
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3169
 msgid "_Away"
 msgstr "_Poissa"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3174
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
+#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
+#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3932
+#: 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. "
@@ -2553,15 +2629,23 @@
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:3993 src/gtkblist.c:4278
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4237
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
+"ryhmäkeskustelua."
+
+#: src/gtkblist.c:4244
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:4266
+#: 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"
@@ -2569,15 +2653,15 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4347
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4348
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4915 src/gtkblist.c:5012
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
@@ -2634,467 +2718,474 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: src/gtkconv.c:190
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: 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 "Haluatko ylikirjoittaa sen?"
 
-#: src/gtkconv.c:505
+#: src/gtkconv.c:554
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: 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."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:603
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:574
+#: src/gtkconv.c:623
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:731 src/gtkdebug.c:127
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:757 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1135
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1143
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1145 src/gtkprefs.c:783
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1154 src/gtkconv.c:3361
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1163
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "Poista"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2255
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2260
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2266
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2635
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2643
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2746
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3123
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3140
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3142
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3147
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3149
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3152
+msgid "/Conversation/Clear"
+msgstr "/Keskustelu/Tyhjennä"
+
+#: src/gtkconv.c:3156
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3162
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3167
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3169
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3173
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3178
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3180
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3185
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3189
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3190
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3191
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3192
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3234
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3239
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3245
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3249
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3253
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3259
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3249
-msgid "/Conversation/Block..."
-msgstr "/Keskustelu/Estä..."
-
-#: src/gtkconv.c:3253
-msgid "/Conversation/Add..."
-msgstr "/Keskustelu/Lisää..."
-
-#: src/gtkconv.c:3257
-msgid "/Conversation/Remove..."
-msgstr "/Keskustelu/Poista..."
-
 #: src/gtkconv.c:3263
+msgid "/Conversation/Block..."
+msgstr "/Keskustelu/Estä..."
+
+#: src/gtkconv.c:3267
+msgid "/Conversation/Add..."
+msgstr "/Keskustelu/Lisää..."
+
+#: src/gtkconv.c:3271
+msgid "/Conversation/Remove..."
+msgstr "/Keskustelu/Poista..."
+
+#: src/gtkconv.c:3277
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3281
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Liitä kuva..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3287
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3290
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3293
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
 msgid "Send"
 msgstr "Lähetä"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3333
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3336
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
 #. 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 "Estä"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3343
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3350
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3357
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3364 src/gtkconv.c:3708
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3439
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3442
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3449
 msgid "Add the chat to your buddy list"
 msgstr "Lisää chat tuttavalistalle"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3456
 msgid "Remove the chat from your buddy list"
 msgstr "Poista chat tuttavalistalta"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3566
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3630
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3685
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3697
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4252
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: 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 ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5503 src/gtkconv.c:5506
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "Tallenna Debug-loki"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "Testausikkuna"
 
 # NOTE source: kde-fi.org
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "Tauko"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
 msgstr "Aikaleimat"
 
 # NOTE source (kt): galeon
-#: src/gtkft.c:135
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
 msgstr "Valmis"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "Odotetaan lähetyksen alkamista"
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
 msgstr "Ohjelmaa tämän tiedostotyypin avaamiseen ei ole asetettu."
 
-#: src/gtkft.c:391
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
 msgstr "Virhe tapahtui avattaessa tiedostoa."
 
-#: src/gtkft.c:482
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "Valmiina"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "Koko"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "Tila:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
 msgstr "Aikaa kulunut:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:537
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
 msgstr "Pidä tiedonsiirtoikkuna _auki"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
 msgstr "Näytä tiedostosiirron yksityiskohdat"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:668
 msgid "Hide transfer details"
 msgstr "Piilota tiedostosiirron yksityiskohdat"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "Peruutettu"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole."
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ei voida lähettää tiedostoa jonka koko on 0 tavua."
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1122
 msgid "That file already exists."
 msgstr "Tiedosto on jo olemassa."
 
-#: src/gtkft.c:1131
+#. Open file selector to select the public key.
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
 msgid "Open..."
 msgstr "Avaa..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: src/gtkft.c:1216
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
 
-#: src/gtkft.c:1220
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3105,19 +3196,31 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: src/gtkimhtml.c:1139
+#: src/gtkimhtml.c:559
+msgid "Pa_ste As Text"
+msgstr "_Liimaa tekstinä"
+
+#: src/gtkimhtml.c:1004
+msgid "Hyperlink color"
+msgstr "Hyperlinkin väri"
+
+#: src/gtkimhtml.c:1005
+msgid "Color to draw hyperlinks."
+msgstr "Väri jolla piirretään hyperlinkit"
+
+#: src/gtkimhtml.c:1211
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1223
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1233
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2667
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3125,34 +3228,42 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2675
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2684
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2707
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "Valitse kirjasin"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "Valitse tekstin väri"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "Valitse taustaväri"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "Lisää linkki"
-
-#: 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."
@@ -3160,67 +3271,79 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Syötä URL jonka haluat liittää."
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "Lisää linkki"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:473
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:499
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
+#: src/gtkimhtmltoolbar.c:638
+msgid "This theme has no available smileys."
+msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:653
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:871
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:882
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:893
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:909
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:921
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:938
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:950
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:962
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:977
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:987
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:998
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
@@ -3229,7 +3352,7 @@
 msgstr "Keskustelut:"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:370 src/gtklog.c:386
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
@@ -3242,17 +3365,17 @@
 msgstr[1] "%s:lla on %d uutta viestiä."
 
 # NOTE: source: balsa
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Lähettäjä:</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\">Aihe:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3263,7 +3386,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"
@@ -3274,185 +3397,185 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" ei kelpaa."
 
-#: 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 "Ei kyetty avaamaan 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 "Virhe käynnistettäessä \"%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 "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:144
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:193
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:406 src/gtkpounce.c:846
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
 # XXX probably partitive?
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:406
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:424
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 # XXX
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
+#: src/gtkpounce.c:451
+msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:475
 msgid "Pounce When"
 msgstr "Ilmoitetaan kun"
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:483 src/main.c:296
 msgid "_Sign on"
 msgstr "_Kirjautuu sisään"
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:485
 msgid "Sign _off"
 msgstr "Kirjautuu _ulos"
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:487
 msgid "A_way"
 msgstr "_Poissa"
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:489
 msgid "Re_turn from away"
 msgstr "Palaa oltuaan _poissa"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:491
 msgid "_Idle"
 msgstr "_Jouten"
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:493
 msgid "Retur_n from idle"
 msgstr "Palaa oltuaan _jouten"
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:495
 msgid "Buddy starts _typing"
 msgstr "T_uttava alkaa kirjoittaa"
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:497
 msgid "Buddy stops t_yping"
 msgstr "Tuttava lope_ttaa kirjoittamisen"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:526
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:533
 msgid "Op_en an IM window"
 msgstr "_Avaa pikaviesti-ikkuna"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:534
 msgid "_Popup notification"
 msgstr "_Ponnahdus-ilmoitus"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:535
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:536
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:537
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:541
 msgid "B_rowse..."
 msgstr "_Selaa"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:543
 msgid "Bro_wse..."
 msgstr "_Selaa"
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:544
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:627
 msgid "Sav_e this pounce after activation"
 msgstr "_Säilytä tämä ilmoitin aktivoinnin jälkeen"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:853
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:903
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s alkoi kirjoittaa"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:904
 #, c-format
 msgid "%s has signed on"
 msgstr "%s on kirjautunut sisään"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:905
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s on palannut oltuaan jouten"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:906
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s on palannut oltuaan poissa"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:907
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s on lopettanut kirjoittamisen sinulle"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:908
 #, c-format
 msgid "%s has signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:909
 #, c-format
 msgid "%s has become idle"
 msgstr "%s on jouten"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:911
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
-#: src/gtkprefs.c:399
+#: src/gtkprefs.c:406
 msgid "Interface Options"
 msgstr "Rajapintavalinnat"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:408
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Näytä palvelimelle tallennettu lempinimi jos aliasta ei ole asetettu"
 
-#: src/gtkprefs.c:595
+#: 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."
@@ -3460,425 +3583,332 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 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 "Kuvaus"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "Tyyli"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "_Lihavoi"
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr "_Kursivoi"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "_Alleviivaa"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "_Yliviivaa"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "Kirjasin tyyppi"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "Valitse _kirjasin"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "Valitse k_oko"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "Väri"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "_Tekstin väri"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "T_austaväri"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:775 src/gtkprefs.c:1114
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "Näytä graafiset _hymiöt"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:776
 msgid "Show _timestamp on messages"
 msgstr "Näytä _aikaleimat viesteissä"
 
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "Näytä _URL:t linkkeinä"
-
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:779
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:784
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:786
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:788
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:791
+msgid "_Ignore formatting on incoming messages"
+msgstr "_Sivuuta muotoilut tulevissa viesteissä"
+
+#: src/gtkprefs.c:795
+msgid "Default Formatting"
+msgstr "Oletusmuotoilu"
+
+#: src/gtkprefs.c:797
+msgid "_Send default formatting with outgoing messages"
+msgstr "_Lähetä oletusmuotoilu lähetettävien viestien mukana"
+
+#: src/gtkprefs.c:829
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr "Tältä ulosmenevä viesti näyttää kun käytät protokollaa joka tukee muotoiluja. :)"
+
+#: src/gtkprefs.c:832
+msgid "_Clear Formatting"
+msgstr "_Tyhjennä muotoilu"
+
+#: src/gtkprefs.c:869
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:870
 msgid "Enter _sends message"
 msgstr "\"Enter\" _lähettää viestin"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:872
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" lähettää viestin"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:875
 msgid "Window Closing"
 msgstr "Ikkunan sulkeminen"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:876
 msgid "_Escape closes window"
 msgstr "\"_Escape\" sulkee ikkunan"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:879
 msgid "Insertions"
 msgstr "Lisäykset"
 
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "\"Control-{B/I/U}\" lisää _HTML-tageja"
-
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:880
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} muuttaa tekstimuotoiluja"
+
+#: src/gtkprefs.c:882
 msgid "Control-(number) _inserts smileys"
-msgstr "\"Control-(numero)\" _lisää hymiön"
+msgstr "Control-(numero) _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:898
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:907
 msgid "_Sorting:"
 msgstr "_Järjestys:"
 
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr "Tuttavalistan työkalurivi"
-
 # NOTE 0.59.8
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "Ryhmien näyttö"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "Näytä _määrät ryhmissä"
-
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:923
 msgid "Buddy Display"
 msgstr "Tuttavien näyttö"
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+#: src/gtkprefs.c:924 src/gtkprefs.c:1074
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:926
 msgid "Show _warning levels"
 msgstr "Näytä _varoitustasot"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:930
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:969
 msgid "_Placement:"
 msgstr "_Sijoitus:"
 
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr "Lähetä _URL:t linkkeinä"
-
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:976
+msgid "Number of conversations per window"
+msgstr "Keskustelujen määrä per ikkuna"
+
+#: src/gtkprefs.c:985
 msgid "Show _formatting toolbar"
 msgstr "Näytä _muotoilu-työkalurivi"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:988
 msgid "Show a_liases in tabs/titles"
 msgstr "Näytä a_liakset välilehdissä/otsikoissa"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:947
-msgid "_Tab Placement:"
-msgstr "_Välilehtien sijoitus:"
-
-#: src/gtkprefs.c:949
-msgid "Top"
-msgstr "Ylhäällä"
-
-#: src/gtkprefs.c:950
-msgid "Bottom"
-msgstr "Alhaalla"
-
-#: src/gtkprefs.c:951
-msgid "Left"
-msgstr "Vasemmalla"
-
-#: src/gtkprefs.c:952
-msgid "Right"
-msgstr "Oikealla"
-
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:993
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
 # NOTE difference from above from 0.59.8/0.60
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:996
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:1006
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr "Näytä tila-ikoni välilehdissä"
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
+#: src/gtkprefs.c:1019
+msgid "_Tab Placement:"
+msgstr "_Välilehtien sijoitus:"
+
+#: src/gtkprefs.c:1021
+msgid "Top"
+msgstr "Ylhäällä"
+
+#: src/gtkprefs.c:1022
+msgid "Bottom"
+msgstr "Alhaalla"
+
+#: src/gtkprefs.c:1023
+msgid "Left"
+msgstr "Vasemmalla"
+
+#: src/gtkprefs.c:1024
+msgid "Right"
+msgstr "Oikealla"
+
+#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
 msgid "Window"
 msgstr "Ikkuna"
 
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr "Uuden ikkunan _leveys:"
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr "Uuden ikkunan _korkeus:"
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr "Kirjoitu_salueen korkeus:"
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
-msgstr "Piilota ikkuna _lähetettäessä"
-
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1073
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/gtkprefs.c:1034
+#: src/gtkprefs.c:1076
 msgid "Enable buddy icon a_nimation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "Näytä _sisäänkirjautumiset ikkunassa"
-
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:1079
 msgid "Typing Notification"
 msgstr "Kirjoitusilmoitus"
 
-#: src/gtkprefs.c:1042
-msgid "Notify buddies that you are _typing to them"
-msgstr "Ilmoita tuttaville kun _kirjoitat heille"
-
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr "\"Tab\"-täydennys"
-
 #: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr "\"_Tab\"-täydennys lempinimille"
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr "_Vanhantyylinen \"Tab\"-täydennys"
-
-#: src/gtkprefs.c:1086
-msgid "_Show people joining in window"
-msgstr "_Näytä ihmisten saapuminen ikkunassa"
-
-#: src/gtkprefs.c:1088
-msgid "_Show people leaving in window"
-msgstr "_Näytä ihmisten poistuminen ikkunassa"
-
-#: src/gtkprefs.c:1090
+msgid "Notify buddies that you are _typing to them"
+msgstr "Ilmoita tuttaville kun _kirjoitat heille"
+
+#: src/gtkprefs.c:1115
 msgid "Co_lorize screen names"
 msgstr "_Väritä näyttönimet"
 
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4811
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1138
 msgid "_Autodetect IP Address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1147
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1171
 msgid "Ports"
 msgstr "Portit"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1174
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1177
 msgid "_Start Port:"
 msgstr "_Ensimmäinen portti:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1184
 msgid "_End Port:"
 msgstr "Viimeinen _portti:"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1232
 msgid "Proxy Type"
 msgstr "Välityspalvelimen tyyppi"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1235
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1242
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1300
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1356
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1357
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1358
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1359
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1360
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1361
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1362
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1363
 msgid "Gnome Default"
 msgstr "Gnome oletus"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1372
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1423
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1427
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1434
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1436
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1437
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1439
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3887,84 +3917,80 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1490
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1468
-msgid "Log _Format:"
-msgstr "Loki_formaatti:"
-
-#: src/gtkprefs.c:1471
-msgid "_Log all instant messages"
-msgstr "Kirjaa kaikki pikaviestit _lokiin"
-
-#: src/gtkprefs.c:1473
-msgid "Log all c_hats"
-msgstr "Kirjaa kaikki _keskustelut lokiin"
-
-#: src/gtkprefs.c:1476
-msgid "System Logs"
-msgstr "Järjestelmälokit"
-
-#: src/gtkprefs.c:1478
-msgid "_Enable system log"
-msgstr "Ota järjestelmäloki _käyttöön"
-
-#: src/gtkprefs.c:1481
-msgid "Log when buddies _sign on/sign off"
-msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
-
-#: src/gtkprefs.c:1487
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
-
 #: src/gtkprefs.c:1493
+msgid "Log _Format:"
+msgstr "Loki_formaatti:"
+
+#: src/gtkprefs.c:1496
+msgid "_Log all instant messages"
+msgstr "Kirjaa kaikki pikaviestit _lokiin"
+
+#: src/gtkprefs.c:1498
+msgid "Log all c_hats"
+msgstr "Kirjaa kaikki _keskustelut lokiin"
+
+#: src/gtkprefs.c:1501
+msgid "System Logs"
+msgstr "Järjestelmälokit"
+
+#: src/gtkprefs.c:1503
+msgid "_Enable system log"
+msgstr "Ota järjestelmäloki _käyttöön"
+
+#: src/gtkprefs.c:1506
+msgid "Log when buddies _sign on/sign off"
+msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
+
+#: src/gtkprefs.c:1512
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
+
+#: src/gtkprefs.c:1518
 msgid "Log when buddies go away/come _back"
 msgstr "Kirjaa lokiin tuttavien poistumiset/_palaamiset"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1524
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Kirjaa lokiin _omat sisäänkirjautumiset/joutenolot/poissaolot"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1570
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1551
-msgid "Sounds when you _log in"
-msgstr "_Äänet kun kirjaudut sisään"
-
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1571
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1573
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1577
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1578
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1580
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1582
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1589
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1599
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3973,75 +3999,62 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr "Viestien _lähettäminen poistaa poissaolotilan"
-
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1646
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1649
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr "Sekunteja ennen _uudelleenlähetystä:"
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1650
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1652
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
-# XXX
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr "Lähetä automaattista vastausta _aktiivisissa keskusteluissa"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
-#: 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:3969
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Idle"
 msgstr "Jouten"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1656
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1659
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1662
 msgid "X usage"
 msgstr "X:n käyttö"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1664
 msgid "Windows usage"
 msgstr "Windows:n käyttö"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1672
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1673
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1677
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1685
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1760
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4056,7 +4069,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1765
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4071,111 +4084,107 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:1998
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:2012
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2060
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2187
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2294
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2301
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:2321
+#: src/gtkprefs.c:2320
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/gtkprefs.c:2325
+#: src/gtkprefs.c:2324
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:2329
+#: src/gtkprefs.c:2328
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2463
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 # XXX This seems to be what is actually in use (e.g., dia) instead of the gftt one
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2499
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2500
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2502
-msgid "Fonts"
-msgstr "Kirjasimet"
-
 # XXX
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2501
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2504
+#: src/gtkprefs.c:2502
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
+#: src/gtkprefs.c:2505
+msgid "IMs"
+msgstr "Pikaviestit"
+
 #: src/gtkprefs.c:2507
-msgid "IMs"
-msgstr "Pikaviestit"
-
-#: src/gtkprefs.c:2509
 msgid "Network"
 msgstr "Verkko"
 
-#: src/gtkprefs.c:2510
+#: src/gtkprefs.c:2508
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2511
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2513
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2514
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2515
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:2518
+#: src/gtkprefs.c:2516
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2519
+#: src/gtkprefs.c:2517
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2520
 msgid "Protocols"
 msgstr "Protokollat"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2521
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -4199,64 +4208,64 @@
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
 # XXX
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: 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 "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "Salli"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:594
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -4264,13 +4273,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "Ei"
 
@@ -4279,23 +4290,17 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
+#: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-"Et ole kirjautuneena millään protokollalla jolla voisi listata chat-huoneita."
-
-#: src/gtkroomlist.c:335
+#: src/gtkroomlist.c:328
 msgid "Room List"
 msgstr "Huonelista"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:397
 msgid "_Get List"
 msgstr "_Hae lista"
 
@@ -4339,12 +4344,12 @@
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi chatissä"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
 
-#: 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."
@@ -4352,7 +4357,7 @@
 "Äänen soito ei onnistu. 'Komento'-metodi on valittu mutta komentoa ei ole "
 "asetettu."
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4360,11 +4365,11 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: src/gtkutils.c:133
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
 msgstr "Ikonitiedostoa ei voida tallentaa levylle."
 
-#: src/gtkutils.c:168
+#: src/gtkutils.c:184
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
@@ -4372,11 +4377,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</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-"
@@ -4385,7 +4390,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&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-"
@@ -4394,50 +4399,55 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&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>Lokin hakemistopolkua ei löydy!</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>Ei voitu lukea tiedostoa: %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 <AUTOMAATTIVASTAUS>: %s\n"
 
-#: src/log.c:845
+#: src/log.c:856
 msgid "Plain text"
 msgstr "Teksti"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "Luo uusi käyttäjätili"
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "Sisäänkirjautuminen"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>Näyttönimi:</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>Salasana:</b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "Kirjaudu"
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>Käyttäjätili:</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>_Salasana:</b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "_Käyttäjätilit"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "_Asetukset"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4472,12 +4482,12 @@
 "   -h, --help           näytä tämä viesti ja poistu\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. Kirjoita '%s -h' saadaksesi lisää tietoja.\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 "
@@ -4485,11 +4495,11 @@
 msgstr ""
 "Vaadittu liitännäinen %s puuttuu. Ole hyvä ja asenna se ja yritä uudelleen."
 
-#: 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 ei kyennyt lataamaan liitännäistäsi."
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu plugin %s ei latautunut."
@@ -4499,12 +4509,12 @@
 msgstr "Hieman vähemmän tylsä oletusviesti"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 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:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
-#: 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 "Tavoitettavissa"
 
@@ -4516,12 +4526,12 @@
 msgid "Away for friends only"
 msgstr "Poissa vain ystäville"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
+#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4537,7 +4547,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Ei kyetty selvittämään isännän nimeä."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
@@ -4564,122 +4574,123 @@
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:407
 msgid "Could not connect"
 msgstr "Yhteyttä ei kyetty muodostamaan"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:414
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 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:199
+#: 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 "Yhteyden muodostaminen epäonnistui."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:617
 msgid "Reading data"
 msgstr "Luetaan tietoja"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:620
 msgid "Balancer handshake"
 msgstr "Tasapainottajan kättely"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:623
 msgid "Reading server key"
 msgstr "Luetaan palvelinavainta"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:626
 msgid "Exchanging key hash"
 msgstr "Vaihdetaan avaimen hash-arvoa"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:636
 msgid "Critical error in GG library\n"
 msgstr "Kriittinen virhe GG-kirjastossa\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/toc/toc.c:175
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:702
 msgid "Unable to ping server"
 msgstr "Palvelinta ei kyetty pingaamaan"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:714
 msgid "Send as message"
 msgstr "Lähetä viestinä"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:719
 msgid "Looking up GG server"
 msgstr "Etsitään GG-palvelinta"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:722
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Epäkelpo Gadu-Gadu-UIN ilmoitettu"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:769
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Yrität lähettää viestiä epäkelvolle Gadu-Gadu-UIN:lle!"
 
 # src/message.c:76
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "Ei kyetty noutamaan hakutuloksia"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-hakukone"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:865
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
+#: src/protocols/gg/gg.c:903
 msgid "Sex"
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Kunta"
@@ -4687,52 +4698,52 @@
 # XXX need to check for gradation problems
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
-#: 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:3781 src/protocols/oscar/oscar.c:3997
+#: src/protocols/toc/toc.c:497 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 "Tuttavan tiedot"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:950
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu-palvelimelle ei ole tallennettu tuttavalistaa."
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:958
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Tuttavalista siirretty onnistuneesti Gadu-Gadu-palvelimelle"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1029
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Ei voitu siirtää tuttavalistaa Gadu-Gadu-palvelimelle"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Tuttavalista onnistuneesti poistettu Gadu-Gadu-palvelimelta"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1045
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ei voitu poistaa tuttavalistaa Gadu-Gadu-palvelimelta"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "Salasanaa ei voitu muuttaa"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Virhe kommunikoitaessa Gadu-Gadu palvelimen kanssa."
 
-#: src/protocols/gg/gg.c:972
+#: 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."
@@ -4740,11 +4751,11 @@
 "Gaim ei voinut toteuttaa pyyntöäsi koska tapahtui virhe kommunikoitaessa "
 "Gadu-Gadu HTTP-palvelimen kanssa. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Ei voitu tuoda Gadu-Gadu:n tuttavalistaa."
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4752,26 +4763,26 @@
 "Gaim ei saanut yhteyttä Gadu-Gadu tuttavalistapalvelimeen. Yritä myöhemmin "
 "uudelleen."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
 msgstr "Tuttavalistan tallentaminen palvelimelle ei onnistunut"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: 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 epäonnistui saamaan yhteyttä tuttavalistapalvelimelle. Yritä uudelleen "
 "myöhemmin."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu tuttavalistan poistaminen ei onnistu"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
 msgstr "Hakemistoon ei yhteyttä"
 
-#: src/protocols/gg/gg.c:1147
+#: 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."
@@ -4779,11 +4790,11 @@
 "Gaim ei voinut suorittaa hakua, koska hakemistopalvelimeen ei saatu "
 "yhteyttä. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Ei kyetty muuttamaan Gadu-Gadu -salasanaa"
 
-#: src/protocols/gg/gg.c:1181
+#: 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."
@@ -4791,32 +4802,33 @@
 "Gaim ei voinut vaihtaa salasanaa koska yhteyttä Gadu-Gadu -palvelimelle ei "
 "voitu muodostaa. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: 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:1558
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
 msgstr "Käyttäjäprofiiliin ei pääsyä."
 
-#: src/protocols/gg/gg.c:1261
+#: 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."
@@ -4835,7 +4847,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
@@ -4849,16 +4861,16 @@
 msgstr "Käyttäjä %s (%s%s%s%s%s) haluaa luvan sinulta."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorize"
 msgstr "Salli"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:6060
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -4920,63 +4932,71 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim ei voinut avata kuuntelevaa porttia."
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Virhe näytettäessä MOTD:tä"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "MOTD ei ole käytettävissä"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "MOTD:tä ei ole assosioitu tälle yhteydelle."
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
-#: 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:6730
+#: src/protocols/yahoo/yahoo.c:2507
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: 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 "_Salasana:"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
 msgstr "Socketin luominen epäonnistui"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: 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 "Yhteyttä isäntään ei voitu muodostaa"
+
+#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: src/protocols/irc/irc.c:504 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 "Käyttäjät"
 
-#: src/protocols/irc/irc.c:507 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 "Aihe"
 
@@ -4989,32 +5009,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:624
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:625
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 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 "Palvelin"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 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 "Portti"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "Käyttäjänimi"
 
@@ -5039,7 +5061,8 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</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 "Oikea nimi"
 
@@ -5088,110 +5111,110 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim on lähettänyt viestin jota IRC-palvelin ei ymmärrä."
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:404
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:415
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:418
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:423
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:443
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:499
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:601
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:622
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:701
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:702
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:723
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:763
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:765
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:840
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:871
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: 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)"
 msgstr ""
 "(Tämän viestin muunnoksessa oli virhe. Katso 'koodaus'-optio tilieditorista)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:320
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: 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:n vastaus"
 
-#: 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:217 src/protocols/toc/toc.c:624
+#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
@@ -5225,90 +5248,96 @@
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: 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 "Koko nimi"
 
-#: 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 "Sukunimi"
 
-#: 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 "Etunimi"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 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:1465
+#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
+#: src/protocols/yahoo/yahoo.c:3054
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
 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 "Katuosoite"
 
-#: 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 "Laajennettu osoite"
 
-#: 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 "Alue"
 
-#: 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 "Seutu"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
+#: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #. 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 "Maa"
 
-#: 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 "Puhelin"
 
-#: 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:1520
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
 msgid "Email"
 msgstr "Sähköposti"
 
-#: 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 "Organisaation nimi"
 
-#: 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 "Organisaatioyksikkö"
 
-#: 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 "Arvonimi"
 
-#: 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 "Asema"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:4839
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: 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 "Muokkaa Jabberin vCardia"
 
-#: 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."
@@ -5316,65 +5345,71 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: 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:930
-#: src/protocols/msn/msn.c:348 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 "Tila"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr "Lähde"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "Osoite"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "Postilokero"
 
 # TODO Untranslated
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "Valokuva"
 
-#: 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-profiili"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:937
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:940
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:947
 msgid "Cancel Presence Notification"
 msgstr "Peruuta paikallaoloilmoitus"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:953
 msgid "(Re-)Request authorization"
 msgstr "Pyydetään lupaa uudelleen"
 
-#: 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 "Poista listalta"
 
@@ -5470,25 +5505,9 @@
 msgstr "Virhe session alustuksessa"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: 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
+#: 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"
 msgstr "Virhe kirjoituksessa"
 
@@ -5496,381 +5515,382 @@
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:322
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:325
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Socketin luonti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:431
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:601
 msgid "E-Mail"
 msgstr "Sähköposti"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
+#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:651
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:659
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 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/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
+#: 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 "Yhdistetään"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:784
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:790
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:799
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: 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:6430
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:910
 msgid "Both"
 msgstr "molemmille"
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:912
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:914
 msgid "From"
 msgstr "vain sinulle"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:917
 msgid "To"
 msgstr "vain sinulta"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:919
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:923
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:943
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: 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:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6622
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:976
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:977
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1038
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
 # XXX minor editing of existing string
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasanaa"
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1044
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1136
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
 # NOTE source: gftt
-#: src/protocols/jabber/jabber.c:1135
+#: src/protocols/jabber/jabber.c:1138
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: src/protocols/jabber/jabber.c:1137
+#: src/protocols/jabber/jabber.c:1140
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1142
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1144
 msgid "Gone"
 msgstr "Poistunut"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1148
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1150
 msgid "Malformed Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1152
 msgid "Not Acceptable"
 msgstr "Ei hyväksyttävä"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1158
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1160
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1164
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1166
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1170
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1172
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1174
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1176
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1183
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1185
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä koodaus valtuutusviestissä"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1194
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1199
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1201
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1205
 msgid "Bad Format"
 msgstr "Väärä formaatti"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1210
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1214
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1218
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1228
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1232
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1234
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1236
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1238
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1240
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1242
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1244
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1246
 msgid "Unsupported Encoding"
 msgstr "Koodausta ei tuettu"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(Stanza type) ei tuettu"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1252
 msgid "XML Not Well Formed"
 msgstr "Huonostimuotoiltua XML:ää"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1254
 msgid "Stream Error"
 msgstr "Datavirta(stream) -virhe"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1279
 msgid "Hide Operating System"
 msgstr "Piilota käyttöjärjestelmä"
 
@@ -5885,23 +5905,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: src/protocols/jabber/jabber.c:1408
+#. Account options
+#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5977,29 +5998,29 @@
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä chättiin %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 ""
 "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostosiirtoja"
 
-#: 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 "Tiedoston lähetys epäonnistui"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42
 msgid "Unable to request USR\n"
 msgstr "Ei kyetty pyytämään USR:ä\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
 msgid "Unable to login using MD5"
 msgstr "Ei kyetty kirjautumaan sisään MD5:llä"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68
 msgid "Unable to send USR"
 msgstr "USR:ää ei voitu lähettää"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
 msgid "Requesting to send password"
 msgstr "Pyydetään salasanan lähettämistä"
 
@@ -6008,11 +6029,11 @@
 msgid "Protocol version not supported"
 msgstr "Protokollan versiota ei tuettu"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117
 msgid "Unable to request CVR\n"
 msgstr "Ei kyetty pyytämään CVR:ä\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to request INF\n"
 msgstr "Ei kyetty pyytämään INF:iä\n"
 
@@ -6029,12 +6050,11 @@
 msgid "Unable to parse message."
 msgstr "Viestin käsittely epäonnistui"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
+#: src/protocols/msn/dispatch.c:232
 msgid "Unable to write to server"
 msgstr "Palvelimelle ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
 msgid "Syncing with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
@@ -6087,7 +6107,7 @@
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: 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 "Käyttäjä on poissa linjoilta"
 
@@ -6142,7 +6162,7 @@
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: 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 "Et ole kirjautunut sisään."
 
@@ -6199,7 +6219,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
@@ -6235,8 +6255,8 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: 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:658
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
@@ -6270,19 +6290,19 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:80
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:189
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:190
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
@@ -6290,15 +6310,15 @@
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:227
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:237
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: src/protocols/msn/msn.c:236
+#: 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?"
@@ -6306,91 +6326,92 @@
 "Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN-"
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:242
 msgid "Allow"
 msgstr "Salli"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:243
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:268
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:270
 msgid "Page"
 msgstr "Lähetä"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: 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 "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: 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:1402 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 "Varattu"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: 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 "Puhelimessa"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: 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 "Lounaalla"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: 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 "Piilotettu"
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:395
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:400
 msgid "Set Home Phone Number"
 msgstr "Aseta kotipuhelinnumero"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:404
 msgid "Set Work Phone Number"
 msgstr "Aseta työpuhelinnumero"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:408
 msgid "Set Mobile Phone Number"
 msgstr "Aseta matkapuhelinnumero"
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:414
 msgid "Enable/Disable Mobile Devices"
 msgstr "Aseta päälle/pois mobiililaitteet"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:419
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Salli/estä mobiilihaut"
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:447
 msgid "Initiate Chat"
 msgstr "Aloita chat"
 
-#: src/protocols/msn/msn.c:473
+#: 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."
@@ -6398,7 +6419,7 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:785
+#: src/protocols/msn/msn.c:805
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6408,11 +6429,11 @@
 "s@hotmail.com. Muutoksia sallitut-listaan ei tehty."
 
 # XXX
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
 msgid "Invalid MSN screen name"
 msgstr "Epäkelpo MSN-näyttönimi"
 
-#: src/protocols/msn/msn.c:825
+#: src/protocols/msn/msn.c:842
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6421,88 +6442,88 @@
 "MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit %"
 "s@hotmail.com. Muutoksia kielletyt-listalle ei tehty."
 
-#: src/protocols/msn/msn.c:1332 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>Virhe haettaessa profiilia</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
 #: 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 "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
 #: 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 "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
 msgid "Occupation"
 msgstr "Ammatti"
 
 # NOTE actual string used by msn itself, lit. "Self description"
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: 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 "Oma kuvaus"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
+#: src/protocols/msn/msn.c:1481
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
+#: src/protocols/msn/msn.c:1503
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
-#: 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 "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 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 "Kotisivu"
 
-#: src/protocols/msn/msn.c:1583 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 "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/msn/msn.c:1585 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 "Käyttäjän profiili on tyhjä."
 
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1618
 msgid "Display conversation closed notices"
 msgstr "Näytä keskustelu suljettu-viestit"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1623
 msgid "Display timeout notices"
 msgstr "Näytä aikakatkaisuviestit"
 
@@ -6517,15 +6538,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1734
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
@@ -6546,42 +6567,38 @@
 msgstr ""
 "Tuntematon virhe yritettäessä kirjautua MSN-sisäänkirjautumispalvelimeen"
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "Ei kyetty lähettämään salasanaa"
-
-#: src/protocols/msn/notification.c:397
+#: src/protocols/msn/notification.c:355
 msgid "Protocol not supported"
 msgstr "Protokollaa ei tuettu"
 
-#: src/protocols/msn/notification.c:440
+#: src/protocols/msn/notification.c:386
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Yhteytesi on katkaistu. Olet kirjautunut sisään toisesta paikasta."
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:392
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Yhteytesi on katkaistu. MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: src/protocols/msn/notification.c:584
+#: src/protocols/msn/notification.c:527
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
+#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä sinut tuttavalistalleen."
 
-#: src/protocols/msn/notification.c:1362
+#: src/protocols/msn/notification.c:1351
 #, c-format
 msgid ""
 "Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
@@ -6590,11 +6607,11 @@
 "MSN-tuttavalista käyttäjälle %s ei ole juuri nyt saatavilla. Ole hyvä, odota "
 "ja yritä uudelleen."
 
-#: src/protocols/msn/notification.c:1607
+#: src/protocols/msn/notification.c:1612
 msgid "Unable to transfer to notification server"
 msgstr "Tiedonsiirto ei onnistunut ilmoituspalvelimelle"
 
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1799
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6623,61 +6640,79 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr "IO-virhe"
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/servconn.c:210
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "Ei voitu muodostaa yhteyttä %s palvelimeen"
+
+#: src/protocols/msn/servconn.c:214
+#, c-format
+msgid "Error writing to %s server"
+msgstr "Virhe kirjoitettaessa %s palvelimelle"
+
+#: src/protocols/msn/servconn.c:218
+#, c-format
+msgid ""
+"Error reading from %s server. Lastcommand was:\n"
+" %s"
+msgstr ""
+"Virhe luettaessa %s palvelimelta. Edellinen komento oli:\n"
+"%s"
+
+#: src/protocols/msn/servconn.c:222
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "Tuntematon virhe %s palvelimelta."
+
+#: src/protocols/msn/servconn.c:315
 msgid "Received HTTP error. Please report this."
 msgstr "Saatiin HTTP-virhe. Raportoi tästä, kiitos."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "Keskustelu on tullut inaktiiviseksi ja aikakatkaistu."
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:130
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s on sulkenut keskusteluikkunan."
 
-#: src/protocols/msn/switchboard.c:300
+#: src/protocols/msn/switchboard.c:264
 msgid "An MSN message may not have been received."
 msgstr "MSN-viestiä ei ehkä ole otettu vastaan."
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "Otsikkotietoja ei kyetty lukemaan palvelimelta."
 
-# XXX still minor but relatively non-trivial editing of similar string + sentence writing
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr ""
-"Palvelimelta ei kyetty lukemaan viestiä.  Komento on %hd, pituus on %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 "Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %hd."
+
+#: src/protocols/napster/napster.c:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "käyttäjiä: %s, tiedostoja: %s, koko: %sGt"
 
 #. 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 "Ei voitu lisätä \"%s\" Napster hotlistiin"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s pyysi tietojasi"
 
 # NOTE source: 0.59.8 (+ "koska")
-#: 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"
@@ -6685,17 +6720,13 @@
 "Yhteytesi on katkennut koska olet kirjautunut sisään toisesta paikasta."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "Hae tiedot"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1274
 msgid "_Group:"
 msgstr "_Ryhmä"
 
@@ -6710,75 +6741,230 @@
 #. *< 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-protokollaliitännäinen"
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr "Kirjautuminen epäonnistui (0x%X)."
-
-#: src/protocols/novell/novell.c:225
-#, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "Viestiä ei voitu lähettää. Ei saatu yksityiskohtia käyttäjälle (0x%X)."
-
-#: src/protocols/novell/novell.c:371
-#, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "Ei voitu lisätä %s tuttavalistalle (0x%X)."
+#: src/protocols/novell/nmuser.c:2027
+msgid "Required parameters not passed in"
+msgstr "Vaadittuja parametreja ei syötetty"
+
+#: src/protocols/novell/nmuser.c:2030
+msgid "Unable to write to network"
+msgstr "Ei voida kirjoittaa verkkoon"
+
+#: src/protocols/novell/nmuser.c:2033
+msgid "Unable to read from network"
+msgstr "Ei voida lukea verkosta"
+
+#: src/protocols/novell/nmuser.c:2036
+msgid "Error communicating with server"
+msgstr "Virhe kommunikoitaessa palvelimelle"
+
+#: src/protocols/novell/nmuser.c:2040
+msgid "Conference not found"
+msgstr "Konferenssia ei löydy"
+
+#: src/protocols/novell/nmuser.c:2043
+msgid "Conference does not exist"
+msgstr "Konferenssia ei ole"
+
+#: src/protocols/novell/nmuser.c:2047
+msgid "A folder with that name already exists"
+msgstr "Sen niminen hakemisto on jo olemassa"
+
+#: src/protocols/novell/nmuser.c:2050
+msgid "Not supported"
+msgstr "Ei tueta"
+
+#: src/protocols/novell/nmuser.c:2054
+msgid "Password has expired"
+msgstr "Salasana vanhentunut"
+
+#: src/protocols/novell/nmuser.c:2057
+msgid "Invalid password"
+msgstr "Virheellinen salasana"
+
+#: src/protocols/novell/nmuser.c:2060
+msgid "User not found"
+msgstr "Käyttäjää ei löytynyt"
+
+#: src/protocols/novell/nmuser.c:2063
+msgid "Account has been disabled"
+msgstr "Käyttäjätili on poistettu käytöstä"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "The server could not access the directory"
+msgstr "Palvelin ei pääse hakemistoon"
+
+#: src/protocols/novell/nmuser.c:2069
+msgid "Your system administrator has disabled this operation"
+msgstr "Järjestelmänne ylläpitäjä on estänyt tämän toiminnon."
+
+#: src/protocols/novell/nmuser.c:2072
+msgid "The server is unavailable; try again later"
+msgstr "Palvelin ei ole käytössä; yritä myöhemmin uudelleen"
+
+#: src/protocols/novell/nmuser.c:2075
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Tuttavaa ei voi lisätä samaan hakemistoon kahdesti"
+
+#: src/protocols/novell/nmuser.c:2078
+msgid "Cannot add yourself"
+msgstr "Et voi lisätä itseäsi"
+
+#: src/protocols/novell/nmuser.c:2081
+msgid "Master archive is misconfigured"
+msgstr "Pääarkisto on väärin konfiguroitu"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "Invalid username or password"
+msgstr "Epäkelpo käyttäjänimi tai salasana"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Could not recognize the host of the username you entered"
+msgstr "Ei voitu tunnistaa syöttämäsi käyttäjän isäntää."
+
+#: src/protocols/novell/nmuser.c:2091
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr "Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on syötetty"
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "You cannot add the same person twice to a conversation"
+msgstr "Et voi lisätä samaa henkilöä kahdesti keskusteluun"
+
+#: src/protocols/novell/nmuser.c:2098
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Olet saavuttanut rajasi sallittujen tuttavien määrässä"
+
+#: src/protocols/novell/nmuser.c:2101
+msgid "You have entered an invalid username"
+msgstr "Olet syöttänyt epäkelvon käyttäjänimen"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "An error occurred while updating the directory"
+msgstr "Virhe tapahtui päivitettäessä hakemistoa"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Incompatible protocol version"
+msgstr "Epäyhteensopiva protokollaversio"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid "The user has blocked you"
+msgstr "Käyttäjä on estänyt sinut"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr "Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena sisään samaan aikaan"
+
+#: src/protocols/novell/nmuser.c:2116
+msgid "The user is either offline or you are blocked"
+msgstr "Käyttäjä on joko poissa linjoilta tai sinut on estetty"
+
+#: src/protocols/novell/nmuser.c:2119
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Tuntematon virhe: 0x%X"
+
+#: src/protocols/novell/novell.c:119
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Kirjautuminen epäonnistui (%s)."
+
+#: src/protocols/novell/novell.c:232
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "Viestiä ei voitu lähettää. Ei saatu yksityiskohtia käyttäjälle (%s)."
+
+#: src/protocols/novell/novell.c:378
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "Ei voitu lisätä %s tuttavalistalle (%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 "Viestiä ei voitu lähettää (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 ""
-"Ei voitu lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (0x%X)."
-
-#: src/protocols/novell/novell.c:489
-#, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "Viestiä ei voitu lähettää. Ei voitu luoda konferenssia (0x%X)."
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Viestiä ei voitu lähettää (%s)."
+
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Ei voitu kutsua käyttäjää (%s)."
+
+#: src/protocols/novell/novell.c:514
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+"Ei voitu lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (%s)."
+
+#: src/protocols/novell/novell.c:519
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "Viestiä ei voitu lähettää. Ei voitu luoda konferenssia (%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 ""
 "Ei voitu siirtää käyttäjää %s kansioon %s palvelinpuolen listalla. Virhe "
-"luotaessa kansiota (0x%X)."
-
-#: src/protocols/novell/novell.c:584
+"luotaessa kansiota (%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 ""
 "Ei voitu lisätä %s tuttavalistalle. Virhe luotaessa kansiota palvelinpuolen "
-"listalle (0x%X)."
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "GroupWise-konferenssi %d"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr "Ei saatu yksityiskohtia käyttäjälle %s (0x%X)."
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+"listalle (%s)."
+
+#: src/protocols/novell/novell.c:686
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Ei saatu yksityiskohtia käyttäjälle %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 "Ei voitu lisätä käyttäjää yksityisyys-listalle (%s)."
+
+#: src/protocols/novell/novell.c:779
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Ei voitu lisätä %s kieltolistalle (%s)."
+
+#: src/protocols/novell/novell.c:832
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Ei voitu lisätä %s sallitut-listalle (%s)."
+
+#: src/protocols/novell/novell.c:900
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Ei voitu poistaa %s yksityisyys-listalta (%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 "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
+
+#: src/protocols/novell/novell.c:995
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Ei voitu luoda konferenssia (%s)."
+
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: src/protocols/novell/novell.c:982
+#: src/protocols/novell/novell.c:1428
 msgid "Userid"
 msgstr "Käyttäjätunnus"
 
@@ -6789,37 +6975,47 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
+#: src/protocols/novell/novell.c:1442
 msgid "Full name"
 msgstr "Koko nimi"
 
 # XXX could be wrong
-#: src/protocols/novell/novell.c:1016
+#: src/protocols/novell/novell.c:1462
 msgid "User Properties"
 msgstr "Käyttäjän valinnat"
 
-#: src/protocols/novell/novell.c:1084
+#: src/protocols/novell/novell.c:1566
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise-konferenssi %d"
+
+#: src/protocols/novell/novell.c:1591
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr "Virhe käsiteltäessä tapahtumaa tai vastausta. (0x%X)"
-
-#: src/protocols/novell/novell.c:1147
+#: src/protocols/novell/novell.c:1621
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "Virhe käsiteltäessä tapahtumaa tai vastausta. (%s)"
+
+#: src/protocols/novell/novell.c:1655
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: src/protocols/novell/novell.c:1162
+#: src/protocols/novell/novell.c:1670
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/novell/novell.c:1302
+#: src/protocols/novell/novell.c:1803
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s on kutsuttu tähän keskusteluun."
+
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: src/protocols/novell/novell.c:1303
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6830,16 +7026,16 @@
 "\n"
 "Lähetetty: %s"
 
-#: src/protocols/novell/novell.c:1305
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: src/protocols/novell/novell.c:1408
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6849,7 +7045,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1560
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6857,37 +7053,32 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: src/protocols/novell/novell.c:1582
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: src/protocols/novell/novell.c:1846
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: src/protocols/novell/novell.c:2164
-#, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr ""
-"<b>Tila:</b> %s\n"
-"<b>Viesti:</b> %s"
-
-#: src/protocols/novell/novell.c:2168
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>Tila:</b> %s"
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+# src/sidebar.c:103
+#: src/protocols/novell/novell.c:2743
+msgid "Message"
+msgstr "Viesti"
+
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
+#: src/protocols/novell/novell.c:3291
+msgid "Initiate _Chat"
+msgstr "Aloita _Chat"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6899,257 +7090,296 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GrouWise Messenger-protokollaliitännäinen"
 
-#: src/protocols/novell/novell.c:2428
+#: src/protocols/novell/novell.c:3388
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: src/protocols/novell/novell.c:2432
+#: src/protocols/novell/novell.c:3392
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "Nopeus isäntään"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
-#: src/protocols/oscar/oscar.c:188
-msgid "Service not defined"
-msgstr "Palvelua ei määritelty"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Obsolete SNAC"
-msgstr "Vanhentunut SNAC"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by host"
-msgstr "Ei tuettu verkkoisännässä"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
-msgstr "Ei tuettu asiakasohjelmassa"
-
 #: src/protocols/oscar/oscar.c:192
-msgid "Refused by client"
-msgstr "Asiakasohjelma torjui"
+msgid "Service not defined"
+msgstr "Palvelua ei määritelty"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Reply too big"
-msgstr "Vastaus liian suuri"
+msgid "Obsolete SNAC"
+msgstr "Vanhentunut SNAC"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Responses lost"
-msgstr "Vastaukset menetetty"
+msgid "Not supported by host"
+msgstr "Ei tuettu verkkoisännässä"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Request denied"
-msgstr "Pyyntö evätty"
+msgid "Not supported by client"
+msgstr "Ei tuettu asiakasohjelmassa"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Busted SNAC payload"
-msgstr "Rikkoutunut SNAC-data"
+msgid "Refused by client"
+msgstr "Asiakasohjelma torjui"
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Insufficient rights"
-msgstr "Liian vähän oikeuksia"
+msgid "Reply too big"
+msgstr "Vastaus liian suuri"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "In local permit/deny"
-msgstr "Paikallisessa sallittujen/estettyjen listassa"
+msgid "Responses lost"
+msgstr "Vastaukset menetetty"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Too evil (sender)"
-msgstr "Lähettäjä liian paha(evil)"
+msgid "Request denied"
+msgstr "Pyyntö evätty"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "Too evil (receiver)"
-msgstr "Vastaanottaja liian paha(evil)"
+msgid "Busted SNAC payload"
+msgstr "Rikkoutunut SNAC-data"
 
 #: src/protocols/oscar/oscar.c:201
-msgid "User temporarily unavailable"
-msgstr "Käyttäjä ei tilapäisesti saatavilla."
+msgid "Insufficient rights"
+msgstr "Liian vähän oikeuksia"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "No match"
-msgstr "Ei tuloksia"
+msgid "In local permit/deny"
+msgstr "Paikallisessa sallittujen/estettyjen listassa"
 
 #: src/protocols/oscar/oscar.c:203
-msgid "List overflow"
-msgstr "Lista-ylivuoto"
+msgid "Too evil (sender)"
+msgstr "Lähettäjä liian paha(evil)"
 
 #: src/protocols/oscar/oscar.c:204
-msgid "Request ambiguous"
-msgstr "Pyyntö ei ole yksiselitteinen"
+msgid "Too evil (receiver)"
+msgstr "Vastaanottaja liian paha(evil)"
 
 #: src/protocols/oscar/oscar.c:205
+msgid "User temporarily unavailable"
+msgstr "Käyttäjä ei tilapäisesti saatavilla."
+
+#: src/protocols/oscar/oscar.c:206
+msgid "No match"
+msgstr "Ei tuloksia"
+
+#: src/protocols/oscar/oscar.c:207
+msgid "List overflow"
+msgstr "Lista-ylivuoto"
+
+#: src/protocols/oscar/oscar.c:208
+msgid "Request ambiguous"
+msgstr "Pyyntö ei ole yksiselitteinen"
+
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: 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 "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: 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 "Turvatoimet käytössä"
 
-#: 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 "Video"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
 msgstr "Kamera"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:6625
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
+#: src/protocols/oscar/oscar.c:6623
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:6624
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "Suorayhteys epäonnistui"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
+
+#: src/protocols/oscar/oscar.c:906
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr "Yritetään yhdistää %s @ %s:%h suoraa pikaviestiä varten."
+
+#: src/protocols/oscar/oscar.c:1322
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+"Pyydetään %s yhdistämään meihin @ %s:%h suoraa pikaviestiyhteyttä varten."
+
+#: src/protocols/oscar/oscar.c:1327
+msgid "Unable to open Direct IM"
+msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
+
+#: src/protocols/oscar/oscar.c:1362
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
+
+#: 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 ""
+"Koska tämä paljastaa IP-osoitteesi se voidaan ajatella yksityisyysriskinä. "
+"Haluatko jatkaa? "
+
+# NOTE source: gftt
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
+msgid "Connect"
+msgstr "Yhdistä"
+
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
 msgstr "Chat ei ole parhaillaan käytettävissä"
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "Yhteyttä isäntään ei voitu muodostaa"
-
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: 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 "
@@ -7160,47 +7390,47 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 # XXX minor but not completely trivial editing of fuzzy text
 # NOTE "file descriptor" translation from ATK sanasto
-#: 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 "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
 msgstr "Socketin muodostus epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/oscar/oscar.c:1348
+#: 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."
@@ -7210,21 +7440,21 @@
 "pidempään."
 
 # NOTE source: 0.59.8 (+ "%s")
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:2006
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä %s"
 
-#: src/protocols/oscar/oscar.c:1385
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: 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 "
@@ -7233,29 +7463,24 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-protokollaa "
 "kunnes tämä on korjattu. Tarkista päivitykset: %s "
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: 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 ei saanut kelvollista AIM:n sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:2267
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Suora pikaviesti %s:n kanssa muodostettu"
-
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:3282
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s on juuri pyytänyt suoraa yhteyttä %s:n"
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:3285
 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 "
@@ -7265,24 +7490,19 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-# NOTE source: gftt
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
-msgid "Connect"
-msgstr "Yhdistä"
-
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:3321
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuta minut jotta voin lisätä sinut tuttavalistalleni."
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3329
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:3330
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:3360
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7291,23 +7511,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:3365 src/protocols/oscar/oscar.c:3367
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
+#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6097
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:3423
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:3506
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7316,11 +7536,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3526
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7331,17 +7551,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:3527
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3534
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3542
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7354,7 +7574,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:3550
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7367,7 +7587,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3558
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7380,36 +7600,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3585
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3589
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3674
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3683
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3692
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7419,7 +7639,7 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
 # Word "hirveä" will not work on this context, it is hilarious.
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3701
 #, 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."
@@ -7427,64 +7647,64 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
 # Here too word "hirveä" will not fit.
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3710
 #, 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] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3719
 #, 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] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3189
+#: src/protocols/oscar/oscar.c:3780
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3839
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3840
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3875
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3934
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3366
+#: src/protocols/oscar/oscar.c:3957
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3960
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:4046
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 # NOTE source: 0.59.8 (%d -> %hu)
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:4232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7492,11 +7712,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4450
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:4451
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7505,119 +7725,123 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:4514
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 "Yhteytesi on katkennut koska olet kirjautunut sisään toisesta paikasta."
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:4516
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:4547
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4830
+msgid "Not specified"
+msgstr "Ei määritelty"
+
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4847
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4851
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4856
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4864
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4872
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4873
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4874
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4875
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4877
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4883
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4933
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4954
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:4958
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:4998
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5026
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7626,7 +7850,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7635,7 +7859,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi päättyy "
 "välilyöntiin."
 
-#: src/protocols/oscar/oscar.c:4443
+#: src/protocols/oscar/oscar.c:5035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7644,7 +7868,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7653,7 +7877,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7662,7 +7886,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: src/protocols/oscar/oscar.c:4452
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7671,12 +7895,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7685,20 +7909,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:5128
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
+"lähettääksesi pikaviestikuvia."
+
+#: src/protocols/oscar/oscar.c:5301
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:5302
 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 "
@@ -7708,7 +7939,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:5329
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7721,19 +7952,19 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:5334
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
 msgid "Visible"
 msgstr "Näkyvä"
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:5368
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7743,7 +7974,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:5409
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7757,11 +7988,11 @@
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
 # XXX
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:5414
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:5500
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7772,16 +8003,16 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
+#: src/protocols/oscar/oscar.c:5931
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5637
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5638
 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 "
@@ -7790,13 +8021,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
+#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7806,11 +8037,11 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5930
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7820,7 +8051,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6012
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7830,11 +8061,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:5410
+#: src/protocols/oscar/oscar.c:6018
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6051
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7844,17 +8075,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:6093
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6094
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6097
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7865,86 +8096,74 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6098
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:6157
 msgid "Invalid chat name specified."
 msgstr "Virheellinen chat nimi annettu."
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:6247
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+"Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM chatissä."
+
+#: src/protocols/oscar/oscar.c:6404
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Unable to open Direct IM"
-msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
-
-#: src/protocols/oscar/oscar.c:6297
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
-
-#: src/protocols/oscar/oscar.c:6300
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Koska tämä paljastaa IP-osoitteesi se voidaan ajatella yksityisyysriskinä. "
-"Haluatko jatkaa? "
-
-#: src/protocols/oscar/oscar.c:6485
+#: src/protocols/oscar/oscar.c:6688
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6706
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6712
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6724
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6747
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6777
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6778
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: src/protocols/oscar/oscar.c:6581
+#: src/protocols/oscar/oscar.c:6785
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6837
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6882
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6885
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6886
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7953,76 +8172,76 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6903
 msgid "Find Buddy by E-mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6904
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6905
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6922
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6923
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Olen työskentelemässä ja tahdon häiriöitä -- laita viestiä!"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:7004
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:7009
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:7015
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7020
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:7025
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:7029
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7038
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:7042
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:7046
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:7050
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:7057
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:7063
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:7068
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
@@ -8037,123 +8256,1128 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7204
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7209
 msgid "Auth port"
 msgstr "portti"
 
-# NOTE source: balsa (esp. lack of case ending)
-#: src/protocols/toc/toc.c:167
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
+#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "Käyttäjä %s ei ole läsnä verkossa"
+
+#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
+#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+msgid "Key Agreement"
+msgstr "Avainsopimus"
+
+#: src/protocols/silc/buddy.c:49
+msgid "Cannot perform the key agreement"
+msgstr "Ei voida suorittaa avainsopimusta"
+
+#: src/protocols/silc/buddy.c:106
+msgid "Error occurred during key agreement"
+msgstr "Virhe tapahtui avainsopimuksen aikana"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Key Agreement failed"
+msgstr "Avainsopimus epäonnistui"
+
+#: src/protocols/silc/buddy.c:115
+msgid "Timeout during key agreement"
+msgstr "Aikakatkaisu avainsopimuksen aikana"
+
+#: src/protocols/silc/buddy.c:120
+msgid "Key agreement was aborted"
+msgstr "Avainsopimus peruutettiin"
+
+#: src/protocols/silc/buddy.c:125
+msgid "Key agreement is already started"
+msgstr "Avainsopimus on jo aloitettu"
+
+#: src/protocols/silc/buddy.c:130
+msgid "Key agreement cannot be started with yourself"
+msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
+
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
+#: src/protocols/silc/buddy.c:500
+msgid "The remote user is not present in the network any more"
+msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
+
+#: src/protocols/silc/buddy.c:284
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
+"avainsopimuksen?"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Vastapään käyttäjä on odottamassa avain sopimusta koneella:\n"
+"Etäkone: %s\n"
+"Portti: %d"
+
+#: src/protocols/silc/buddy.c:301
+msgid "Key Agreement Request"
+msgstr "Avainsopimuspyyntö"
+
+#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
+#: src/protocols/silc/buddy.c:451
+msgid "IM With Password"
+msgstr "Pikaviesti salasanalla"
+
+#: src/protocols/silc/buddy.c:410
+msgid "Cannot set IM key"
+msgstr "Ei voida asettaa pikaviestiavainta"
+
+#: src/protocols/silc/buddy.c:452
+msgid "Set IM Password"
+msgstr "Aseta pikaviestin salasana"
+
+#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+msgid "Get Public Key"
+msgstr "Hae julkinen avain"
+
+#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
+msgid "Cannot fetch the public key"
+msgstr "Ei voitu hakea julkista avainta"
+
+#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
+msgid "Show Public Key"
+msgstr "Näytä julkinen avain"
+
+#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/chat.c:218
+msgid "Could not load public key"
+msgstr "Ei voitu ladata julkista avainta"
+
+#: src/protocols/silc/buddy.c:700 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 "Käyttäjätiedot"
+
+#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
+msgid "Cannot get user information"
+msgstr "Ei voitu hakea käyttäjätietoja"
+
+#: src/protocols/silc/buddy.c:722
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "Käyttäjä %s ei ole luotettu"
+
+#: src/protocols/silc/buddy.c:725
+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 ""
+"Et voi saada tuttavan tiedotteita ennenkuin lisäät hänen julkisen avaimensa. "
+"Voit käyttää Hae Julkinen avain-komentoa saadaksesi julkisen avaimen."
+
+#: src/protocols/silc/buddy.c:1025
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "Tuttava %s ei ole kirjautuneena verkossa"
+
+#: src/protocols/silc/buddy.c:1028
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
+"tuodaksesi julkisen avaimen."
+
+#: src/protocols/silc/buddy.c:1031
+msgid "Import..."
+msgstr "Tuo..."
+
+#: src/protocols/silc/buddy.c:1118
+msgid "Select correct user"
+msgstr "Valitse oikea käyttäjä"
+
+#: src/protocols/silc/buddy.c:1120
+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 ""
+"Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
+"käyttäjä listalta."
+
+#: src/protocols/silc/buddy.c:1122
+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 ""
+"Useammalla kuin yhdellä käyttäjällä on sama nimi. Valitse oikea käyttäjä "
+"listalta."
+
+#: src/protocols/silc/buddy.c:1396
+msgid "Detached"
+msgstr "Irroitettu"
+
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "Vastahakoinen"
+
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "Herätä minut"
+
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "Hyperaktiivinen"
+
+#: src/protocols/silc/buddy.c:1408
+msgid "Robot"
+msgstr "Robotti"
+
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/silc.c:606
+msgid "Happy"
+msgstr "Onnellinen"
+
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/silc.c:608
+msgid "Sad"
+msgstr "Surullinen"
+
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/silc.c:610
+msgid "Angry"
+msgstr "Vihainen"
+
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/silc.c:612
+msgid "Jealous"
+msgstr "Mustasukkainen"
+
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/silc.c:614
+msgid "Ashamed"
+msgstr "Häpeää"
+
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/silc.c:616
+msgid "Invincible"
+msgstr "Haavoittumaton"
+
+#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/silc.c:618
+msgid "In Love"
+msgstr "Rakastunut"
+
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:620
+msgid "Sleepy"
+msgstr "Unelias"
+
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:622
+msgid "Bored"
+msgstr "Tylsistynyt"
+
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/silc.c:624
+msgid "Excited"
+msgstr "Innostunut"
+
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/silc.c:626
+msgid "Anxious"
+msgstr "Levoton"
+
+#: src/protocols/silc/buddy.c:1471
+msgid "Modes"
+msgstr "Tilat"
+
+#: src/protocols/silc/buddy.c:1481
+msgid "Mood"
+msgstr "Mieliala"
+
+#: src/protocols/silc/buddy.c:1511
+msgid "Status Text"
+msgstr "Tilateksti"
+
+#: src/protocols/silc/buddy.c:1516
+msgid "Preferred Contact"
+msgstr "Suosikkituttava"
+
+#: src/protocols/silc/buddy.c:1524
+msgid "Paging"
+msgstr "Kaukohaku"
+
+#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "Aloita videoneuvottelu"
+
+#: src/protocols/silc/buddy.c:1537
+msgid "Preferred Language"
+msgstr "Suosittu kieli"
+
+#: src/protocols/silc/buddy.c:1542
+msgid "Device"
+msgstr "Laite"
+
+#: src/protocols/silc/buddy.c:1544
+msgid "Computer"
+msgstr "Tietokone"
+
+#: src/protocols/silc/buddy.c:1548
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/buddy.c:1550
+msgid "Terminal"
+msgstr "Pääte"
+
+#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "Aikavyöhyke"
+
+#: src/protocols/silc/buddy.c:1567
+msgid "Geolocation"
+msgstr "Maantieteellinen paikka"
+
+#: src/protocols/silc/buddy.c:1626
+msgid "Reset IM Key"
+msgstr "Tyhjennä pikaviestiavain"
+
+#: src/protocols/silc/buddy.c:1631
+msgid "IM with Key Exchange"
+msgstr "Pikaviesti avaimienvaihdolla"
+
+#: src/protocols/silc/buddy.c:1635
+msgid "IM with Password"
+msgstr "Pikaviesti salasanalla"
+
+#: src/protocols/silc/buddy.c:1646
+msgid "Get Public Key..."
+msgstr "Hae julkinen avain..."
+
+#: src/protocols/silc/buddy.c:1651
+msgid "Send File..."
+msgstr "Lähetä tiedosto..."
+
+#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
+msgid "Kill User"
+msgstr "Poista käyttäjä"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "_Salasana:"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "Kanavaa %s ei ole verkossa"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
+msgid "Channel Information"
+msgstr "Kanavatiedot"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "Ei saada kanavatietoja"
+
+#: src/protocols/silc/chat.c:217
+msgid "Add Channel Public Key"
+msgstr "Lisää kanavan julkinen avain"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:272
+msgid "Open Public Key..."
+msgstr "Avaa julkinen avain..."
+
+#: src/protocols/silc/chat.c:383
+msgid "Channel Passphrase"
+msgstr "Kanavan salasana"
+
+#: src/protocols/silc/chat.c:390
+msgid "Channel Public Keys List"
+msgstr "Kanavan julkisten avainten lista"
+
+#: 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 ""
+"Kanavalle tunnistautumista käytetään estämään asiaton pääsy kanavalle. "
+"Tunnistautuminen voi perustua salasanaan tai digitaaliseen "
+"allekirjoitukseen. Jos salasana on asetettu, se vaaditaan kanavalle "
+"pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
+"vain käyttäjät joiden julkinen avain on listalla."
+
+#: 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 "Kanavalle tunnistautuminen"
+
+#: src/protocols/silc/chat.c:562
+msgid "Group Name"
+msgstr "Ryhmän nimi"
+
+#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+msgid "Passphrase"
+msgstr "Salasana"
+
+#: src/protocols/silc/chat.c:577
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
+
+#: src/protocols/silc/chat.c:579
+msgid "Add Channel Private Group"
+msgstr "Lisää kanavaan yksityinen ryhmä"
+
+#: src/protocols/silc/chat.c:706
+msgid "User Limit"
+msgstr "Käyttäjärajoitus"
+
+#: src/protocols/silc/chat.c:707
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
+
+#: src/protocols/silc/chat.c:849
+msgid "Get Info"
+msgstr "Hae tiedot"
+
+#: src/protocols/silc/chat.c:856
+msgid "Invite List"
+msgstr "Kutsulista"
+
+#: src/protocols/silc/chat.c:860
+msgid "Ban List"
+msgstr "Kieltolista"
+
+#: src/protocols/silc/chat.c:867
+msgid "Add Private Group"
+msgstr "Lisää yksityinen ryhmä"
+
+#: src/protocols/silc/chat.c:878
+msgid "Reset Permanent"
+msgstr "Nollaa pysyvä"
+
+#: src/protocols/silc/chat.c:882
+msgid "Set Permanent"
+msgstr "Aseta pysyvä"
+
+#: src/protocols/silc/chat.c:889
+msgid "Set User Limit"
+msgstr "Aseta käyttäjärajoitus"
+
+#: src/protocols/silc/chat.c:894
+msgid "Reset Topic Restriction"
+msgstr "Poista aiherajoitus"
+
+#: src/protocols/silc/chat.c:898
+msgid "Set Topic Restriction"
+msgstr "Aseta aiherajoitus"
+
+#: src/protocols/silc/chat.c:904
+msgid "Reset Private Channel"
+msgstr "Poista yksityinen kanava"
+
+#: src/protocols/silc/chat.c:908
+msgid "Set Private Channel"
+msgstr "Aseta yksityinen kanava"
+
+#: src/protocols/silc/chat.c:914
+msgid "Reset Secret Channel"
+msgstr "Poista salainen kanava"
+
+#: src/protocols/silc/chat.c:918
+msgid "Set Secret Channel"
+msgstr "Aseta salainen kanava"
+
+#: src/protocols/silc/chat.c:988
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
+
+#: src/protocols/silc/chat.c:992
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Kanavan perustaja kanavalla <<I>%s</I> on <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 ""
+"Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
+
+#: src/protocols/silc/chat.c:1044
+msgid "Join Private Group"
+msgstr "Liity yksityiseen ryhmään"
+
+#: src/protocols/silc/chat.c:1045
+msgid "Cannot join private group"
+msgstr "Ei voida liittyä yksityiseen ryhmään"
+
+#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+msgid "Cannot call command"
+msgstr "Komentoa ei voida kutsua"
+
+#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+msgid "Unknown command"
+msgstr "Tuntematon komento"
+
+# NOTE source: gnomeicu
+#: 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 "Turvallinen tiedostosiirto"
+
+#: 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 "Virhe tiedostosiirrossa"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "Pääsy evätty"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "Avain sopimus epäonnistui"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "Tiedostosiirtosessiota ei ole"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "Ei aktiivista tiedostosiirtosessiota"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "Tiedostosiirto on jo aloitettu"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr "Ei voitu suorittaa avainsopimusta tiedostonsiirtoa varten"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "Ei voitu aloittaa tiedostosiirtoa"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "Tiedoston lähetys ei onnistu"
+
+#: 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 on vaihtanut <I>%s</I> aiheeksi: %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> muutti kanavan <I>%s</I> tilaa: %s"
+
+#: src/protocols/silc/ops.c:402
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
+
+#: src/protocols/silc/ops.c:433
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
+
+#: src/protocols/silc/ops.c:437
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
+
+#: src/protocols/silc/ops.c:464
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "Sinut on poistettu <I>%s</I> käyttäjä <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 "Sinut on poistanut %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 "Poistettu %s (%s)"
+
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "Kirjaa ulos palvelimelta"
+
+#: src/protocols/silc/ops.c:767
+msgid "Personal Information"
+msgstr "Henkilökohtaiset tiedot"
+
+#: src/protocols/silc/ops.c:790
+msgid "Birth Day"
+msgstr "Syntymäpäivä"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "Titteli"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "Asema työssä"
+
+#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+msgid "Organization"
+msgstr "Organisaatio"
+
+#: src/protocols/silc/ops.c:806
+msgid "Unit"
+msgstr "Yksikkö"
+
+#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+msgid "EMail"
+msgstr "Sähköposti"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "Huomautus"
+
+#: src/protocols/silc/ops.c:878
+msgid "Join Chat"
+msgstr "Liity Chattiin"
+
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "Verkkoisäntä"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "Käyttäjätila"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "Kanavat"
+
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+msgid "Public Key Fingerprint"
+msgstr "Julkisen avaimen Fingerprint"
+
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+msgid "Public Key Babbleprint"
+msgstr "Julkisen avaimen Babbleprint"
+
+#: src/protocols/silc/ops.c:995
+msgid "More..."
+msgstr "Lisää..."
+
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+msgid "Detach From Server"
+msgstr "Irroita palvelimelta"
+
+#: src/protocols/silc/ops.c:1006
+msgid "Cannot detach"
+msgstr "Ei voida irroittaa"
+
+#: src/protocols/silc/ops.c:1017
+msgid "Cannot set topic"
+msgstr "Ei voida asettaa aihetta"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Roomlist"
+msgstr "Huonelista"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Cannot get room list"
+msgstr "Huonelistaa ei saatu"
+
+#: src/protocols/silc/ops.c:1093
+msgid "No public key was received"
+msgstr "Ei saatu julkista avainta"
+
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
+msgid "Server Information"
+msgstr "Palvelimen tiedot"
+
+#: src/protocols/silc/ops.c:1107
+msgid "Cannot get server information"
+msgstr "Ei saada palvelimen tietoja"
+
+#: src/protocols/silc/ops.c:1128
+msgid "Could not kill user"
+msgstr "Ei voitu poistaa käyttäjää"
+
+#: src/protocols/silc/ops.c:1205
+msgid "Error during connecting to SILC Server"
+msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
+
+#: src/protocols/silc/ops.c:1210
+msgid "Key Exchange failed"
+msgstr "Avaintenvaihto epäonnistui"
+
+#: src/protocols/silc/ops.c:1219
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
+"luodaksesi uuden yhteyden."
+
+#: src/protocols/silc/ops.c:1254
+msgid "Disconnected by server"
+msgstr "Palvelin katkaisi yhteyden"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "Palautetaan istunto"
+
+#: src/protocols/silc/ops.c:1316
+msgid "Authenticating connection"
+msgstr "Todennetaan yhteys"
+
+#: src/protocols/silc/ops.c:1363
+msgid "Verifying server public key"
+msgstr "Tarkistetaan palvelimen julkinen avain"
+
+#: src/protocols/silc/ops.c:1404
+msgid "Passphrase required"
+msgstr "Vaatii salasanan"
+
+#: src/protocols/silc/ops.c:1433
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Virhe: Versio-virhe, päivitä ohjelmisto"
+
+#: src/protocols/silc/ops.c:1436
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
+
+#: src/protocols/silc/ops.c:1439
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
+
+#: src/protocols/silc/ops.c:1442
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
+
+#: src/protocols/silc/ops.c:1445
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:a"
+
+#: src/protocols/silc/ops.c:1448
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Virhe: Etäkone ei tue ehdotettua hash-funktiota"
+
+#: src/protocols/silc/ops.c:1451
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
+
+#: src/protocols/silc/ops.c:1453
+msgid "Failure: Incorrect signature"
+msgstr "Virhe: Virheellinen allekirjoitus"
+
+#: src/protocols/silc/ops.c:1455
+msgid "Failure: Invalid cookie"
+msgstr "Virhe: Virheellinen eväste"
+
+#: src/protocols/silc/ops.c:1466
+msgid "Failure: Authentication failed"
+msgstr "Virhe: Todennus epäonnistui"
+
+#: 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 ""
+"Vastaanotettiin käyttäjän %s julkinen avain. Paikallinen kopiosi ei täsmää. "
+"Haluatko silti hyväksyä tämän julkisen avaimen?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "Vastaanotettiin julkinen avain käyttäjältä %s. Hyväksytäänkö se?"
+
+#: 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 ja babbleprint avaimelle %s ovat:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "Tarkista julkinen avain"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "Näytä..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "Julkisen avaimen tyyppiä ei tuettu"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "Yhteys epäonnistui"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "Suoritetaan avaintenvaihto"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "Muisti loppu"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "Yhdistetään SILC-palvelimelle"
+
+#: src/protocols/silc/silc.c:602
+msgid "Your Current Mood"
+msgstr "Tämänhetkinen mielialasi"
+
+#: src/protocols/silc/silc.c:604
+msgid "Normal"
+msgstr "Normaali"
+
+#: src/protocols/silc/silc.c:629
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"Suosimasi yhteysmetodit"
+
+#: src/protocols/silc/silc.c:646
+msgid "Your Current Status"
+msgstr "Tämänhetkinen tilasi"
+
+#: src/protocols/silc/silc.c:653
+msgid "Online Services"
+msgstr "Online palvelut"
+
+#: src/protocols/silc/silc.c:656
+msgid "Let others see what services you are using"
+msgstr "Anna muiden nähdä mitä palveluja käytät"
+
+#: src/protocols/silc/silc.c:662
+msgid "Let others see what computer you are using"
+msgstr "Anna muiden nähdä mitä tietokonetta käytät"
+
+#: src/protocols/silc/silc.c:669
+msgid "Your VCard File"
+msgstr "VCard tiedostosi"
+
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+msgid "User Online Status Attributes"
+msgstr "Käyttäjän paikallaoloatribuutit"
+
+#: 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 ""
+"Voit antaa toisten käyttäjien nähdä paikallaolo statuksesi ja "
+"henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
+"itsestäsi."
+
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+msgid "Message of the Day"
+msgstr "Päivän viesti"
+
+#: src/protocols/silc/silc.c:723
+msgid "No Message of the Day available"
+msgstr "Päivän viesti ei ole käytettävissä"
+
+#: src/protocols/silc/silc.c:724
+msgid "There is no Message of the Day associated with this connection"
+msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
+
+#: src/protocols/silc/silc.c:740
+msgid "Online Status"
+msgstr "Tila"
+
+#: src/protocols/silc/silc.c:749
+msgid "View Message of the Day"
+msgstr "Näytä Päivän viesti"
+
+#: src/protocols/silc/silc.c:813
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
+
+#: src/protocols/silc/silc.c:907
+msgid "Instant Messages"
+msgstr "Pikaviestit"
+
+#: src/protocols/silc/silc.c:912
+msgid "Digitally sign all IM messages"
+msgstr "Allekirjoita kaikki pikaviestit digitaalisesti"
+
+#: src/protocols/silc/silc.c:917
+msgid "Verify all IM message signatures"
+msgstr "Tarkista kaikki pikaviesti allekirjoitukset"
+
+#: src/protocols/silc/silc.c:920
+msgid "Channel Messages"
+msgstr "Kanavaviestit"
+
+#: src/protocols/silc/silc.c:925
+msgid "Digitally sign all channel messages"
+msgstr "Allekirjoita kaikki kanavaviestit digitaalisesti"
+
+#: src/protocols/silc/silc.c:930
+msgid "Verify all channel message signatures"
+msgstr "Tarkista kaikki kanavan viesti-allekirjoitukset"
+
+#: src/protocols/silc/silc.c:933
+msgid "Default SILC Key Pair"
+msgstr "Oletus SILC avainpari"
+
+#: src/protocols/silc/silc.c:938
+msgid "SILC Public Key"
+msgstr "SILC julkinen avain"
+
+#: src/protocols/silc/silc.c:943
+msgid "SILC Private Key"
+msgstr "SILC Yksityinen avain"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1026
+msgid "SILC Protocol Plugin"
+msgstr "SILC-protokollaplugin"
+
+#. *  description
+#: src/protocols/silc/silc.c:1028
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Secure Internet Live Conferencing (SILC) protokolla"
+
+#: src/protocols/silc/silc.c:1058
+msgid "Public key authentication"
+msgstr "Julkisella avaimella todentaminen"
+
+#: src/protocols/silc/silc.c:1064
+msgid "Public Key File"
+msgstr "Julkinen avaintiedosto"
+
+#: src/protocols/silc/silc.c:1068
+msgid "Private Key File"
+msgstr "Yksityinen avaintiedosto"
+
+#: src/protocols/silc/silc.c:1073
+msgid "Reject watching by other users"
+msgstr "Evää katsominen toisilta käyttäjiltä"
+
+#: src/protocols/silc/silc.c:1076
+msgid "Block invites"
+msgstr "Estä kutsut"
+
+#: src/protocols/silc/silc.c:1079
+msgid "Block IMs without Key Exchange"
+msgstr "Estä pikaviestit ilman avaintenvaihtoa"
+
+#: src/protocols/silc/silc.c:1082
+msgid "Reject online status attribute requests"
+msgstr "Evää paikallaolo-tilan atribuuttipyynnöt"
+
+#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+msgid "Creating SILC key pair..."
+msgstr "Luodaan SILC-avainpari"
+
+#: src/protocols/silc/util.c:277
+msgid "Real Name"
+msgstr "Oikea nimi"
+
+#: src/protocols/silc/util.c:279
+msgid "User Name"
+msgstr "Käyttäjänimi"
+
+#: src/protocols/silc/util.c:283
+msgid "Host Name"
+msgstr "Isäntänimi"
+
+#: src/protocols/silc/util.c:288
+msgid "Algorithm"
+msgstr "Algoritmi"
+
+#: src/protocols/silc/util.c:289
+msgid "Key Length"
+msgstr "Avaimen pituus"
+
+#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+msgid "Public Key Information"
+msgstr "Julkisen avaimen tiedot"
+
+#: src/protocols/toc/toc.c:166
 #, c-format
 msgid "Looking up %s"
 msgstr "Etsitään %s"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Viesti on liian pitkä, viimeiset %s tavua katkaistu."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ei ole parhaillaan kirjautuneena sisään."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s:n varoittaminen ei ole sallittua."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s: Chat ei ole käytettävissä."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Lähetät viestejä %s:lle liian nopeasti."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:533
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:536
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:539
 msgid "Failure."
 msgstr "Epäonnistuminen."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:542
 msgid "Too many matches."
 msgstr "Liian monta tulosta."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:545
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lisää määritteitä."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:548
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:551
 msgid "Email lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei välitetty."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:557
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:560
 msgid "User has no directory information."
 msgstr "Käyttäjällä ei ole hakemistotietoja."
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:564
 msgid "Country not supported."
 msgstr "Maata ei tuettu."
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:567
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tunnistamaton epäonnistuminen: %s."
 
-#: src/protocols/toc/toc.c:574
+#: src/protocols/toc/toc.c:573
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:576
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:579
 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."
@@ -8162,37 +9386,37 @@
 "ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:581
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:584
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:604
 msgid "Connection Closed"
 msgstr "Yhteys suljettu"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:644
 msgid "Waiting for reply..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:714
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:902
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
+#: src/protocols/toc/toc.c:906
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC on lähettänyt PAUSE-komennon."
+
 #: src/protocols/toc/toc.c:907
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC on lähettänyt PAUSE-komennon."
-
-#: src/protocols/toc/toc.c:908
 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 "
@@ -8202,45 +9426,45 @@
 "voi potkaista sinut ulos jos lähetät viestin. Gaim estää kaiken läpimenon. "
 "Tämä on vain väliaikaista, ole kärsivällinen."
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1417
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1553
 msgid "Set Dir Info"
 msgstr "Aseta hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1675
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1711
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
-#: 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:1756 src/protocols/toc/toc.c:1796
+#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
 msgid "Could not connect for transfer."
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa."
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1953
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2053
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimellä..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2087
 #, 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 pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
 msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2094
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
@@ -8256,15 +9480,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2195
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2199
 msgid "TOC port"
 msgstr "TOC-portti"
 
@@ -8322,7 +9546,7 @@
 msgid "Profile"
 msgstr "Profiili"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "Aseta profiili"
 
@@ -8349,11 +9573,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-protokollaliitännäinen"
 
-#: 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."
@@ -8361,27 +9585,27 @@
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai "
 "laitteesta."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:749
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:767
 msgid "Buzz!!"
 msgstr "Huomio!!"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:802
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! järjestelmäviesti käyttäjälle %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 ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: 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 "
@@ -8390,11 +9614,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:874
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: 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 "
@@ -8406,11 +9630,11 @@
 "päivitykset osoitteesta: %s."
 
 # NOTE edit of "Authentication failed"
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1604
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: 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 "
@@ -8420,77 +9644,77 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1680
 msgid "Ignore buddy?"
 msgstr "Älä välitä?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1716
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: 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 "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: src/protocols/yahoo/yahoo.c:1720
+#: src/protocols/yahoo/yahoo.c:1722
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Tuntematon virhekoodi %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 ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1781
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: 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 "Ei kyetty lukemaan"
 
-#: 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 "Yhteysvirhe"
 
-#: 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 "Poissa kotoa"
 
-#: 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 "Poissa työpöydältä"
 
-#: 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 "Poissa toimistolta"
 
-#: 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 "Lomalla"
 
-#: 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 "Piipahdan ulkona"
 
-#: 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 "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 #, c-format
 msgid ""
 "\n"
@@ -8499,31 +9723,31 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Join in Chat"
 msgstr "Liity chattiin"
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2562
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2571
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään chatissä?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2581
 msgid "Activate ID..."
 msgstr "Aktivoi ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
-#: 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"
@@ -8531,7 +9755,7 @@
 "<b>Tällä hetkellä profiileja, jotka on merkitty sisältämään aikuisviihdettä, "
 "ei tueta</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>"
@@ -8539,40 +9763,40 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi<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>Ei-englanninkieliset profiilit eivät ole tuettuja tällä hetkellä.</"
 "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"
 
 # NOTE from msn
-#: 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 "Harrastukset"
 
-#: 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 "Uutiset"
 
-#: src/protocols/yahoo/yahoo.c:3064
+#: src/protocols/yahoo/yahoo.c:3121
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: src/protocols/yahoo/yahoo.c:3076
+#: src/protocols/yahoo/yahoo.c:3133
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: src/protocols/yahoo/yahoo.c:3080
+#: src/protocols/yahoo/yahoo.c:3137
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: src/protocols/yahoo/yahoo.c:3082
+#: src/protocols/yahoo/yahoo.c:3139
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
@@ -8587,30 +9811,30 @@
 #. *< 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-protokollaliitännäinen"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Pager port"
 msgstr "Portti"
 
 # NOTE source: gnomeicu
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Chat Room List Url"
 msgstr "Chathuonelista Url"
 
@@ -8676,36 +9900,36 @@
 msgid "User Rooms"
 msgstr "Käyttäjän Huoneet"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:558
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</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>Näkymättömänä tai poissa linjoilta"
 
 # TODO
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:566
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
 # Context unclear.
-#: 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 "Kuka tahansa"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid "Already logged in with Zephyr"
 msgstr "Zephyriin jo kirjauduttu"
 
-#: 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."
@@ -8713,19 +9937,15 @@
 "Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin yhtä "
 "tiliä."
 
-#: 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 "_Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
@@ -8740,39 +9960,40 @@
 #. *< 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-protokollaliitännäinen"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
 # Dont know really what is the context so translation could be wrong.
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr "Altistus"
 
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "Pääsy evätty: proxy-palvelin estää portin 80 tunneloinnin."
-
-#: src/proxy.c:957
+#: src/proxy.c:853
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "Pääsy evätty: proxy-palvelin estää portin %d tunneloinnin."
+
+#: src/proxy.c:857
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy-yhteysvirhe %d"
 
 # XXX relatively minor editing
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välityspalvelinvalinnat"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8787,66 +10008,66 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1252
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: src/server.c:58
+#: src/server.c:60
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:962
+#: src/server.c:917
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d viesti)"
 msgstr[1] "(%d viestiä)"
 
-#: src/server.c:976
+#: src/server.c:931
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1111 src/server.c:1121
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/server.c:1184
+#: src/server.c:1134
 #, c-format
 msgid "%s signed on"
 msgstr "%s kirjautui sisään"
 
-#: src/server.c:1200
+#: src/server.c:1150
 #, c-format
 msgid "%s came back"
 msgstr "%s palasi"
 
-#: src/server.c:1202
+#: src/server.c:1152
 #, c-format
 msgid "%s went away"
 msgstr "%s on poissa"
 
-#: src/server.c:1217
+#: src/server.c:1167
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: src/server.c:1231
+#: src/server.c:1181
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1192 src/server.c:1200
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/server.c:1267
+#: src/server.c:1214
 #, c-format
 msgid "%s signed off"
 msgstr "%s on kirjautui ulos"
 
-#: src/server.c:1317
+#: src/server.c:1264
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8855,11 +10076,11 @@
 "Tiliä %s on juuri varoittanut %s.\n"
 "Uusi varoitustasosi on %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1267
 msgid "an anonymous person"
 msgstr "nimetön käyttäjä"
 
-#: src/server.c:1430
+#: src/server.c:1377
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8868,12 +10089,12 @@
 "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1381
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 
-#: src/server.c:1440
+#: src/server.c:1387
 msgid "Accept chat invitation?"
 msgstr "Hyväksy kutsu?"
 
@@ -8901,33 +10122,33 @@
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: src/util.c:2040
+#: src/util.c:2132
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: src/util.c:2043
+#: src/util.c:2135
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: 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] "päivä"
 msgstr[1] "päivää"
 
-#: 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] "tunti"
 msgstr[1] "tuntia"
 
-#: 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] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:2430
+#: src/util.c:2527
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
@@ -8943,6 +10164,205 @@
 msgid "Notification"
 msgstr "Ilmoitus"
 
+#~ msgid "Full Name:\t\t%s\n"
+#~ msgstr "Koko nimi:              %s\n"
+
+#~ msgid "First Name:\t%s\n"
+#~ msgstr "Etunimi:        %s\n"
+
+#~ msgid "Middle Names:\t%s\n"
+#~ msgstr "Muut etunimet:  %s\n"
+
+#~ msgid "Family Name:\t%s\n"
+#~ msgstr "Sukunimi:               %s\n"
+
+#~ msgid "Nickname:\t\t%s\n"
+#~ msgstr "Kutsumanimi:            %s\n"
+
+#~ msgid "Birth Day:\t\t%s\n"
+#~ msgstr "Syntymäpäivä:           %s\n"
+
+#~ msgid "Unit:\t\t%s\n"
+#~ msgstr "Yksikkö:                %s\n"
+
+#~ msgid "Homepage:\t%s\n"
+#~ msgstr "Kotisivu:       %s\n"
+
+#~ msgid "Address:\t%s\n"
+#~ msgstr "Osoite: %s\n"
+
+#~ msgid "Tel:\t\t\t%s\n"
+#~ msgstr "Puhelin:                       %s\n"
+
+#~ msgid "EMail:\t\t%s\n"
+#~ msgstr "Sähköposti:             %s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Note:\t\t%s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Huom:           %s\n"
+
+#~ msgid "Real Name:\t%s\n"
+#~ msgstr "Oikea nimi:     %s\n"
+
+#~ msgid "Username:\t\t%s\n"
+#~ msgstr "Käyttäjänimi:           %s\n"
+
+#~ msgid "Server:\t\t%s\n"
+#~ msgstr "Palvelin:               %s\n"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Ei yhteyttä määräajassa"
+
+#~ msgid "ZLocate"
+#~ msgstr "ZLocate"
+
+#~ msgid "Set"
+#~ msgstr "Aseta"
+
+# please check (load the Idle plugin and check the text. I don't think)
+# this sentence (the previous string, this, plus the next) makes sense)
+# - checked it and makes sense
+#~ msgid "idle for"
+#~ msgstr "Jouten"
+
+#~ msgid "Use"
+#~ msgstr "Käytä"
+
+#~ msgid "/Tools/P_rotocol Actions"
+#~ msgstr "/Työkalut/P_rotokollatoiminnot"
+
+#~ msgid "Style"
+#~ msgstr "Tyyli"
+
+#~ msgid "_Bold"
+#~ msgstr "_Lihavoi"
+
+#~ msgid "_Italic"
+#~ msgstr "_Kursivoi"
+
+#~ msgid "_Underline"
+#~ msgstr "_Alleviivaa"
+
+#~ msgid "_Strikethrough"
+#~ msgstr "_Yliviivaa"
+
+#~ msgid "Face"
+#~ msgstr "Kirjasin tyyppi"
+
+#~ msgid "Use custo_m face"
+#~ msgstr "Valitse _kirjasin"
+
+#~ msgid "Use custom si_ze"
+#~ msgstr "Valitse k_oko"
+
+#~ msgid "Color"
+#~ msgstr "Väri"
+
+#~ msgid "_Text color"
+#~ msgstr "_Tekstin väri"
+
+#~ msgid "Bac_kground color"
+#~ msgstr "T_austaväri"
+
+#~ msgid "Show graphical _smileys"
+#~ msgstr "Näytä graafiset _hymiöt"
+
+#~ msgid "Show _URLs as links"
+#~ msgstr "Näytä _URL:t linkkeinä"
+
+#~ msgid "Buddy List Toolbar"
+#~ msgstr "Tuttavalistan työkalurivi"
+
+#~ msgid "Group Display"
+#~ msgstr "Ryhmien näyttö"
+
+#~ msgid "Show _numbers in groups"
+#~ msgstr "Näytä _määrät ryhmissä"
+
+#~ msgid "Send _URLs as links"
+#~ msgstr "Lähetä _URL:t linkkeinä"
+
+#~ msgid "Show status _icons on tabs"
+#~ msgstr "Näytä tila-ikoni välilehdissä"
+
+#~ msgid "New window _width:"
+#~ msgstr "Uuden ikkunan _leveys:"
+
+#~ msgid "New window _height:"
+#~ msgstr "Uuden ikkunan _korkeus:"
+
+#~ msgid "_Entry field height:"
+#~ msgstr "Kirjoitu_salueen korkeus:"
+
+#~ msgid "Hide window on _send"
+#~ msgstr "Piilota ikkuna _lähetettäessä"
+
+#~ msgid "Show _logins in window"
+#~ msgstr "Näytä _sisäänkirjautumiset ikkunassa"
+
+#~ msgid "Tab Completion"
+#~ msgstr "\"Tab\"-täydennys"
+
+#~ msgid "_Tab-complete nicks"
+#~ msgstr "\"_Tab\"-täydennys lempinimille"
+
+#~ msgid "_Old-style tab completion"
+#~ msgstr "_Vanhantyylinen \"Tab\"-täydennys"
+
+#~ msgid "_Show people joining in window"
+#~ msgstr "_Näytä ihmisten saapuminen ikkunassa"
+
+#~ msgid "_Show people leaving in window"
+#~ msgstr "_Näytä ihmisten poistuminen ikkunassa"
+
+#~ msgid "Sounds when you _log in"
+#~ msgstr "_Äänet kun kirjaudut sisään"
+
+#~ msgid "_Sending messages removes away status"
+#~ msgstr "Viestien _lähettäminen poistaa poissaolotilan"
+
+#~ msgid "Seconds before _resending:"
+#~ msgstr "Sekunteja ennen _uudelleenlähetystä:"
+
+# XXX
+#~ msgid "Send auto-response in _active conversations"
+#~ msgstr "Lähetä automaattista vastausta _aktiivisissa keskusteluissa"
+
+#~ msgid "Fonts"
+#~ msgstr "Kirjasimet"
+
+#~ msgid ""
+#~ "You are not currently signed on with any protocols that have the ability "
+#~ "to list rooms."
+#~ msgstr ""
+#~ "Et ole kirjautuneena millään protokollalla jolla voisi listata chat-"
+#~ "huoneita."
+
+#~ msgid "<b>Screen Name:</b>"
+#~ msgstr "<b>Näyttönimi:</b>"
+
+#~ msgid "Sign on"
+#~ msgstr "Kirjaudu"
+
+#~ msgid "Unable to send password"
+#~ msgstr "Ei kyetty lähettämään salasanaa"
+
+#~ msgid "IO Error."
+#~ msgstr "IO-virhe"
+
+#~ msgid ""
+#~ "<b>Status:</b> %s\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "<b>Tila:</b> %s\n"
+#~ "<b>Viesti:</b> %s"
+
+#~ msgid "<b>Status:</b> %s"
+#~ msgstr "<b>Tila:</b> %s"
+
 #~ msgid "Username: <b>%s</b><br>\n"
 #~ msgstr "Käyttäjänimi: <b>%s</b><br>\n"
 
@@ -9108,9 +10528,6 @@
 #~ msgid "Gaim - Information"
 #~ msgstr "Gaim - Tietoja"
 
-#~ msgid "Add a new group"
-#~ msgstr "Lisää uusi ryhmä"
-
 #~ msgid "Gaim - Insert Image"
 #~ msgstr "Gaim - Liitä kuva"
 
@@ -9132,9 +10549,6 @@
 #~ msgid "Gaim - Save Icon"
 #~ msgstr "Gaim - Tallenna kuvake"
 
-#~ msgid "Join what group:"
-#~ msgstr "Mihin ryhmään liitytään:"
-
 #~ msgid "Unknown error."
 #~ msgstr "Tuntematon virhe."
 
@@ -9190,9 +10604,6 @@
 #~ msgid "_Host"
 #~ msgstr "_Isäntä"
 
-#~ msgid "_User"
-#~ msgstr "_Käyttäjä"
-
 #~ msgid "Pa_ssword"
 #~ msgstr "_Salasana"
 
@@ -9214,10 +10625,6 @@
 #~ msgid "Log Conversation"
 #~ msgstr "Kirjaa keskustelu lokiin"
 
-# XXX
-#~ msgid "%s has been disconnected"
-#~ msgstr "%s:n yhteys on katkennut"
-
 #~ msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 #~ msgstr "<HR><BR><H3 Align=Center> ---- Uusi keskustelu @ %s ----</H3><BR>\n"
 
@@ -9315,9 +10722,6 @@
 #~ msgid "Enable Animation"
 #~ msgstr "Ota animaatio käyttöön"
 
-#~ msgid "Group"
-#~ msgstr "Ryhmä"
-
 #~ msgid "Add To"
 #~ msgstr "Lisää"
 
@@ -9444,15 +10848,9 @@
 #~ msgid "UIN:"
 #~ msgstr "UIN:"
 
-#~ msgid "First Name:"
-#~ msgstr "Etunimi:"
-
 #~ msgid "Gender:"
 #~ msgstr "Sukupuoli:"
 
-#~ msgid "Birthday:"
-#~ msgstr "Syntymäpäivä:"
-
 #~ msgid "Age:"
 #~ msgstr "Ikä:"
 
@@ -9672,9 +11070,6 @@
 #~ msgid "Gaim - Add URL"
 #~ msgstr "Gaim - Lisää URL"
 
-#~ msgid "Import to:"
-#~ msgstr "Tuo:"
-
 #~ msgid "Gaim - Import Buddy List"
 #~ msgstr "Gaim - Tuo tuttavalista"
 
@@ -9708,9 +11103,6 @@
 #~ msgid "Register with server"
 #~ msgstr "Rekisteröidy palvelimeen"
 
-#~ msgid "Enter Password"
-#~ msgstr "Anna salasana"
-
 #~ msgid ""
 #~ "You cannot log this account in; you do not have the protocol it uses "
 #~ "loaded, or the protocol does not have a login function."
@@ -9735,9 +11127,6 @@
 #~ msgid "%s was unable to sign on"
 #~ msgstr "%s ei kyennyt kirjautumaan sisään"
 
-#~ msgid "Signon Error"
-#~ msgstr "Sisäänkirjautumisvirhe"
-
 #, fuzzy
 #~ msgid "Show _debug window"
 #~ msgstr "Näytä testausikkuna"
@@ -9876,9 +11265,6 @@
 #~ msgid "Password: "
 #~ msgstr "Salasana: "
 
-#~ msgid "About"
-#~ msgstr "Tietoja"
-
 #~ msgid "Load Script"
 #~ msgstr "Lataa skripti"
 
@@ -9915,9 +11301,6 @@
 #~ msgid "Small"
 #~ msgstr "Pieni"
 
-#~ msgid "Normal"
-#~ msgstr "Normaali"
-
 #~ msgid "Increase font size"
 #~ msgstr "Suurenna fonttikokoa"
 
@@ -10067,9 +11450,6 @@
 #~ msgid "Chat Error"
 #~ msgstr "Ryhmäkeskusteluvirhe"
 
-#~ msgid "Could not write file header!"
-#~ msgstr "Ei voitu kirjoittaa tiedoston otsikkoa!"
-
 #~ msgid "Attempting to sign on...."
 #~ msgstr "Yritetään kirjautua sisään..."
 
@@ -10094,9 +11474,6 @@
 #~ msgid "Gaim - Change Password Error"
 #~ msgstr "Gaim - Salasanan muuttamisvirhe"
 
-#~ msgid "Unable to remove file %s - %s"
-#~ msgstr "Ei kyetty poistamaan tiedostoa %s - %s"
-
 #~ msgid "Preferences Error"
 #~ msgstr "Asetusvirhe"