changeset 7906:d3f2aa8de5bf

[gaim-migrate @ 8566] finish translation from Arto Alakulju and find dialog tweaks from javabsp committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 21 Dec 2003 19:52:25 +0000
parents 1d0bc32f8038
children 84f6040ab60f
files ChangeLog po/fi.po src/gtkconv.c
diffstat 3 files changed, 1647 insertions(+), 1442 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Dec 21 09:04:43 2003 +0000
+++ b/ChangeLog	Sun Dec 21 19:52:25 2003 +0000
@@ -12,6 +12,7 @@
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* English (British) translation re-added (Luke Ross (lukeross))
+	* Finnish translation updated (Arto Alakulju)
 	* Italian translation updated (Claudio Satriano)
 	* Portuguese (Brazilian) translation updated (Mauricio de Lemos
 	  Rodrigues Collares Neto)
--- a/po/fi.po	Sun Dec 21 09:04:43 2003 +0000
+++ b/po/fi.po	Sun Dec 21 19:52:25 2003 +0000
@@ -8,10 +8,10 @@
 # NOTE netscape is http://ftp.mozilla.org/pub/mozilla/l10n/glossaries/fi-usgloss4.51.txt
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.73\n"
+"Project-Id-Version: gaim 0.75\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-19 15:28+0200\n"
-"PO-Revision-Date: 2003-11-19 16:49+0200\n"
+"POT-Creation-Date: 2003-12-19 09:35+0200\n"
+"PO-Revision-Date: 2003-12-19 09:38+0200\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/autorecon.c:107 plugins/autorecon.c:109
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kun yhteys palvelimelle katkeaa, tämä luo yhteyden uudelleen."
@@ -136,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -152,12 +153,12 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2313 src/gtkpounce.c:411
-#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:5534
-#: src/protocols/oscar/oscar.c:6135
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2532 src/gtkpounce.c:411
+#: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:6163
 msgid "Away"
 msgstr "Poissa"
 
@@ -172,16 +173,16 @@
 msgstr "Vaimenna äänet"
 
 # NOTE source: gnomeicu
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "Tiedostosiirtot"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2333 src/main.c:329
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -220,7 +221,6 @@
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Näyttää Gaim-ikonin järjestelmän ikonitarjottimella."
 
-#. *  description
 #: plugins/docklet/docklet.c:511
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
@@ -241,14 +241,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
 msgstr "Gaim tiedostohallinta"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#. *  description
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Mahdollistaa Gaimin kontrolloinnin komentotiedostolla."
 
@@ -275,19 +276,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:715
 msgid "Remote Control"
 msgstr "Kauko-ohjain"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:718
 msgid "Provides remote control for gaim applications."
 msgstr "Tuo kauko-ohjauksen Gaim-sovelluksille."
 
-#. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:720
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -302,19 +302,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim esittelyplugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "Esimerkkiplugin joka tekee jotain - katso kuvaus."
 
-#. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -363,7 +362,6 @@
 msgid "Provides support for mouse gestures"
 msgstr "Lisää tuen hiirieleille"
 
-#. *  description
 #: plugins/gestures/gestures.c:276
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
@@ -380,51 +378,21 @@
 "Liikuta ylös ja sitten vasemmalle vaihtaaksesi edelliseen keskusteluun.\n"
 "Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "Gnomen osakekurssisovelman asetukset"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "Päivitystiheys minuuteissa"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "Kirjoita symbolit erotettuna \"+\"-merkillä alla olevaan laatikkoon."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "Näytä vain symbolit ja hinta:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "Vierittää vasemmalta oikealle:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(Ei"
-
-# NOTE sf.net bug 770788
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "vaihtoa"
-
-#: plugins/history.c:75
+#: plugins/history.c:74
 msgid "History"
 msgstr "Historia"
 
-#: plugins/history.c:77
+#: plugins/history.c:76
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Näyttää osan edellistä keskustelua uudessa keskustelussa."
 
-#: plugins/history.c:78
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
-msgstr ""
-"Kun uusi keskustelu aloitetaan, tämä plugin asettaa viimeiset XXX riviä "
-"edellisestä keskustelusta uuteen."
+#: plugins/history.c:77
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Kun uusi keskustelu aloitetaan, tämä plugin näytää edellisen keskustelun "
+"keskusteluikkunassa."
 
 #. *< api_version
 #. *< type
@@ -440,6 +408,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
@@ -494,7 +463,6 @@
 msgid "Test plugin IPC support, as a client."
 msgstr "IPC testi-asiakasohjelmaplugin"
 
-#. *  description
 #: plugins/ipc-test-client.c:89
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
@@ -521,7 +489,6 @@
 msgid "Test plugin IPC support, as a server."
 msgstr "Testiplugin - IPC palvelin"
 
-#. *  description
 #: plugins/ipc-test-server.c:76
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Testuplugin - IPC palvelin. Tämä rekisteröi IPC-komennot."
@@ -615,6 +582,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
@@ -632,6 +600,7 @@
 
 #. *< name
 #. *< version
+#. *< summary
 #: plugins/perl/perl.c:526 plugins/perl/perl.c:527
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-plugineja."
@@ -674,7 +643,9 @@
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
-msgstr "Version %s voi ladata osoitteesta:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"Version %s voi ladata osoitteesta:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
 
 #: plugins/relnot.c:77 plugins/relnot.c:78
 msgid "New Version Available"
@@ -687,23 +658,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:133
+#: plugins/relnot.c:134
 msgid "Release Notification"
 msgstr "Julkaisuilmoitus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:136
+#: plugins/relnot.c:137
 msgid "Checks periodically for new releases."
 msgstr "Tarkistaa määräajoin onko uusi Gaim-versio julkaistu."
 
-#. *  description
-#: plugins/relnot.c:138
+#: plugins/relnot.c:139
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
-msgstr "Tarkistaa määräajoin onko uusi Gaim-versio julkaistu ja huomauttaa käyttäjää näyttämällä muutoslokin."
+msgstr ""
+"Tarkistaa määräajoin onko uusi Gaim-versio julkaistu ja huomauttaa käyttäjää "
+"näyttämällä muutoslokin."
 
 #. *< api_version
 #. *< type
@@ -719,6 +691,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
@@ -737,6 +710,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "Kokeilee että useimmat asiat toimivat."
@@ -780,14 +754,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:197
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:200 plugins/ssl/ssl-gnutls.c:202
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTSL:n kautta."
 
@@ -798,14 +773,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#. *  description
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -824,6 +800,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
@@ -859,9 +836,6 @@
 msgid "Buddy State Notification"
 msgstr "Tuttavan-tila ilmoitus"
 
-#. *< name
-#. *< version
-#. *  summary
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -869,11 +843,11 @@
 msgstr ""
 "Ilmoittaa keskusteluikkunassa kun tuttava on poissa/jouten ja kun hän palaa."
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-plugin lataaja"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcp-pluginien latauksen."
 
@@ -891,6 +865,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
@@ -922,6 +897,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Lisää iChat tyylisen aikaleiman keskusteluihin N sekunnin välein."
@@ -975,6 +951,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -1000,8 +977,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2150
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2366
+#: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1020,8 +997,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:882
+#: src/gtkprefs.c:2267
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1094,173 +1071,184 @@
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:145
+#: src/about.c:138
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:146
+#: src/about.c:139
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:147
+#: src/about.c:140
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:150
+#: src/about.c:143
 msgid "former maintainer"
 msgstr "entinen ylläpitäjä"
 
-#: src/about.c:151
+#: src/about.c:144
 msgid "former Jabber developer"
 msgstr "entinen Jabber-ylläpitäjä"
 
-#: src/about.c:152
+#: src/about.c:145
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:155
+#: src/about.c:148
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:163
+#: src/about.c:156
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
 # NOTE source: netscape
-#: src/about.c:164 src/about.c:195
+#: src/about.c:157 src/about.c:190
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:165 src/about.c:196
+#: src/about.c:158 src/about.c:191
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/about.c:166
+#: src/about.c:159
 msgid "Danish"
 msgstr "Tanska"
 
-#: src/about.c:167 src/about.c:197
+#: src/about.c:160
+msgid "British English"
+msgstr "Brittienglanti"
+
+#: src/about.c:161 src/about.c:192
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:168 src/about.c:198
+#: src/about.c:162 src/about.c:193
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:169
+#: src/about.c:163 src/about.c:194
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:170 src/about.c:199
+#: src/about.c:164 src/about.c:195
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:171
+#: src/about.c:165
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:172
+#: src/about.c:166
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:173 src/about.c:201
+#: src/about.c:167 src/about.c:197
 msgid "Italian"
 msgstr "Italia"
 
 # NOTE source: netscape
-#: src/about.c:174 src/about.c:203
+#: src/about.c:168 src/about.c:199
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:175
+#: src/about.c:169
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
 # NOTE source: netscape
-#: src/about.c:176
+#: src/about.c:170
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:177 src/about.c:204
+#: src/about.c:171 src/about.c:200
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:178
+#: src/about.c:172
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:179
+#: src/about.c:173
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:180
+#: src/about.c:174
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:181 src/about.c:205
+#: src/about.c:175 src/about.c:201
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:182
+#: src/about.c:176
 msgid "Serbian"
 msgstr "Serbia"
 
-#: src/about.c:183 src/about.c:207
+#: src/about.c:177 src/about.c:203
 msgid "Swedish"
 msgstr "Ruotsi"
 
+#: src/about.c:178
+msgid "Vietnamese"
+msgstr "Vietnam"
+
+#: src/about.c:178
+msgid "Gnome Vi Team"
+msgstr "Gnome Vi-työryhmä"
+
 # XXX source: netscape + google
-#: src/about.c:184
+#: src/about.c:179
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:185
+#: src/about.c:180
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
-#: src/about.c:192
+#: src/about.c:187
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: src/about.c:193
+#: src/about.c:188
 msgid "Amharic"
 msgstr "Amhara"
 
-#: src/about.c:194
+#: src/about.c:189
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: src/about.c:200
+#: src/about.c:196
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/about.c:202
+#: src/about.c:198
 msgid "Japanese"
 msgstr "Japani"
 
 # NOTE source: netscape
-#: src/about.c:206
+#: src/about.c:202
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:208
+#: src/about.c:204
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/about.c:221 src/dialogs.c:2180 src/gtkrequest.c:198
-#: src/protocols/msn/msn.c:247
+#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Sulje"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:980
+#: src/account.c:275 src/protocols/jabber/jabber.c:978
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
@@ -1285,63 +1273,61 @@
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: src/account.c:331
+#: src/account.c:333
 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:334 src/connection.c:193 src/dialogs.c:1720
-#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1512
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1025
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
+#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:6185 src/protocols/oscar/oscar.c:6281
-#: src/protocols/oscar/oscar.c:6330 src/protocols/oscar/oscar.c:6412
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2406
+#: src/request.h:852
 msgid "OK"
 msgstr "OK"
 
-#. Cancel button.
-#: src/account.c:335 src/account.c:369 src/buddy_chat.c:371
-#: src/connection.c:194 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:505 src/dialogs.c:890 src/dialogs.c:1554 src/dialogs.c:1721
-#: src/dialogs.c:1738 src/dialogs.c:1781 src/dialogs.c:1897
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1513
-#: src/gtkblist.c:3452 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
+#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
+#: src/gtkblist.c:3681 src/gtkconn.c:149 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 #: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:657
-#: src/protocols/jabber/jabber.c:1026 src/protocols/msn/msn.c:182
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6013 src/protocols/oscar/oscar.c:6186
-#: src/protocols/oscar/oscar.c:6282 src/protocols/oscar/oscar.c:6331
-#: src/protocols/oscar/oscar.c:6396 src/protocols/oscar/oscar.c:6413
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2233
-#: src/request.h:852 src/request.h:862
+#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
+#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2399
+#: src/protocols/yahoo/yahoo.c:2407 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/account.c:361
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
 # src/menus.c:280
-#: src/account.c:368 src/dialogs.c:886 src/dialogs.c:1542 src/dialogs.c:2189
-#: src/gtkrequest.c:202 src/protocols/jabber/buddy.c:511
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Tallenna"
 
 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - Poissa!"
+msgid "Away!"
+msgstr "Poissa!"
 
 #: src/away.c:269
 msgid "I'm Back!"
@@ -1359,16 +1345,16 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/blist.c:551 src/gtkprefs.c:2267
+#: src/blist.c:566 src/gtkprefs.c:2269
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
-#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:2930
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1159
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3148
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/blist.c:1134
+#: src/blist.c:1148
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1379,30 +1365,30 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1143
+#: src/blist.c:1157
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: src/blist.c:1193 src/gtkaccount.c:159 src/gtkutils.c:844
-#: src/protocols/jabber/auth.c:110 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
+#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/blist.c:1516
+#: src/blist.c:1530
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmänimi"
 
-#: src/blist.c:2159
+#: src/blist.c:2180
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "Virhe jäsenneltäessä tuttavalistaa. Sitä ei ole ladattu."
 
 # XXX probably better than forming yet another new compound?
-#: src/blist.c:2161
+#: src/blist.c:2182
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
-#: src/buddy_chat.c:312 src/gtkblist.c:3344
+#: src/buddy_chat.c:212 src/gtkblist.c:3571
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1410,22 +1396,24 @@
 "Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: src/buddy_chat.c:326
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/buddy_chat.c:332
-msgid "Buddy Chat"
-msgstr "Ryhmäkeskustelu"
-
-#: src/buddy_chat.c:342
-msgid "Join Chat As:"
-msgstr "Liity ryhmäkeskusteluun nimellä:"
-
-#. Join button.
-#: src/buddy_chat.c:365
-msgid "Join"
-msgstr "Liity"
+#: src/buddy_chat.c:225 src/gtkblist.c:924
+msgid "_Join"
+msgstr "_Liity"
+
+#: src/buddy_chat.c:242
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "Anna tiedot chatistä johon haluat liittyä.\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "_Käyttäjätili:"
 
 #: src/connection.c:117 src/connection.c:165
 #, c-format
@@ -1447,75 +1435,75 @@
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:324
+#: src/conversation.c:327
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:332
+#: src/conversation.c:335
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1905
+#: src/conversation.c:1916
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1908
+#: src/conversation.c:1919
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:1993
+#: src/conversation.c:2004
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2035
+#: src/conversation.c:2046
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2037
+#: src/conversation.c:2048
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2110
+#: src/conversation.c:2121
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2123
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2394
+#: src/conversation.c:2405
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
 # XXX
-#: src/conversation.c:2396
+#: src/conversation.c:2407
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2398
+#: src/conversation.c:2409
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2400
+#: src/conversation.c:2411
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: src/dialogs.c:307
+#: src/dialogs.c:201
 msgid "Warn User"
 msgstr "Varoita käyttäjää"
 
-#: src/dialogs.c:310
+#: src/dialogs.c:204
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1526,25 +1514,25 @@
 "Tämä nostaa %s:n varoitustasoa ja hän tulee saamaan kovemman "
 "taajuusrajoituksen.\n"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:229
 msgid "Warn _anonymously?"
 msgstr "Varoitako _nimettömänä?"
 
-#: src/dialogs.c:342
+#: src/dialogs.c:236
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Nimettömät varoitukset ovat vähemmän ankaria.</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:349
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa '%s':n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1553,11 +1541,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä '%s' tuttavalistaltasi.  Haluatko "
 "jatkaa?"
 
-#: src/dialogs.c:469 src/dialogs.c:470
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1565,12 +1553,12 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä '%s' tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:482 src/dialogs.c:483
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
 # TODO Untranslated
-#: src/dialogs.c:500
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1580,234 +1568,144 @@
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
 # NOTE source: 0.59.8/0.60
-#: src/dialogs.c:503 src/dialogs.c:504
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:652
-msgid "New Message"
-msgstr "Uusi viesti"
-
-#: src/dialogs.c:670
+#: src/dialogs.c:543
+msgid "New Instant Message"
+msgstr "Uusi pikaviesti"
+
+#: src/dialogs.c:561
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Syötä sen henkilön näyttönimi, jolle haluat lähettää pikaviestin.\n"
 
-#: src/dialogs.c:686 src/dialogs.c:763
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "_Näyttönimi:"
 
-#: src/dialogs.c:701 src/dialogs.c:779 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "_Käyttäjätili:"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: src/dialogs.c:751
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Syötä sen henkilön näyttönimi, jonka tiedot haluat nähdä.\n"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1036
-#: src/protocols/oscar/oscar.c:6481 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "Aseta käyttäjätiedot"
-
-#: src/dialogs.c:854
-#, c-format
-msgid "Changing info for %s:"
-msgstr "Muutetaan käyttäjätietoja %s:lle"
-
-#: src/dialogs.c:969
+#: src/dialogs.c:757
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: src/dialogs.c:971
-msgid "Insert"
-msgstr "Lisää"
-
-#: src/dialogs.c:993
+#: src/dialogs.c:759
+msgid "_Insert"
+msgstr "_Lisää"
+
+#: src/dialogs.c:782
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr ""
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. Kuvaus on valinnainen.\n"
 
-#: src/dialogs.c:1011 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:638
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:1021 src/gtkprefs.c:601 src/gtkprefs.c:1803
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "Kuvaus"
-
-#: src/dialogs.c:1157 src/dialogs.c:1174
+#: src/dialogs.c:795
+msgid "_URL:"
+msgstr "_URL:"
+
+#: src/dialogs.c:808
+msgid "_Description:"
+msgstr "_Kuvaus:"
+
+#: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: src/dialogs.c:1209 src/dialogs.c:1226
+#: src/dialogs.c:989 src/dialogs.c:1006
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: src/dialogs.c:1311 src/dialogs.c:1337
+#: src/dialogs.c:1091 src/dialogs.c:1117
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: src/dialogs.c:1403
+#: src/dialogs.c:1183
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviestiä tyhjällä otsikolla"
 
-#: src/dialogs.c:1405
+#: src/dialogs.c:1185
 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:1415
+#: src/dialogs.c:1195
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:1480 src/dialogs.c:1488
+#: src/dialogs.c:1260 src/dialogs.c:1268
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:1498
+#: src/dialogs.c:1278
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1326
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
-#: src/dialogs.c:1550
+#: src/dialogs.c:1330
 msgid "Use"
 msgstr "Käytä"
 
 #. show everything
-#: src/dialogs.c:1699
+#: src/dialogs.c:1471
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:1717
+#: src/dialogs.c:1489
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: src/dialogs.c:1717
-msgid "Alias chat"
-msgstr "Anna ryhmäkeskustelulle alias"
-
-#: src/dialogs.c:1718
-msgid "Please enter an aliased name for this chat."
-msgstr "Syötä aliasnimi ryhmäkeskustelulle."
-
-#: src/dialogs.c:1734
+#: src/dialogs.c:1490
+msgid "Enter an alias for this chat."
+msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
+
+#: src/dialogs.c:1506
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-# XXX from similar string, likely wrong
-#: src/dialogs.c:1734
-msgid "Alias contact"
-msgstr "Anna kontaktiryhmälle alias"
-
-#: src/dialogs.c:1735
-msgid "Please enter an aliased name for this contact."
+#: src/dialogs.c:1507
+msgid "Enter an alias for this contact."
 msgstr "Anna alias tälle kontaktiryhmälle."
 
-#: src/dialogs.c:1766
-msgid "_Screenname"
-msgstr "_Näyttönimi"
-
-#: src/dialogs.c:1771 src/gtkblist.c:838 src/gtkblist.c:931 src/gtkblist.c:937
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/dialogs.c:1775
+# XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
+#: src/dialogs.c:1524
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Anna %s:n alias."
+
+#: src/dialogs.c:1526
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: src/dialogs.c:1776
-msgid "Alias buddy"
-msgstr "Anna tuttavalle alias"
-
-#: src/dialogs.c:1777
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"Anna aliasnimi allaolevalle henkilölle tai nimeä tämä kontakti "
-"tuttavalistalla."
-
-# NOTE relatively minor editing of similar string (Palvelimelle -> %s:lle)
-#: src/dialogs.c:1813 src/dialogs.c:1820
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "%s:lle ei kyetty kirjoittamaan."
-
-#: src/dialogs.c:1844
-msgid "Save Log File"
-msgstr "Tallenna lokitiedosto"
-
-# XXX editing of similar string
-#: src/dialogs.c:1872
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "Ei voitu poistaa asetustiedostoa %s."
-
-#: src/dialogs.c:1891
-#, c-format
-msgid "You are about to remove the log file for %s.  Do you want to continue?"
-msgstr "Olet poistamassa lokitiedostoa %s:lle.  Haluatko jatkaa?"
-
-#: src/dialogs.c:1892 src/dialogs.c:2062
-msgid "System Log"
-msgstr "Järjestelmäloki"
-
-#: src/dialogs.c:1893 src/dialogs.c:1895
-msgid "Remove Log"
-msgstr "Poista loki"
-
-#: src/dialogs.c:1923 src/dialogs.c:2083
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "Ei voitu avata lokitiedostoa %s."
-
-#: src/dialogs.c:2060
-#, c-format
-msgid "Conversations with %s"
-msgstr "Keskustelut %s:n kanssa"
-
-#: src/dialogs.c:2104 src/protocols/jabber/jabber.c:643
-msgid "Date"
-msgstr "Ajankohta"
-
-#: src/dialogs.c:2161
-msgid "Log"
-msgstr "Loki"
-
-#: src/dialogs.c:2184
-msgid "Clear"
-msgstr "Tyhjennä"
-
-#: src/ft.c:123
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: src/ft.c:137
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s ei löydy.\n"
 
-#: src/ft.c:693
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Tiedostonsiirto %s:lle keskeytetty.\n"
 
-#: src/ft.c:695
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Tiedostonsiirto %s:lta keskeytetty.\n"
@@ -1820,7 +1718,7 @@
 msgid "Size of the expander arrow"
 msgstr "Laajenninnuolen koko"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1841,11 +1739,11 @@
 "        OPTIOT:\n"
 "           -h, --help [komento] Näytä komennon ohje\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim ei ole käynnissä (sessiossa 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1857,22 +1755,22 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
 "AIM: URI:en käyttö:\n"
-"Pikaviestin lähetys näyttönimeen:\n"
-"            gaim-remote uri 'aim:gaim?screenname=Penguin&message=hello"
+"Pikaviestin lähetys näyttönimelle:\n"
+"            gaim-remote uri 'aim:goim?screenname=Penguin&message=hello"
 "+world'\n"
-"Tässä esimerkissä lähetetään viesti näyttönimeen 'Penguin' ja 'hello world'\n"
+"Tässä esimerkissä lähetetään viesti nimelle 'Penguin' ja 'hello world'\n"
 "on lähetettävä viesti. '+':aa tulee käyttää välilyönnin sijasta.\n"
 "Huomaa lainausmerkkien käyttö -  jos tämä suoritetaan komentorivillä\n"
 "'&'-merkit tulee kiertää tai komennon suoritus loppuu siihen.\n"
@@ -1880,14 +1778,14 @@
 "         gaim-remote uri aim:goim?screenname=Penguin\n"
 "\n"
 "Ryhmäkeskusteluun liittyminen:\n"
-"                  gaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"                  gaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...liittyy 'PenguinLounge'-chathuoneeseen.\n"
 "\n"
 "Tuttavan lisääminen tuttavalistaan:\n"
-"         gaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"         gaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...pyytää lisäämään tuttavan 'Penguin' tuttavalistalle.\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1904,15 +1802,15 @@
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2111
+#: src/gaimrc.c:1259 src/gtkblist.c:2328
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2112
+#: src/gaimrc.c:1261 src/gtkblist.c:2329
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2113
+#: src/gaimrc.c:1263 src/gtkblist.c:2330
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
@@ -1932,7 +1830,7 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3080
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
@@ -1949,12 +1847,11 @@
 msgid "Screenname:"
 msgstr "Näyttönimi:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:307
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3084 src/gtkblist.c:3403
+#: src/gtkaccount.c:469 src/gtkblist.c:3308 src/gtkblist.c:3630
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2017,7 +1914,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
+#: src/gtkaccount.c:782 src/gtkprefs.c:1103
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -2033,15 +1930,15 @@
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:851 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:860 src/gtkprefs.c:1127
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:864 src/gtkprefs.c:1144
 msgid "_Port:"
 msgstr "_Portti:"
 
@@ -2049,7 +1946,7 @@
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:877 src/gtkprefs.c:1179
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
@@ -2071,7 +1968,7 @@
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:656
+#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:650
 msgid "Register"
 msgstr "Rekisteröi"
 
@@ -2084,27 +1981,27 @@
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:926
-#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4586
-#: src/protocols/oscar/oscar.c:6134 src/protocols/yahoo/yahoo.c:2032
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2193
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s on tehnyt %s:sta tuttavansa%s%s%s"
 
-#: src/gtkaccount.c:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2114,192 +2011,200 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2083
-msgid "Gaim - Information"
-msgstr "Gaim - Tietoja"
-
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2084
+msgid "Information"
+msgstr "Tiedot"
+
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: src/gtkaccount.c:2089 src/gtkblist.c:3451 src/gtkconv.c:1257
-#: src/gtkconv.c:3110 src/gtkconv.c:4312 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
+#: src/gtkaccount.c:2090 src/gtkblist.c:3680 src/gtkconv.c:1272
+#: src/gtkconv.c:3197 src/gtkconv.c:4402 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:811
+#: src/gtkblist.c:813
 msgid "_Get Info"
 msgstr "_Hae tiedot"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:816
 msgid "_IM"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:816
-msgid "Add Buddy _Pounce"
-msgstr "Lisää tuttava_ilmoitin"
-
 #: src/gtkblist.c:818
+msgid "Add Buddy _Pounce"
+msgstr "Lisää tuttava_ilmoitin"
+
+#: src/gtkblist.c:820
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:840 src/gtkblist.c:933 src/gtkblist.c:942
+#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+msgid "_Alias..."
+msgstr "_Alias..."
+
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:425
+#: src/gtkconn.c:461
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:912
+#: src/gtkblist.c:905
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:914
+#: src/gtkblist.c:907
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:916
+#: src/gtkblist.c:909
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:918
+#: src/gtkblist.c:911
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
+# XXX from gstt but conjugated, & should this be a verb?
 #: src/gtkblist.c:926
-msgid "_Join"
-msgstr "_Liity"
-
-# XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:928
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:939 src/gtkblist.c:969
+#: src/gtkblist.c:950 src/gtkblist.c:985
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:974
+#: src/gtkblist.c:990
 msgid "_Expand"
 msgstr "_Laajenna"
 
+#: src/gtkblist.c:1389 src/gtkconv.c:3918
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Et ole kirjautuneena millään protokollalla jolla voisi lisätä kyseisen "
+"tuttavan."
+
 #. Buddies menu
-#: src/gtkblist.c:1462
+#: src/gtkblist.c:1680
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:1463
-msgid "/Buddies/New _Instant Message..."
+#: src/gtkblist.c:1681
+msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:1464
+#: src/gtkblist.c:1682
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:1465
+#: src/gtkblist.c:1683
 msgid "/Buddies/Get _User Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:1467
+#: src/gtkblist.c:1685
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:1686
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:1469
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:1687
+msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1470
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:1688
+msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:1471
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:1689
+msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:1473
+#: src/gtkblist.c:1691
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:1474
+#: src/gtkblist.c:1692
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:1695
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:1478
+#: src/gtkblist.c:1696
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:1479
+#: src/gtkblist.c:1697
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:1480
+#: src/gtkblist.c:1698
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Työkalut/P_rotokollatoiminnot"
 
-#: src/gtkblist.c:1482
+#: src/gtkblist.c:1700
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:1483
-msgid "/Tools/_File Transfers..."
-msgstr "/Työkalut/Tiedostosiirtot..."
-
-#: src/gtkblist.c:1484
-msgid "/Tools/Preferences"
-msgstr "/Työkalut/Asetukset"
-
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1701
+msgid "/Tools/_File Transfers"
+msgstr "/Työkalut/_Tiedostosiirtot..."
+
+#: src/gtkblist.c:1702
+msgid "/Tools/Pr_eferences"
+msgstr "/Työkalut/A_setukset"
+
+#: src/gtkblist.c:1703
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:1487
+#: src/gtkblist.c:1705
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:1490
+#: src/gtkblist.c:1708
 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:1491
+#: src/gtkblist.c:1709
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:1492
+#: src/gtkblist.c:1710
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1711
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1727
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1727
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:1510
+#: src/gtkblist.c:1728
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:1539
+#: src/gtkblist.c:1756
 #, c-format
 msgid ""
 "\n"
@@ -2308,16 +2213,16 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:1602 src/protocols/oscar/oscar.c:5514
+#: src/gtkblist.c:1819 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:1614
+#: src/gtkblist.c:1831
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1629
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2325,7 +2230,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:1630
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2333,7 +2238,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:1631
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2341,7 +2246,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1632
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2349,7 +2254,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:1633
+#: src/gtkblist.c:1850
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2357,7 +2262,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:1634
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2365,7 +2270,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:1636
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2373,7 +2278,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:1637
+#: src/gtkblist.c:1854
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2381,7 +2286,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:1638
+#: src/gtkblist.c:1855
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2389,86 +2294,86 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:1906
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:1908
+#: src/gtkblist.c:2125
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:2130
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:1916
+#: src/gtkblist.c:2133
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
-#: src/gtkblist.c:2109 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2326 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/gtkblist.c:2177
+#: src/gtkblist.c:2393
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:2180
+#: src/gtkblist.c:2396
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:2183
+#: src/gtkblist.c:2399
 msgid "/Tools/Protocol Actions"
 msgstr "/Työkalut/Protokollatoiminnot"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2267
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/_Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2269
+#: src/gtkblist.c:2488
 msgid "/Buddies/Show Empty Groups"
 msgstr "/_Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2287 src/gtkconv.c:1216
+#: src/gtkblist.c:2506 src/gtkconv.c:1231
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2512
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:2296 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2515 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2521
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:2305 src/protocols/oscar/oscar.c:3086
+#: src/gtkblist.c:2524 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "Ryhmäkeskustelu"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2529
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2537
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3026 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3250 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3049
+#: src/gtkblist.c:3273
 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. "
@@ -2478,24 +2383,24 @@
 "myös valita aliaksen (tai lempinimen) tuttavalle. Alias näytetään "
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
-#: src/gtkblist.c:3071 src/main.c:289
+#: src/gtkblist.c:3295 src/main.c:289
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: src/gtkblist.c:3097 src/gtkblist.c:3414
+#: src/gtkblist.c:3321 src/gtkblist.c:3643
 msgid "Group:"
 msgstr "Ryhmä:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3106 src/gtkblist.c:3384
+#: src/gtkblist.c:3330 src/gtkblist.c:3611
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:3578
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:3374
+#: src/gtkblist.c:3601
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2503,418 +2408,426 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:3448
+#: src/gtkblist.c:3677
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:3448
-msgid "Add a new group"
-msgstr "Lisää uusi ryhmä"
-
-#: src/gtkblist.c:3449
+#: src/gtkblist.c:3678
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:3950
+#: src/gtkblist.c:4195
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
 # NOTE source: netscape
-#: src/gtkconn.c:58 src/gtkconn.c:242 src/gtkconn.c:253
+#: src/gtkconn.c:58 src/gtkconn.c:243 src/gtkconn.c:254
 msgid "Done."
 msgstr "Valmis."
 
 # NOTE: This shows when the user is (i.e., you are) signing on
-#: src/gtkconn.c:137
+#: src/gtkconn.c:138
 msgid "Signon: "
 msgstr "Kirjaudutaan sisään: "
 
 # NOTE: This shows when the user is (i.e., you are) signing on
-#: src/gtkconn.c:195
+#: src/gtkconn.c:196
 msgid "Signon"
 msgstr "Kirjaudutaan sisään"
 
-#: src/gtkconn.c:208
+#: src/gtkconn.c:209
 msgid "Cancel All"
 msgstr "Peruuta kaikki"
 
-#: src/gtkconn.c:359
+#: src/gtkconn.c:426 src/gtkconn.c:461 src/gtkconn.c:527
+msgid "_Reconnect"
+msgstr "_Uudelleenyhdistä"
+
+#: src/gtkconn.c:491
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s - yhteys on katkennut.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:493
 msgid "Reason Unknown."
 msgstr "Tuntematon syy."
 
-#: src/gtkconn.c:368
-msgid "Reconnect"
-msgstr "Uudelleenyhdistys"
-
-#: src/gtkconn.c:407
+#: src/gtkconn.c:532
+msgid "Reconnect _All"
+msgstr "Uudelleenyhdistä _kaikki"
+
+#: src/gtkconn.c:555
 msgid "Account"
 msgstr "Tili"
 
-#: src/gtkconn.c:415
+#: src/gtkconn.c:563
 msgid "Time"
 msgstr "Aika"
 
-#: src/gtkconv.c:185
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: src/gtkconv.c:241
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkconv.c:311
-msgid "Gaim - Insert Image"
-msgstr "Gaim - Liitä kuva"
-
-#: src/gtkconv.c:615
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - Kutsu tuttava keskusteluhuoneeseen"
-
-#. Put our happy label in it.
-#: src/gtkconv.c:643
+#: src/gtkconv.c:313
+msgid "Insert Image"
+msgstr "Liitä kuva"
+
+#: src/gtkconv.c:620
+msgid "Invite Buddy Into Chat Room"
+msgstr "Kutsu tuttava keskusteluhuoneeseen"
+
+#: src/gtkconv.c:648
 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:664
+#: src/gtkconv.c:669
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:684
+#: src/gtkconv.c:689
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:780
-msgid ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
-msgstr ""
-"<span weight='bold' size='larger'>Anna hakutermi\n"
-"</span>"
-
-#: src/gtkconv.c:787
-msgid "Search term: "
-msgstr "Haettava termi:"
-
-#: src/gtkconv.c:1224
+#: src/gtkconv.c:775
+msgid "Find"
+msgstr "Etsi"
+
+#: src/gtkconv.c:793
+msgid "_Search for:"
+msgstr "_Haettava termi:"
+
+#: src/gtkconv.c:1239
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1226 src/gtkprefs.c:774
+#: src/gtkconv.c:1241 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1235 src/gtkconv.c:3133
+#: src/gtkconv.c:1250 src/gtkconv.c:3220
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1244
+#: src/gtkconv.c:1259
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/gtkconv.c:1255 src/gtkconv.c:3116 src/gtkconv.c:4297
+#: src/gtkconv.c:1270 src/gtkconv.c:3203 src/gtkconv.c:4387
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gtkconv.c:2372
+#: src/gtkconv.c:2453
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2380
+#: src/gtkconv.c:2461
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2564
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:2905
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Tallenna keskustelu"
+#: src/gtkconv.c:2985
+msgid "Save Conversation"
+msgstr "Tallenna keskustelu"
 
 #. Conversation menu
-#: src/gtkconv.c:2922
+#: src/gtkconv.c:3002
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:2924
-msgid "/Conversation/_Save As..."
-msgstr "/Keskustelu/_Tallenna nimellä..."
-
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:3004
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Keskustelu/Uusi _pikaviesti..."
+
+#: src/gtkconv.c:3009
+msgid "/Conversation/_Find..."
+msgstr "/Keskustelu/_Etsi..."
+
+#: src/gtkconv.c:3010
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:2927
-msgid "/Conversation/Search..."
-msgstr "/Keskustelu/Etsi..."
-
-#: src/gtkconv.c:2931
+#: src/gtkconv.c:3011
+msgid "/Conversation/_Save As..."
+msgstr "/Keskustelu/_Tallenna nimellä..."
+
+#: src/gtkconv.c:3016
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:2933
+#: src/gtkconv.c:3018
+msgid "/Conversation/_Get Info"
+msgstr "/Keskustelu/_Hae tiedot..."
+
+#: src/gtkconv.c:3020
+msgid "/Conversation/_Warn..."
+msgstr "/Keskustelu/_Varoita..."
+
+#: src/gtkconv.c:3022
+msgid "/Conversation/In_vite..."
+msgstr "/Keskustelu/Kut_su..."
+
+#: src/gtkconv.c:3027
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:2935
-msgid "/Conversation/_Get Info..."
-msgstr "/Keskustelu/_Hae tiedot..."
-
-#: src/gtkconv.c:2937
-msgid "/Conversation/In_vite..."
-msgstr "/Keskustelu/Kut_su..."
-
-#: src/gtkconv.c:2942
-msgid "/Conversation/Insert _URL..."
-msgstr "/Keskustelu/Lisää _URL..."
-
-#: src/gtkconv.c:2944
-msgid "/Conversation/Insert _Image..."
-msgstr "/Keskustelu/Liitä _kuva..."
-
-#: src/gtkconv.c:2949
-msgid "/Conversation/_Warn..."
-msgstr "/Keskustelu/_Varoita..."
-
-#: src/gtkconv.c:2951
+#: src/gtkconv.c:3029
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:2953
+#: src/gtkconv.c:3031
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:2955
+#: src/gtkconv.c:3033
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:3038
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Keskustelu/Lisää lin_kki..."
+
+#: src/gtkconv.c:3040
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Keskustelu/Liitä _kuva..."
+
+#: src/gtkconv.c:3045
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:3049
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:3050
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:2966
+#: src/gtkconv.c:3051
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:3052
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3009
+#: src/gtkconv.c:3094
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3014
+#: src/gtkconv.c:3099
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3018
-msgid "/Conversation/Alias..."
-msgstr "/Keskustelu/Alias..."
-
-#: src/gtkconv.c:3022
-msgid "/Conversation/Get Info..."
+#: src/gtkconv.c:3105
+msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3026
+#: src/gtkconv.c:3109
+msgid "/Conversation/Warn..."
+msgstr "/Keskustelu/Varoita..."
+
+#: src/gtkconv.c:3113
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3032
-msgid "/Conversation/Insert URL..."
-msgstr "/Keskustelu/Lisää URL..."
-
-#: src/gtkconv.c:3036
-msgid "/Conversation/Insert Image..."
-msgstr "/Keskustelu/Liitä kuva..."
-
-#: src/gtkconv.c:3042
-msgid "/Conversation/Warn..."
-msgstr "/Keskustelu/Varoita..."
-
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3119
+msgid "/Conversation/Alias..."
+msgstr "/Keskustelu/Alias..."
+
+#: src/gtkconv.c:3123
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3127
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3054
+#: src/gtkconv.c:3131
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3137
+msgid "/Conversation/Insert Link..."
+msgstr "/Keskustelu/Liitä linkki..."
+
+#: src/gtkconv.c:3141
+msgid "/Conversation/Insert Image..."
+msgstr "/Keskustelu/Liitä kuva..."
+
+#: src/gtkconv.c:3147
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3063
+#: src/gtkconv.c:3150
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3153
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3090 src/gtkconv.c:3092 src/gtkconv.c:3190 src/gtkconv.c:3192
-#: src/gtkconv.c:6020
+#: src/gtkconv.c:3177 src/gtkconv.c:3179 src/gtkconv.c:3277 src/gtkconv.c:3279
+#: src/gtkconv.c:6014
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/gtkconv.c:3113 src/gtkconv.c:4315
+#: src/gtkconv.c:3200 src/gtkconv.c:4405
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3119 src/gtkconv.c:4300
+#: src/gtkconv.c:3206 src/gtkconv.c:4390
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
 #. Warn button
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3213
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3130
+#: src/gtkconv.c:3217
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
-#: src/gtkconv.c:3137 src/gtkconv.c:3575
+#: src/gtkconv.c:3224 src/gtkconv.c:3663
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Block button
-#: src/gtkconv.c:3140 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3227 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Estä"
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3231
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
 #. Invite
-#: src/gtkconv.c:3202 src/gtkconv.c:6023
+#: src/gtkconv.c:3289 src/gtkconv.c:6017
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3205
+#: src/gtkconv.c:3292
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3331
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkconv.c:3255
+#: src/gtkconv.c:3342
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3353
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3369
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
-#: src/gtkconv.c:3294
-msgid "Normal font size"
-msgstr "Normaali kirjasin koko"
-
 # XXX might be wrong
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3394
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkconv.c:3323
+#: src/gtkconv.c:3411
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3423
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkconv.c:3347
+#: src/gtkconv.c:3435
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3450
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3461
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkconv.c:3384
+#: src/gtkconv.c:3472
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: src/gtkconv.c:3444
+#: src/gtkconv.c:3532
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3495
+#: src/gtkconv.c:3583
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3640
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3652
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4113
+#: src/gtkconv.c:4203
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:4713 src/gtkconv.c:4745 src/gtkconv.c:4866 src/gtkconv.c:4933
+#: src/gtkconv.c:4790 src/gtkconv.c:4822 src/gtkconv.c:4943 src/gtkconv.c:5010
 #, 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:5267
+#: src/gtkconv.c:5344
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:5272
+#: src/gtkconv.c:5349
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:5278
+#: src/gtkconv.c:5355
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5751 src/gtkconv.c:5754
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
@@ -2932,122 +2845,130 @@
 msgstr "Aikaleimat"
 
 # NOTE source (kt): galeon
-#: src/gtkft.c:126
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "Valmiina"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "Koko"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "Tila:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:489
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "Aikaa kulunut:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:491
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "Pidä tiedonsiirtoikkuna _auki"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
-msgstr "Näytä yksityiskohdat"
-
-#: src/gtkft.c:608
-msgid "Hide download details"
-msgstr "Piilota yksityiskohdat"
+#: src/gtkft.c:629
+msgid "Show transfer details"
+msgstr "Näytä tiedostosiirron yksityiskohdat"
+
+#: src/gtkft.c:630
+msgid "Hide transfer details"
+msgstr "Piilota tiedostosiirron yksityiskohdat"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:882
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#: src/gtkft.c:884
+msgid "Failed"
+msgstr "Epäonnistunut"
+
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ei voida lähettää tiedostoa jonka koko on 0 tavua."
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "Tiedosto on jo olemassa."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
-msgstr "Gaim - Avaa..."
-
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - Tallenna nimellä..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1100
+msgid "Open..."
+msgstr "Avaa..."
+
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "Tallenna nimellä..."
+
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:691
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:703
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:713
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:1849
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3055,22 +2976,22 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:1857
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:1866
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:1889
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: src/gtklog.c:244
+#: src/gtklog.c:255
 msgid "Conversations with"
 msgstr "Keskustelut:"
 
@@ -3167,7 +3088,7 @@
 msgstr "Ilmoitetaan kun"
 
 # AA Not a great translation but this will do for now. Word 'kirjautua' has problem because this string is used in two places and other place needs a bit diffrent form for this word.
-#: src/gtkpounce.c:407 src/main.c:339
+#: src/gtkpounce.c:407 src/main.c:335
 msgid "Sign on"
 msgstr "Loggaa sisään"
 
@@ -3180,8 +3101,8 @@
 msgid "Return from away"
 msgstr "Palaa oltuaan poissa"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2189
 msgid "Idle"
 msgstr "Jouten"
 
@@ -3226,7 +3147,7 @@
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
+#: src/gtkpounce.c:468 src/gtkprefs.c:2083
 msgid "Test"
 msgstr "Kokeilu"
 
@@ -3298,6 +3219,11 @@
 msgid "Icon"
 msgstr "Kuvake"
 
+#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "Kuvaus"
+
 #: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Tyyli"
@@ -3342,7 +3268,7 @@
 msgid "Bac_kground color"
 msgstr "T_austaväri"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "Näyttö"
 
@@ -3422,23 +3348,23 @@
 msgstr "Tuttavalistan työkalurivi"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:836 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:838 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:839 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:845 src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
@@ -3454,7 +3380,7 @@
 msgid "Buddy Display"
 msgstr "Tuttavien näyttö"
 
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
+#: src/gtkprefs.c:853 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
@@ -3470,190 +3396,180 @@
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:861
+msgid "_Automatically expand contacts"
+msgstr "_Laajenna tuttavaryhmät automaattisesti"
+
+#: src/gtkprefs.c:886
 msgid "_Placement:"
 msgstr "_Sijoitus:"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:893
 msgid "Send _URLs as Links"
 msgstr "Lähetä _URL:t linkkeinä"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:896
 msgid "Show Formatting Toolbar"
 msgstr "Näytä muotoilu-työkalurivi"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:901
 msgid "_Tab Placement:"
 msgstr "_Välilehtien sijoitus:"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:903
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:904
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:905
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:906
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:912
 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:913
+#: src/gtkprefs.c:915
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:925
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:936
 msgid "Show status _icons on tabs"
 msgstr "Näytä tila-ikoni välilehdissä"
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "Ikkuna"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "Uuden ikkunan _leveys:"
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "Uuden ikkunan _korkeus:"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "Kirjoitu_salueen korkeus:"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "Piilota ikkuna _lähetettäessä"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "Näytä _sisäänkirjautumiset ikkunassa"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "Näytä a_liakset välilehdissä/otsikoissa"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "Kirjoitusilmoitus"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "\"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "\"_Tab\"-täydennys lempinimille"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "_Vanhantyylinen \"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "_Näytä ihmisten saapuminen ikkunassa"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr "_Näytä ihmisten poistuminen ikkunassa"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "Väritä näyttönimet"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "Välityspalvelimen tyyppi"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1106
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1125
-msgid "_Host"
-msgstr "_Isäntä"
-
-#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1152 src/protocols/msn/msn.c:1649
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
-msgid "Port"
-msgstr "Portti"
-
-#: src/gtkprefs.c:1160
-msgid "_User"
-msgstr "_Käyttäjä"
-
-#: src/gtkprefs.c:1177
-msgid "Pa_ssword"
-msgstr "_Salasana"
-
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1162
+msgid "_User:"
+msgstr "_Käyttäjä:"
+
+#: src/gtkprefs.c:1216
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1217
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1218
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1219
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1220
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1229
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1270
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1274
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1284
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3662,64 +3578,64 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1305
 msgid "Browser Options"
 msgstr "Selaimen valinnat"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1306
 msgid "Open new _window by default"
 msgstr "Avaa uusi _ikkuna oletuksena"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1322
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1325
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1329
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1331
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1386
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1387
 msgid "_No sounds when you log in"
 msgstr "_Ei ääniä kun kirjaudut sisään"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1389
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1393
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1394
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1396
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1398
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1405
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1415
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3728,69 +3644,69 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1470
 msgid "_Sending messages removes away status"
 msgstr "Viestien _lähettäminen poistaa poissaolotilan"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1472
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1475
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1478
 msgid "Seconds before _resending:"
 msgstr "Sekunteja ennen _uudelleenlähetystä:"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1481
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1483
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
 # XXX
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1485
 msgid "Send auto-response in _active conversations"
 msgstr "Lähetä automaattista vastausta _aktiivisissa keskusteluissa"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1495
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1498
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1499
-msgid "X usage"
-msgstr "X:n käyttö"
-
 #: src/gtkprefs.c:1501
+msgid "X usage"
+msgstr "X:n käyttö"
+
+#: src/gtkprefs.c:1503
 msgid "Windows usage"
 msgstr "Windows:n käyttö"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1511
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1512
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1514
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1521
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1583
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3805,7 +3721,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3820,100 +3736,100 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1769
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:588
-#: src/protocols/msn/msn.c:1337 src/protocols/trepia/trepia.c:401
+#: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
+#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1823
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:1950
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2057
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2064
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2087
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2225
 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:2259
+#: src/gtkprefs.c:2261
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2262
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2261
+#: src/gtkprefs.c:2263
 msgid "Fonts"
 msgstr "Kirjasimet"
 
 # XXX
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2264
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2265
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "IMs"
 msgstr "Pikaviestit"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2270
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2273
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2273
-msgid "Logging"
-msgstr "Kirjataan lokiin"
-
-#: src/gtkprefs.c:2274
-msgid "Sounds"
-msgstr "Äänet"
-
 #: src/gtkprefs.c:2275
+msgid "Logging"
+msgstr "Kirjataan lokiin"
+
+#: src/gtkprefs.c:2276
+msgid "Sounds"
+msgstr "Äänet"
+
+#: src/gtkprefs.c:2277
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2278
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2279
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -4076,53 +3992,53 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: src/gtkutils.c:291
+#: src/gtkutils.c:294
 msgid "Can't save icon file to disk."
 msgstr "Ikonitiedostoa ei voida tallentaa levylle."
 
-#: src/gtkutils.c:326
-msgid "Gaim - Save Icon"
-msgstr "Gaim - Tallenna kuvake"
-
-#: src/log.c:82
+#: src/gtkutils.c:329
+msgid "Save Icon"
+msgstr "Tallenna kuvake"
+
+#: src/log.c:83
 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:409
+#: src/log.c:407
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
+#: src/log.c:487
 #, c-format
 msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr ""
 "<font color=\"#16569E\">(%s) <b>%s <AUTOMAATTIVASTAUS>:</b></font> %s<br/>\n"
 
-#: src/log.c:490
+#: src/log.c:489
 #, c-format
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr ""
 "<font color=\"#A82F2F\">(%s) <b>%s <AUTOMAATTIVASTAUS>:</b></font> %s<br/>\n"
 
-#: src/log.c:531 src/log.c:663
-msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-msgstr "<font color=\"red\"><b>log->logger_data oli NULL!</b></font>"
-
-#: src/log.c:541 src/log.c:673
+#: src/log.c:533 src/log.c:668
+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:543 src/log.c:678
 #, 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:545
+#: src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:623
+#: src/log.c:621
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: src/log.c:677
+#: src/log.c:682
 msgid "Plain text"
 msgstr "Teksti"
 
@@ -4139,8 +4055,7 @@
 msgid "Login"
 msgstr "Sisäänkirjautuminen"
 
-#. full help text
-#: src/main.c:551
+#: src/main.c:549
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4174,7 +4089,7 @@
 "   -h, --help           näytä tämä viesti ja poistu\n"
 
 #. short message
-#: src/main.c:566
+#: src/main.c:564
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita '%s -h' saadaksesi lisää tietoja.\n"
@@ -4203,8 +4118,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 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/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -4216,11 +4131,11 @@
 msgid "Away for friends only"
 msgstr "Poissa vain ystäville"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:931
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
-#: src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6140 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4275,7 +4190,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
@@ -4338,7 +4254,7 @@
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3954
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "UIN"
 
@@ -4347,13 +4263,13 @@
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:608
-#: src/protocols/oscar/oscar.c:3962 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3956
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "Kutsumanimi"
 
@@ -4367,20 +4283,21 @@
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Kunta"
 
 # XXX need to check for gradation problems
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1275
-#: src/protocols/msn/msn.c:1517 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3197
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2626
-#: src/protocols/yahoo/yahoo.c:2813 src/protocols/zephyr/zephyr.c:355
+#. show it to the user
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2806 src/protocols/yahoo/yahoo.c:2829
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -4483,8 +4400,8 @@
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1043
-#: src/protocols/oscar/oscar.c:6495 src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
@@ -4522,6 +4439,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
@@ -4535,17 +4453,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 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:184
-#: src/protocols/msn/notification.c:948 src/protocols/msn/notification.c:1269
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
+#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "Salli"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:185
-#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1271
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
+#: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -4597,44 +4515,52 @@
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr "Virhe näytettäessä MOTD:tä"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr "MOTD ei ole käytettävissä"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr "MOTD:tä ei ole assosioitu tälle yhteydelle."
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
-msgstr "Kanava:"
-
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:158
+msgid "_Channel:"
+msgstr "_Kanava:"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "Socketin luominen epäonnistui"
 
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "Virhe luettaessa"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4644,26 +4570,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:534
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:535
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1142 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:552 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:555 src/protocols/jabber/jabber.c:1155
+#: src/protocols/msn/msn.c:1662 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1345
+msgid "Port"
+msgstr "Portti"
+
+#: src/protocols/irc/irc.c:558
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:578
+#: src/protocols/irc/irc.c:561 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:572
 msgid "Username"
 msgstr "Käyttäjänimi"
 
@@ -4688,7 +4620,7 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2684
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2887
 msgid "Realname"
 msgstr "Oikea nimi"
 
@@ -4737,161 +4669,170 @@
 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:370
+msgid "No such channel"
+msgstr "Kanavaa ei ole"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
-msgstr "kanavaa ei ole olemassa"
-
-#: src/protocols/irc/msgs.c:374
+msgstr "kanavaa ei ole"
+
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 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:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:392
 msgid "Disconnected"
 msgstr "Yhteys katkennut"
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr "Palvelin vaatiin SSL:n sisäänkirjautumista varten"
 
-#: src/protocols/jabber/auth.c:59 src/protocols/jabber/auth.c:281
-#: src/protocols/jabber/auth.c:380 src/protocols/jabber/auth.c:392
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:153
+#: src/protocols/jabber/auth.c:312 src/protocols/jabber/auth.c:412
+#: src/protocols/jabber/auth.c:424
 msgid "Invalid response from server"
 msgstr "Kelvoton vastaus palvelimelta"
 
-#: src/protocols/jabber/auth.c:86 src/protocols/jabber/auth.c:143
+#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
 
-#: src/protocols/jabber/auth.c:301
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:458
+msgid "Unknown Error"
+msgstr "Tuntematon virhe"
+
+#: src/protocols/jabber/auth.c:333
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
 # XXX
-#: src/protocols/jabber/auth.c:395
+#: src/protocols/jabber/auth.c:427
 msgid "Bad Protocol"
 msgstr "Epäkelpo protokolla"
 
-#: src/protocols/jabber/auth.c:398
+#: src/protocols/jabber/auth.c:430
 msgid "Encryption Required"
 msgstr "Vaatii salauksen"
 
 # XXX edit of similar string
-#: src/protocols/jabber/auth.c:401
+#: src/protocols/jabber/auth.c:433
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: src/protocols/jabber/auth.c:404
+#: src/protocols/jabber/auth.c:436
 msgid "Invalid Mechanism"
 msgstr "Epäkelpo mekanismi"
 
-#: src/protocols/jabber/auth.c:406
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid Realm"
 msgstr "Epäkelpo \"Realm\""
 
-#: src/protocols/jabber/auth.c:409
+#: src/protocols/jabber/auth.c:441
 msgid "Mechanism Too Weak"
 msgstr "Mekanismi liian heikko"
 
-#: src/protocols/jabber/auth.c:412 src/protocols/jabber/jabber.c:158
-#: src/protocols/jabber/jabber.c:866 src/protocols/jabber/jabber.c:916
-#: src/protocols/oscar/oscar.c:5542
+#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
+#: src/protocols/oscar/oscar.c:5570
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: src/protocols/jabber/auth.c:415
+#: src/protocols/jabber/auth.c:447
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: src/protocols/jabber/auth.c:417
+#: src/protocols/jabber/auth.c:449
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
@@ -4908,10 +4849,14 @@
 msgstr "Etunimi"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:598 src/protocols/yahoo/yahoo.c:2678
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2883
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+msgid "URL"
+msgstr "URL"
+
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
 msgstr "Katuosoite"
@@ -4929,7 +4874,7 @@
 msgstr "Seutu"
 
 #: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:628
+#: src/protocols/jabber/jabber.c:622
 msgid "Postal Code"
 msgstr "Postinumero"
 
@@ -4945,7 +4890,7 @@
 msgstr "Puhelin"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2879
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -4966,7 +4911,7 @@
 msgstr "Asema"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3988
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -4987,12 +4932,12 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:556 src/protocols/jabber/buddy.c:563
-#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:903
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:901
+#: src/protocols/jabber/jabber.c:914
 msgid "Status"
 msgstr "Tila"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1143
 msgid "Resource"
 msgstr "Lähde"
 
@@ -5000,8 +4945,8 @@
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "Osoite"
 
@@ -5022,37 +4967,37 @@
 msgid "Jabber Profile"
 msgstr "Jabber-profiili"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:905
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:908
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:916
 msgid "Cancel Presence Notification"
 msgstr "Peruuta paikallaoloilmoitus"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:924
 msgid "(Re-)Request authorization"
 msgstr "Pyydetään lupaa uudelleen"
 
-#: src/protocols/jabber/buddy.c:929
+#: src/protocols/jabber/buddy.c:930
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "Huone:"
+#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:938
+msgid "_Room:"
+msgstr "_Huone:"
 
 #: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "Palvelin:"
+msgid "_Server:"
+msgstr "_Palvelin:"
 
 #: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "chat-nimi(handle):"
+msgid "_Handle:"
+msgstr "_chat-alias:"
 
 #: src/protocols/jabber/chat.c:158
 #, c-format
@@ -5081,277 +5026,285 @@
 msgid "Invalid Room Handle"
 msgstr "Chat-nimi(room handle) ei kelpaa"
 
-#: src/protocols/jabber/jabber.c:82
+#: src/protocols/jabber/jabber.c:71
 msgid "Error initializing session"
 msgstr "Virhe session alustamisessa"
 
-#: src/protocols/jabber/jabber.c:133
+#: src/protocols/jabber/jabber.c:122
 msgid "Bad Format"
 msgstr "Väärä formaatti"
 
-#: src/protocols/jabber/jabber.c:135
+#: src/protocols/jabber/jabber.c:124
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: src/protocols/jabber/jabber.c:138
+#: src/protocols/jabber/jabber.c:127
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:129
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:131
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:133
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: src/protocols/jabber/jabber.c:146
+#: src/protocols/jabber/jabber.c:135
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:137
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: src/protocols/jabber/jabber.c:150
+#: src/protocols/jabber/jabber.c:139
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:141
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:143
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: src/protocols/jabber/jabber.c:156
+#: src/protocols/jabber/jabber.c:145
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: src/protocols/jabber/jabber.c:160
+#: src/protocols/jabber/jabber.c:149
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: src/protocols/jabber/jabber.c:162
+#: src/protocols/jabber/jabber.c:151
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/jabber/jabber.c:164
+#: src/protocols/jabber/jabber.c:153
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: src/protocols/jabber/jabber.c:166
+#: src/protocols/jabber/jabber.c:155
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: src/protocols/jabber/jabber.c:168
+#: src/protocols/jabber/jabber.c:157
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: src/protocols/jabber/jabber.c:170
+#: src/protocols/jabber/jabber.c:159
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: src/protocols/jabber/jabber.c:172
+#: src/protocols/jabber/jabber.c:161
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: src/protocols/jabber/jabber.c:174
+#: src/protocols/jabber/jabber.c:163
 msgid "Unsupported Encoding"
 msgstr "Koodausta ei tuettu"
 
-#: src/protocols/jabber/jabber.c:176
+#: src/protocols/jabber/jabber.c:165
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(Stanza type) ei tuettu"
 
-#: src/protocols/jabber/jabber.c:178
+#: src/protocols/jabber/jabber.c:167
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: src/protocols/jabber/jabber.c:180
+#: src/protocols/jabber/jabber.c:169
 msgid "XML Not Well Formed"
 msgstr "Huonostimuotoiltua XML:ää"
 
-#: src/protocols/jabber/jabber.c:182
+#: src/protocols/jabber/jabber.c:171
 msgid "Stream Error"
 msgstr "Datavirta(stream) -virhe"
 
-#: src/protocols/jabber/jabber.c:245 src/protocols/msn/httpmethod.c:216
+#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:536 src/protocols/msn/msn.c:647
-#: src/protocols/msn/msn.c:663 src/protocols/msn/msn.c:711
-#: src/protocols/msn/msn.c:734 src/protocols/msn/msn.c:766
-#: src/protocols/msn/msn.c:774 src/protocols/msn/msn.c:807
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:829
-#: src/protocols/msn/msn.c:838 src/protocols/msn/msn.c:853
-#: src/protocols/msn/msn.c:863 src/protocols/msn/msn.c:885
-#: src/protocols/msn/msn.c:935 src/protocols/msn/msn.c:973
-#: src/protocols/msn/msn.c:1071 src/protocols/msn/msn.c:1103
-#: src/protocols/msn/msn.c:1124 src/protocols/msn/msn.c:1135
-#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1170
-#: src/protocols/msn/msn.c:1182 src/protocols/msn/msn.c:1252
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1668 src/protocols/msn/notification.c:1688
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:749
-#: src/protocols/trepia/trepia.c:1033 src/protocols/trepia/trepia.c:1077
-#: src/protocols/trepia/trepia.c:1176 src/protocols/trepia/trepia.c:1232
+#: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
+#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
+#: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: src/protocols/jabber/jabber.c:282 src/protocols/jabber/jabber.c:302
+#: src/protocols/jabber/jabber.c:272 src/protocols/jabber/jabber.c:292
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: src/protocols/jabber/jabber.c:356
+#: src/protocols/jabber/jabber.c:346
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: src/protocols/jabber/jabber.c:393 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:383 src/protocols/jabber/jabber.c:681
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:721
+#: src/protocols/jabber/jabber.c:411 src/protocols/jabber/jabber.c:708
+msgid "SSL support unavailable"
+msgstr "SSL-tuki ei saatavilla"
+
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:718
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Socketin luonti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:452
+#: src/protocols/jabber/jabber.c:446
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:454 src/protocols/jabber/jabber.c:455
+#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:464
-msgid "Unknown Error"
-msgstr "Tuntematon virhe"
-
-#: src/protocols/jabber/jabber.c:467
+#: src/protocols/jabber/jabber.c:461
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "%s@%s:n rekisteröinti epäonnistui: %s"
 
-#: src/protocols/jabber/jabber.c:469 src/protocols/jabber/jabber.c:470
+#: src/protocols/jabber/jabber.c:463 src/protocols/jabber/jabber.c:464
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:568 src/protocols/jabber/jabber.c:569
+#: src/protocols/jabber/jabber.c:562 src/protocols/jabber/jabber.c:563
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: src/protocols/jabber/jabber.c:582 src/protocols/jabber/jabber.c:1013
+#: src/protocols/jabber/jabber.c:576 src/protocols/jabber/jabber.c:1011
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocols/jabber/jabber.c:593
+#: src/protocols/jabber/jabber.c:587
 msgid "E-Mail"
 msgstr "Sähköposti"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:603 src/protocols/oscar/oscar.c:3959
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. State
-#: src/protocols/jabber/jabber.c:623 src/protocols/oscar/oscar.c:4011
-#: src/protocols/oscar/oscar.c:4027 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:633
+#: src/protocols/jabber/jabber.c:627
 msgid "Phone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:637
+msgid "Date"
+msgstr "Ajankohta"
+
+#: src/protocols/jabber/jabber.c:645
 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:654 src/protocols/jabber/jabber.c:655
+#: src/protocols/jabber/jabber.c:648 src/protocols/jabber/jabber.c:649
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: src/protocols/jabber/jabber.c:769 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:2073
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/protocols/jabber/jabber.c:773
+#: src/protocols/jabber/jabber.c:771
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:777
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:787
+#: src/protocols/jabber/jabber.c:785
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:911 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:270
+#: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/presence.c:296
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/jabber.c:925 src/protocols/jabber/jutil.c:101
 #: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:929 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:104
 #: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:930 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
-#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:6136
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: src/protocols/jabber/jabber.c:946
+#: src/protocols/jabber/jabber.c:944
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:945
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:955
 #, c-format
 msgid "Error changing password: %s"
 msgstr "Salasanan vaihdossa tapahtui virhe: %s"
 
-#: src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/jabber.c:959
 msgid "Unknown error occurred changing password"
 msgstr "Tuntematon virhe vaihdettaessa salasanaa"
 
-#: src/protocols/jabber/jabber.c:1018
+#: src/protocols/jabber/jabber.c:1016
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
 # XXX minor editing of existing string
-#: src/protocols/jabber/jabber.c:1023 src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1021 src/protocols/jabber/jabber.c:1022
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasanaa"
 
-#: src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1022
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
+#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "Aseta käyttäjätiedot"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5362,15 +5315,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1124
+#. *  description
+#: src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1122
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1148
-msgid "Force Old SSL"
+#: src/protocols/jabber/jabber.c:1146
+msgid "Use TLS if available"
+msgstr "Käytä TLS:ää jos mahdollista"
+
+#: src/protocols/jabber/jabber.c:1151
+msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1159
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5379,16 +5337,16 @@
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: src/protocols/jabber/message.c:219
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: src/protocols/jabber/message.c:281
+#: src/protocols/jabber/message.c:288
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
@@ -5397,25 +5355,20 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-parsinnassa"
 
-#: src/protocols/jabber/presence.c:170
-#, c-format
-msgid "%s (Code %s)"
-msgstr "%s (Koodi %s)"
-
-#: src/protocols/jabber/presence.c:175
+#: src/protocols/jabber/presence.c:177
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/presence.c:179
+#: src/protocols/jabber/presence.c:182
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Käyttäjä %s haluaa lisätä sinut tuttavalistalleen."
 
-#: src/protocols/jabber/presence.c:260 src/protocols/oscar/oscar.c:2949
+#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/presence.c:266
+#: src/protocols/jabber/presence.c:292
 msgid "Unable to join chat"
 msgstr "Ei voitu liittyä ryhmäkeskusteluun"
 
@@ -5429,7 +5382,7 @@
 msgstr "Tiedoston lähetys epäonnistui"
 
 #: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:520
+#: src/protocols/msn/notification.c:521
 msgid "Unable to request USR\n"
 msgstr "Ei kyetty pyytämään USR:ä\n"
 
@@ -5450,16 +5403,16 @@
 msgid "Protocol version not supported"
 msgstr "Protokollan versiota ei tuettu"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:784
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:785
 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:793
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:794
 msgid "Unable to request INF\n"
 msgstr "Ei kyetty pyytämään INF:iä\n"
 
 # XXX
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1915
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1911
 msgid "Got invalid XFR"
 msgstr "Epäkelpo XFR vastaanotettu"
 
@@ -5471,23 +5424,23 @@
 msgid "Unable to parse message."
 msgstr "Viestin käsittely epäonnistui"
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2145 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1853
+#: src/protocols/yahoo/yahoo.c:1884 src/protocols/yahoo/yahoo.c:1949
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:889
-#: src/protocols/msn/notification.c:2167
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
+#: src/protocols/msn/notification.c:2171
 msgid "Unable to write to server"
 msgstr "Palvelimelle ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2174
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2178
 msgid "Syncing with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2188
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2192
 msgid "Error reading from server"
 msgstr "Virhe luettaessa palvelimelta"
 
@@ -5640,8 +5593,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:154 src/protocols/msn/notification.c:635
-#: src/protocols/msn/notification.c:1282 src/protocols/msn/notification.c:1450
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
@@ -5751,41 +5703,41 @@
 msgid "Page"
 msgstr "Lähetä"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:625
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:627
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
+#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:629
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:631
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Piilotettu"
@@ -5826,7 +5778,7 @@
 msgid "SSL support is needed for MSN. Please install it."
 msgstr "MSN vaatii SSL-tuen. Ole hyvä ja asenna se."
 
-#: src/protocols/msn/msn.c:747
+#: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5836,11 +5788,11 @@
 "s@hotmail.com. Muutoksia sallitut-listaan ei tehty."
 
 # XXX
-#: src/protocols/msn/msn.c:751 src/protocols/msn/msn.c:791
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "Epäkelpo MSN-näyttönimi"
 
-#: src/protocols/msn/msn.c:787
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5849,80 +5801,80 @@
 "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:1276 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2785
 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:1344 src/protocols/oscar/oscar.c:3993
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2696
+#: src/protocols/yahoo/yahoo.c:2895
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1351 src/protocols/oscar/oscar.c:3979
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2903
 msgid "Gender"
 msgstr "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1359 src/protocols/yahoo/yahoo.c:2702
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2899
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo.c:2690
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2891
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1374 src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2907
 msgid "Occupation"
 msgstr "Ammatti"
 
 # NOTE actual string used by msn itself, lit. "Self description"
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1397
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1411
-#: src/protocols/msn/msn.c:1418
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1427 src/protocols/msn/msn.c:1440
-#: src/protocols/msn/msn.c:1447
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1456 src/protocols/msn/msn.c:1462
-#: src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1478 src/protocols/msn/msn.c:1484
-#: src/protocols/yahoo/yahoo.c:2758
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2942
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2978
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1503 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: src/protocols/msn/msn.c:1525 src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2993
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/msn/msn.c:1527 src/protocols/yahoo/yahoo.c:2822
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2995
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
@@ -5936,15 +5888,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1625 src/protocols/msn/msn.c:1627
+#. *  description
+#: src/protocols/msn/msn.c:1638 src/protocols/msn/msn.c:1640
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1644 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1657 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1654
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
@@ -5957,71 +5910,71 @@
 msgid "Unable to connect to server"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: src/protocols/msn/notification.c:376 src/protocols/msn/notification.c:545
+#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
 msgid "Unable to write to MSN Nexus server."
 msgstr "MSN:n Nexus-palvelimelle ei kyetty kirjoittamaan."
 
-#: src/protocols/msn/notification.c:385 src/protocols/msn/notification.c:560
+#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
 msgid "Unable to read from MSN Nexus server."
 msgstr "MSN:n Nexus-palvelimelta ei kyetty lukemaan."
 
-#: src/protocols/msn/notification.c:405
+#: src/protocols/msn/notification.c:406
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus-palvelin palautti virheellistä edelleenohjaustietoa."
 
-#: src/protocols/msn/notification.c:459
+#: src/protocols/msn/notification.c:460
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 "Tuntematon virhe yritettäessä kirjautua MSN-sisäänkirjautumispalvelimeen"
 
-#: src/protocols/msn/notification.c:571
+#: src/protocols/msn/notification.c:572
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Nexus-palvelin palautti virheellistä tietoa."
 
-#: src/protocols/msn/notification.c:640 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: src/protocols/msn/notification.c:703
+#: src/protocols/msn/notification.c:704
 msgid "Unable to connect to passport server"
 msgstr "Passport-palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: src/protocols/msn/notification.c:708 src/protocols/msn/notification.c:740
+#: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
 #: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: src/protocols/msn/notification.c:735
+#: src/protocols/msn/notification.c:736
 msgid "Unable to send password"
 msgstr "Ei kyetty lähettämään salasanaa"
 
-#: src/protocols/msn/notification.c:771
+#: src/protocols/msn/notification.c:772
 msgid "Protocol not supported"
 msgstr "Protokollaa ei tuettu"
 
-#: src/protocols/msn/notification.c:813
+#: src/protocols/msn/notification.c:814
 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:818
+#: src/protocols/msn/notification.c:819
 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:944
+#: src/protocols/msn/notification.c:945
 #, 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:1263 src/protocols/msn/notification.c:1429
+#: src/protocols/msn/notification.c:1264 src/protocols/msn/notification.c:1429
 #, 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:1960
+#: src/protocols/msn/notification.c:1956
 msgid "Unable to transfer to notification server"
 msgstr "Tiedonsiirto ei onnistunut ilmoituspalvelimelle"
 
-#: src/protocols/msn/notification.c:2108
+#: src/protocols/msn/notification.c:2112
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6050,7 +6003,7 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: src/protocols/msn/servconn.c:528
+#: src/protocols/msn/servconn.c:533
 msgid "Received HTTP error. Please report this."
 msgstr "Saatiin HTTP-virhe. Raportoi tästä, kiitos."
 
@@ -6113,10 +6066,10 @@
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5205
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "Mihin ryhmään liitytään:"
+msgid "_Group:"
+msgstr "_Ryhmä"
 
 #. *< api_version
 #. *< type
@@ -6128,6 +6081,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protokollaliitännäinen"
@@ -6275,7 +6229,8 @@
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/yahoo/yahoo_filexfer.c:212
 msgid "File Transfer Aborted"
 msgstr "Tiedostosiirto keskeytetty"
 
@@ -6285,7 +6240,8 @@
 
 # XXX minor but not completely trivial editing of fuzzy text
 # NOTE "file descriptor" translation from ATK sanasto
-#: src/protocols/oscar/oscar.c:868
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
@@ -6347,21 +6303,21 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5643
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2411
 #, 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:2413
+#: src/protocols/oscar/oscar.c:2414
 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 "
@@ -6372,23 +6328,23 @@
 "yksityisyysriskinä."
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2446
 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:2453
+#: src/protocols/oscar/oscar.c:2454
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2455
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2483
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6397,23 +6353,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5126
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2534
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6422,11 +6378,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2631
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6437,17 +6393,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2632
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2639
 #, 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:2646
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6460,7 +6416,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2655
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6473,7 +6429,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6486,36 +6442,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2684
 #, 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:2689
+#: src/protocols/oscar/oscar.c:2690
 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:2693
+#: src/protocols/oscar/oscar.c:2694
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2776
 #, 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:2784
+#: src/protocols/oscar/oscar.c:2785
 #, 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:2793
+#: src/protocols/oscar/oscar.c:2794
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6525,7 +6481,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:2802
+#: src/protocols/oscar/oscar.c:2803
 #, 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."
@@ -6533,14 +6489,14 @@
 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:2811
+#: src/protocols/oscar/oscar.c:2812
 #, 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:2820
+#: src/protocols/oscar/oscar.c:2821
 #, 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."
@@ -6548,155 +6504,160 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6167
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6137
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6165
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6166
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:2847
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2890
 #, 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:2948
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2985
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3044
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3083
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3086
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/yahoo/yahoo.c:2350
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3099
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3102
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3105
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3108
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3111
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3114
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3117
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3120
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3123
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3126
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3129
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3132
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3135
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: src/protocols/oscar/oscar.c:3161
+#: src/protocols/oscar/oscar.c:3138
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Käyttäjänimi: <b>%s</b><br>\n"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Varoitustaso: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Kirjautuneena: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3169
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Rekisteröitynyt: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3174
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Jouten: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "Jouten: <b>Aktiivinen</b>"
 
-#: src/protocols/oscar/oscar.c:3216
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
-#: src/protocols/oscar/oscar.c:3610
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3617
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6705,119 +6666,119 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:3672
+#: src/protocols/oscar/oscar.c:3680
 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:3674
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3971
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:3979 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:3979 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4003
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4037
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4102
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:4144
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:4165
+#: src/protocols/oscar/oscar.c:4173
 #, 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:4167
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6826,7 +6787,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6835,7 +6796,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:4204
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6844,7 +6805,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4207
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6853,7 +6814,7 @@
 "Virhe 0x04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6862,7 +6823,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:4213
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6871,12 +6832,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: src/protocols/oscar/oscar.c:4216
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: src/protocols/oscar/oscar.c:4226
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6885,20 +6846,20 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4227 src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: src/protocols/oscar/oscar.c:4464
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6908,7 +6869,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: src/protocols/oscar/oscar.c:4492
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6921,15 +6882,15 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: src/protocols/oscar/oscar.c:4497
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:4515
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6939,7 +6900,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: src/protocols/oscar/oscar.c:4555
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6953,15 +6914,15 @@
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
 # XXX
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:4783
 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 "
@@ -6970,12 +6931,12 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:4867 src/protocols/oscar/oscar.c:4868
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6985,15 +6946,15 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5039 src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: src/protocols/oscar/oscar.c:5040 src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7003,7 +6964,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:5087
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7013,11 +6974,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7027,17 +6988,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5176
 #, 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:5169
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7048,56 +7009,60 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5173
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:5210 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "Vaihto:"
-
-#: src/protocols/oscar/oscar.c:5447
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "_Vaihto:"
+
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>Tila:</b> "
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5473
 msgid "<b>Logged In:</b> "
 msgstr "<b>Kirjautuneena sisään:</b> "
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP-osoite:</b> "
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5493
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Kyvyt:</b> "
 
-#: src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5502
+msgid "<b>Buddy Comment:</b> "
+msgstr "<b>Tuttavakommentti:</b>"
+
+#: src/protocols/oscar/oscar.c:5511
 msgid "<b>Available:</b> "
 msgstr "<b>Tavoitettavissa:</b> "
 
-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5529
 msgid "<b>Away Message:</b> "
 msgstr "<b>Poissaoloviesti:</b> "
 
-#: src/protocols/oscar/oscar.c:5510
+#: src/protocols/oscar/oscar.c:5538
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Tila:</b> Ei valtuutettu"
 
-#: src/protocols/oscar/oscar.c:5544 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: src/protocols/oscar/oscar.c:5992
+#: src/protocols/oscar/oscar.c:6020
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
 
-#: src/protocols/oscar/oscar.c:6005
+#: src/protocols/oscar/oscar.c:6033
 #, 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:6008
+#: src/protocols/oscar/oscar.c:6036
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7105,53 +7070,53 @@
 "Koska tämä paljastaa IP-osoitteesi se voidaan ajatella yksityisyysriskinä. "
 "Haluatko jatkaa? "
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6211
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6199
+#: src/protocols/oscar/oscar.c:6227
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6235
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6250
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6251
+#: src/protocols/oscar/oscar.c:6279
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6272
+#: src/protocols/oscar/oscar.c:6300
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6273
+#: src/protocols/oscar/oscar.c:6301
 msgid "Screenname 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:6279
+#: src/protocols/oscar/oscar.c:6307
 msgid "New screenname formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6328
+#: src/protocols/oscar/oscar.c:6356
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6372
+#: src/protocols/oscar/oscar.c:6400
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6375
+#: src/protocols/oscar/oscar.c:6403
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6376
+#: src/protocols/oscar/oscar.c:6404
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7160,65 +7125,73 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6418
 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:6391
+#: src/protocols/oscar/oscar.c:6419
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6420
 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:6395
+#: src/protocols/oscar/oscar.c:6423
 msgid "Search"
 msgstr "Etsi"
 
-#: src/protocols/oscar/oscar.c:6409
+#: src/protocols/oscar/oscar.c:6437
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/oscar/oscar.c:6438
 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:6488
-msgid "Set Available Message"
-msgstr "Uusi paikallaoloviesti"
-
-#: src/protocols/oscar/oscar.c:6502
+#: src/protocols/oscar/oscar.c:6509
+msgid "Set User Info..."
+msgstr "Aseta käyttäjätiedot..."
+
+#: src/protocols/oscar/oscar.c:6516
+msgid "Set Available Message..."
+msgstr "Uusi paikallaoloviesti..."
+
+#: src/protocols/oscar/oscar.c:6523
+msgid "Change Password..."
+msgstr "Vaihda salasana..."
+
+#: src/protocols/oscar/oscar.c:6530
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:6521
-msgid "Format Screenname"
-msgstr "Muotoile näyttönimi:"
-
-#: src/protocols/oscar/oscar.c:6527
+#: src/protocols/oscar/oscar.c:6549
+msgid "Format Screenname..."
+msgstr "Muotoile näyttönimi..."
+
+#: src/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:6533
-msgid "Display Current Registered Address"
-msgstr "Näytä tämänhetkinen rekisteröity osoite"
-
-#: src/protocols/oscar/oscar.c:6539
-msgid "Change Current Registered Address"
-msgstr "Muuta tämänhetkistä rekisteröityä osoitetta"
-
-#: src/protocols/oscar/oscar.c:6548
+#: src/protocols/oscar/oscar.c:6561
+msgid "Display Currently Registered Address"
+msgstr "Näytä rekisteröity osoite"
+
+#: src/protocols/oscar/oscar.c:6567
+msgid "Change Currently Registered Address..."
+msgstr "Muuta rekisteröityä osoitetta"
+
+#: src/protocols/oscar/oscar.c:6576
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:6556
-msgid "Search for Buddy by Email"
+#: src/protocols/oscar/oscar.c:6584
+msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
 #. *< api_version
@@ -7231,15 +7204,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6677 src/protocols/oscar/oscar.c:6679
+#. *  description
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "portti"
 
@@ -7427,6 +7401,10 @@
 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
+msgid "Gaim - Save As..."
+msgstr "Gaim - Tallenna nimellä..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7449,6 +7427,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
@@ -7527,10 +7506,6 @@
 msgid "Local Users"
 msgstr "Paikalliset käyttäjät"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "Virhe luettaessa"
-
 #: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
@@ -7545,22 +7520,34 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/trepia/trepia.c:1321 src/protocols/trepia/trepia.c:1323
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokollaliitännäinen"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:297
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai laitteesta."
+
+#: src/protocols/yahoo/yahoo.c:730
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:772
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "Yahoo! järjestelmäviesti käyttäjälle %s:"
+
+#: src/protocols/yahoo/yahoo.c:838
 #, 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:760
+#: src/protocols/yahoo/yahoo.c:841
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7569,11 +7556,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:844
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1494
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7585,11 +7572,11 @@
 "päivitykset osoitteesta: %s."
 
 # NOTE edit of "Authentication failed"
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1570
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7599,87 +7586,100 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1573
 msgid "Ignore buddy?"
 msgstr "Älä välitä?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1606
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1609
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: src/protocols/yahoo/yahoo.c:1495
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1612
+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:1615
+#, c-format
+msgid "Unknown error number %d."
+msgstr "Tuntematon virhekoodi %d."
+
+#: src/protocols/yahoo/yahoo.c:1672
 #, 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:1544
+#: src/protocols/yahoo/yahoo.c:1674
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
+#: src/protocols/yahoo/yahoo.c:2089
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2605
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2608
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2610
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2337
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2396
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
-msgstr "Aktivoi ID"
-
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2404
+msgid "Join who in chat?"
+msgstr "Kenen seuraan liitytään chatissä?"
+
+#: src/protocols/yahoo/yahoo.c:2415
+msgid "Activate ID..."
+msgstr "Aktivoi ID..."
+
+#: src/protocols/yahoo/yahoo.c:2421
+msgid "Join user in chat..."
+msgstr "Liity käyttäjän seuraan chattiin......"
+
+#: src/protocols/yahoo/yahoo.c:2802
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7687,7 +7687,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:2600 src/protocols/yahoo/yahoo.c:2623
+#: src/protocols/yahoo/yahoo.c:2803 src/protocols/yahoo/yahoo.c:2826
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7695,44 +7695,44 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi<br>"
 
-#: src/protocols/yahoo/yahoo.c:2622
+#: src/protocols/yahoo/yahoo.c:2825
 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:2667
+#: src/protocols/yahoo/yahoo.c:2873 src/protocols/yahoo/yahoo.c:2874
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 # NOTE from msn
-#: src/protocols/yahoo/yahoo.c:2727 src/protocols/yahoo/yahoo.c:2731
-#: src/protocols/yahoo/yahoo.c:2735
+#: src/protocols/yahoo/yahoo.c:2918 src/protocols/yahoo/yahoo.c:2921
+#: src/protocols/yahoo/yahoo.c:2924
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2933 src/protocols/yahoo/yahoo.c:2936
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: src/protocols/yahoo/yahoo.c:2768
+#: src/protocols/yahoo/yahoo.c:2950
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: src/protocols/yahoo/yahoo.c:2782
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: src/protocols/yahoo/yahoo.c:2790
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: src/protocols/yahoo/yahoo.c:2796
+#: src/protocols/yahoo/yahoo.c:2974
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
@@ -7746,20 +7746,30 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2961 src/protocols/yahoo/yahoo.c:2963
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
 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:2980
+#: src/protocols/yahoo/yahoo.c:3194
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:2985
+#: src/protocols/yahoo/yahoo.c:3197
 msgid "Pager port"
 msgstr "Portti"
 
+# NOTE source: gnomeicu
+#: src/protocols/yahoo/yahoo.c:3200
+msgid "File transfer host"
+msgstr "Tiedostosiirtopalvelin"
+
+#: src/protocols/yahoo/yahoo.c:3203
+msgid "File transfer port"
+msgstr "Tiedostosiirtoportti"
+
 #: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -7769,19 +7779,19 @@
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "Ehkä huone on täynnä?"
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan chat-huoneeseen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
 
@@ -7826,16 +7836,16 @@
 msgstr "ZLocate"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "Luokka:"
+msgid "_Class:"
+msgstr "_Luokka:"
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "Ilmentymä:"
+msgid "_Instance:"
+msgstr "_Ilmentymä:"
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "Vastaanottaja:"
+msgid "_Recipient:"
+msgstr "_Vastaanottaja:"
 
 #. *< api_version
 #. *< type
@@ -7847,16 +7857,27 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
+#. Forbidden
+#: src/proxy.c:1002
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr "Pääsy evätty: proxy-palvelin estää portin 80 tunneloinnin."
+
+#: src/proxy.c:1004
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Proxy-yhteysvirhe %d"
+
 # XXX relatively minor editing
-#: src/proxy.c:1681
+#: src/proxy.c:1721
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välityspalvelinvalinnat"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1721
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7939,56 +7960,223 @@
 msgstr "Piipahdin hetkeksi ulos!"
 
 # XXX consistency
-#: src/stock.c:84
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: src/stock.c:85
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
-#: src/util.c:1590
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: src/util.c:1593
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/util.c:1624 src/util.c:1629 src/util.c:1634 src/util.c:1637
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: src/util.c:1625 src/util.c:1629 src/util.c:1643 src/util.c:1645
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: src/util.c:1625 src/util.c:1634 src/util.c:1643 src/util.c:1648
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:1980
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
-#: src/win32/win32dep.c:254
+#: src/win32/win32dep.c:271
 msgid "Moving Gaim Settings.."
 msgstr "Siirretään Gaimin asetuksia..."
 
-#: src/win32/win32dep.c:257
+#: src/win32/win32dep.c:274
 msgid "Moving Gaim user settings to: "
 msgstr "Siirretään Gaimin asetuksia:"
 
-#: src/win32/win32dep.c:259
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "Ilmoitus"
 
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "Gnomen osakekurssisovelman asetukset"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "Päivitystiheys minuuteissa"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr ""
+#~ "Kirjoita symbolit erotettuna \"+\"-merkillä alla olevaan laatikkoon."
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "Näytä vain symbolit ja hinta:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "Vierittää vasemmalta oikealle:"
+
+#~ msgid "(No"
+#~ msgstr "(Ei"
+
+# NOTE sf.net bug 770788
+#~ msgid "Change"
+#~ msgstr "vaihtoa"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim - Poissa!"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "Liity ryhmäkeskusteluun nimellä:"
+
+#~ msgid "New Message"
+#~ msgstr "Uusi viesti"
+
+#~ msgid "Alias chat"
+#~ msgstr "Anna ryhmäkeskustelulle alias"
+
+# XXX from similar string, likely wrong
+#~ msgid "Alias contact"
+#~ msgstr "Anna kontaktiryhmälle alias"
+
+#~ msgid "_Screenname"
+#~ msgstr "_Näyttönimi"
+
+#~ msgid "Alias buddy"
+#~ msgstr "Anna tuttavalle alias"
+
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "Anna aliasnimi allaolevalle henkilölle tai nimeä tämä kontakti "
+#~ "tuttavalistalla."
+
+#~ msgid "Gaim - Information"
+#~ msgstr "Gaim - Tietoja"
+
+#~ msgid "Add a new group"
+#~ msgstr "Lisää uusi ryhmä"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim - Liitä kuva"
+
+#~ msgid "Gaim - Save Conversation"
+#~ msgstr "Gaim - Tallenna keskustelu"
+
+#~ msgid "/Conversation/_New Conversation..."
+#~ msgstr "/Keskustelu/_Uusi Keskustelu..."
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/Keskustelu/Lisää _URL..."
+
+#~ msgid "/Conversation/Insert _Image..."
+#~ msgstr "/Keskustelu/Liitä _kuva..."
+
+#~ msgid "Port:"
+#~ msgstr "Portti:"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim - Tallenna kuvake"
+
+#~ msgid "Join what group:"
+#~ msgstr "Mihin ryhmään liitytään:"
+
+#~ msgid "Unknown error."
+#~ msgstr "Tuntematon virhe."
+
+#~ msgid "Buddy Chat"
+#~ msgstr "Ryhmäkeskustelu"
+
+#~ msgid "Join"
+#~ msgstr "Liity"
+
+#~ msgid "Changing info for %s:"
+#~ msgstr "Muutetaan käyttäjätietoja %s:lle"
+
+# NOTE relatively minor editing of similar string (Palvelimelle -> %s:lle)
+#~ msgid "Couldn't write to %s."
+#~ msgstr "%s:lle ei kyetty kirjoittamaan."
+
+#~ msgid "Save Log File"
+#~ msgstr "Tallenna lokitiedosto"
+
+# XXX editing of similar string
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "Ei voitu poistaa asetustiedostoa %s."
+
+#~ msgid ""
+#~ "You are about to remove the log file for %s.  Do you want to continue?"
+#~ msgstr "Olet poistamassa lokitiedostoa %s:lle.  Haluatko jatkaa?"
+
+#~ msgid "System Log"
+#~ msgstr "Järjestelmäloki"
+
+#~ msgid "Remove Log"
+#~ msgstr "Poista loki"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "Ei voitu avata lokitiedostoa %s."
+
+#~ msgid "Conversations with %s"
+#~ msgstr "Keskustelut %s:n kanssa"
+
+#~ msgid "Log"
+#~ msgstr "Loki"
+
+#~ msgid "Clear"
+#~ msgstr "Tyhjennä"
+
+#~ msgid ""
+#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
+#~ "</span>"
+#~ msgstr ""
+#~ "<span weight='bold' size='larger'>Anna hakutermi\n"
+#~ "</span>"
+
+#~ msgid "/Conversation/Search..."
+#~ msgstr "/Keskustelu/Etsi..."
+
+#~ msgid "Normal font size"
+#~ msgstr "Normaali kirjasin koko"
+
+#~ msgid "Hide download details"
+#~ msgstr "Piilota yksityiskohdat"
+
+#~ msgid "_Host"
+#~ msgstr "_Isäntä"
+
+#~ msgid "_User"
+#~ msgstr "_Käyttäjä"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "_Salasana"
+
+#~ msgid "/Conversation/Send _File..."
+#~ msgstr "/Keskustelu/Lähetä _Tiedosto..."
+
+#~ msgid "/Conversation/Send File..."
+#~ msgstr "/Keskustelu/Lähetä Tiedosto..."
+
+#~ msgid "%s (Code %s)"
+#~ msgstr "%s (Koodi %s)"
+
+#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
+#~ msgstr "<font color=\"red\"><b>log->logger_data oli NULL!</b></font>"
+
 #~ msgid "System Logs"
 #~ msgstr "Järjestelmälokit"
 
@@ -8270,9 +8458,6 @@
 #~ msgid "State:"
 #~ msgstr "Lääni:"
 
-#~ msgid "Port:"
-#~ msgstr "Portti:"
-
 #~ msgid "Deny all users"
 #~ msgstr "Kiellä kaikki käyttäjät"
 
@@ -8313,10 +8498,6 @@
 #~ msgstr "Käyttájän henkilöllisyys"
 
 #, fuzzy
-#~ msgid "_Group:"
-#~ msgstr "Ryhmä"
-
-#, fuzzy
 #~ msgid "Add Deny"
 #~ msgstr "Lisää kielto"
 
@@ -8371,9 +8552,6 @@
 #~ msgid "connection error (rend)\n"
 #~ msgstr "yhteysvirhe (rend)\n"
 
-#~ msgid "major connection error\n"
-#~ msgstr "merkittävä yhteysvirhe\n"
-
 #~ msgid "Password sent, waiting for response\n"
 #~ msgstr "Salasana lähetetty, odotetaan vastausta\n"
 
@@ -8446,9 +8624,6 @@
 #~ msgid "Gaim - Buddy List"
 #~ msgstr "Gaim - Tuttavalista"
 
-#~ msgid "File"
-#~ msgstr "Tiedosto"
-
 #, fuzzy
 #~ msgid "_Accounts..."
 #~ msgstr "Käyttäjätilit"
@@ -8472,10 +8647,6 @@
 #~ msgid "Gaim - Group Chats"
 #~ msgstr "Gaim - Yhdistetyt ryhmäkeskustelut"
 
-#, fuzzy
-#~ msgid "_Save Conversation"
-#~ msgstr "Tallenna keskustelu"
-
 #~ msgid "Gaim - Conversations"
 #~ msgstr "Gaim - Keskustelut"
 
@@ -8798,9 +8969,6 @@
 #~ msgid "IM who:"
 #~ msgstr "Pikaviesti kenelle:"
 
-#~ msgid "User:"
-#~ msgstr "Käyttäjä:"
-
 #~ msgid "Gaim - Get User Info"
 #~ msgstr "Gaim - Hae käyttäjätiedot"
 
--- a/src/gtkconv.c	Sun Dec 21 09:04:43 2003 +0000
+++ b/src/gtkconv.c	Sun Dec 21 19:52:25 2003 +0000
@@ -739,20 +739,25 @@
 	GtkWidget *entry;
 };
 
-static void do_search_cb(GtkWidget *widget, gint resp, struct _search *s)
+static void do_search_cb(GtkWidget *widget, struct _search *s)
+{
+    gtk_imhtml_search_find(GTK_IMHTML(s->gtkconv->imhtml), gtk_entry_get_text(GTK_ENTRY(s->entry)));
+}
+
+static void find_dlg_set_sensitive(GtkWidget *entry, GtkWidget *button)
 {
-	switch (resp) {
-	case GTK_RESPONSE_OK:
-		gtk_imhtml_search_find(GTK_IMHTML(s->gtkconv->imhtml), gtk_entry_get_text(GTK_ENTRY(s->entry)));
-		break;
-	case GTK_RESPONSE_DELETE_EVENT:
-	case GTK_RESPONSE_CLOSE:
-		gtk_imhtml_search_clear(GTK_IMHTML(s->gtkconv->imhtml));
-		gtk_widget_destroy(s->gtkconv->dialogs.search);
-		s->gtkconv->dialogs.search = NULL;
-		g_free(s);
-		break;
-	}
+    if(*gtk_entry_get_text(GTK_ENTRY(entry)))
+        gtk_widget_set_sensitive(button, TRUE);
+    else
+        gtk_widget_set_sensitive(button, FALSE);
+}
+
+static gboolean find_dlg_close_cb(GtkWidget *w, struct _search *s)
+{
+    gtk_imhtml_search_clear(GTK_IMHTML(s->gtkconv->imhtml));
+    s->gtkconv->dialogs.search = NULL;
+    g_free(s);
+    return TRUE;
 }
 
 static void
@@ -762,49 +767,80 @@
 	GaimConversation *conv = gaim_conv_window_get_active_conversation(win);
 	GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win);
 	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
-	GtkWidget *hbox;
+    GtkWidget *table;
+    GtkWidget *labelbox, *bbox;
+    GtkWidget *button, *align;
 	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
 	GtkWidget *label, *entry;
 	struct _search *s;
+	gint signal_id;
+	GClosure *closure;
 
 	if (gtkconv->dialogs.search) {
 		gtk_window_present(GTK_WINDOW(gtkconv->dialogs.search));
 		return;
 	}
 
-	gtkconv->dialogs.search = gtk_dialog_new_with_buttons(_("Find"), GTK_WINDOW(gtkwin->window),
-							      GTK_DIALOG_DESTROY_WITH_PARENT,
-							      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-							      GTK_STOCK_FIND, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG(gtkconv->dialogs.search), GTK_RESPONSE_OK);
-	gtk_container_set_border_width (GTK_CONTAINER(gtkconv->dialogs.search), 6);
+    gtkconv->dialogs.search = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title(GTK_WINDOW(gtkconv->dialogs.search), _("Find"));
+    gtk_window_set_transient_for(GTK_WINDOW(gtkconv->dialogs.search),
+                                 GTK_WINDOW(gtkwin->window));
+    gtk_window_set_destroy_with_parent(GTK_WINDOW(gtkconv->dialogs.search), TRUE);
+    gtk_window_set_position(GTK_WINDOW(gtkconv->dialogs.search), GTK_WIN_POS_CENTER_ON_PARENT);
+	gtk_container_set_border_width (GTK_CONTAINER(gtkconv->dialogs.search), 12);
 	gtk_window_set_resizable(GTK_WINDOW(gtkconv->dialogs.search), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(gtkconv->dialogs.search), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 12);
-	gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 6);
-
-	hbox = gtk_hbox_new(FALSE, 12);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+
+    table = gtk_table_new(2, 2, FALSE);
+    gtk_container_add(GTK_CONTAINER(gtkconv->dialogs.search), table);
+    gtk_table_set_row_spacings(GTK_TABLE(table), 12);
+    gtk_table_set_col_spacings(GTK_TABLE(table), 12);
+
+    labelbox = gtk_hbox_new(FALSE, 12);
+    gtk_box_pack_start(GTK_BOX(labelbox), img, FALSE, FALSE, 0);
 	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search), GTK_RESPONSE_OK, FALSE);
+    gtk_table_attach_defaults(GTK_TABLE(table), labelbox, 0, 1, 0, 1);
 
 	label = gtk_label_new(NULL);
 	gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Search for:"));
+    gtk_box_pack_start(GTK_BOX(labelbox), label, FALSE, FALSE, 0);
+
 	entry = gtk_entry_new();
 	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(entry));
-	g_signal_connect(G_OBJECT(entry), "changed", 
-					 G_CALLBACK(gaim_gtk_set_sensitive_if_input), 
-					 gtkconv->dialogs.search);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0);
+    gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, 0, 1);
 
 	s = g_malloc(sizeof(struct _search));
 	s->gtkconv = gtkconv;
 	s->entry = entry;
 
-	g_signal_connect(G_OBJECT(gtkconv->dialogs.search), "response", G_CALLBACK(do_search_cb), s);
+    bbox = gtk_hbutton_box_new();
+    gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_EDGE);
+    gtk_box_set_spacing(GTK_BOX(bbox), 12);
+    gtk_table_attach_defaults(GTK_TABLE(table), bbox, 1, 2, 1, 2);
+
+    button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+    gtk_container_add(GTK_CONTAINER(bbox), button);
+    GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+    g_signal_connect_swapped(G_OBJECT(button), "clicked",
+                             G_CALLBACK(gtk_widget_destroy), gtkconv->dialogs.search);
+
+    button = gtk_button_new_from_stock(GTK_STOCK_FIND);
+    gtk_container_add(GTK_CONTAINER(bbox), button);
+    gtk_widget_set_sensitive(button, FALSE);
+    GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+/*
+	signal_id = g_signal_lookup ("clicked", GTK_TYPE_BUTTON);
+    closure = g_cclosure_new_object (G_CALLBACK (action_widget_activated),
+                                     G_OBJECT (dialog));
+	g_signal_connect_closure_by_id (child, signal_id, 0, closure, FALSE);
+*/
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(do_search_cb), s);
+
+    gtk_window_set_default(GTK_WINDOW(gtkconv->dialogs.search), button);
+    g_signal_connect(G_OBJECT(gtkconv->dialogs.search), "destroy",
+                     G_CALLBACK(find_dlg_close_cb), s);
+	g_signal_connect(G_OBJECT(entry), "changed", 
+					 G_CALLBACK(find_dlg_set_sensitive), button);
 
 	gtk_widget_show_all(gtkconv->dialogs.search);
 }