changeset 8417:0ae100cfcb83

[gaim-migrate @ 9147] fi po update committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 09 Mar 2004 19:23:44 +0000
parents 5b539a796a2c
children 42e17a581d59
files ChangeLog po/fi.po
diffstat 2 files changed, 1992 insertions(+), 1601 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Mar 09 16:31:08 2004 +0000
+++ b/ChangeLog	Tue Mar 09 19:23:44 2004 +0000
@@ -66,6 +66,7 @@
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* Dutch translation updated (Vincent van Adrighem)
 	* English (British) translation updated (Luke Ross (lukeross))
+	* Finnish translation updated (Arto Alakulju)
 	* French translation updated (Eric Boumaour and Sebastien Francois)
 	* Hebrew translation had 1 character removed (Ambrose C. LI)
 	* Portuguese translation updated (Duarte Serrano Goncalves Henriques)
--- a/po/fi.po	Tue Mar 09 16:31:08 2004 +0000
+++ b/po/fi.po	Tue Mar 09 19:23:44 2004 +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.75\n"
+"Project-Id-Version: gaim 0.76\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-07 05:23+0200\n"
-"PO-Revision-Date: 2004-01-07 05:26+0200\n"
+"POT-Creation-Date: 2004-02-18 00:00-0500\n"
+"PO-Revision-Date: 2004-03-09 19:07+0200\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "Uudelleenyhdistäjä"
 
@@ -34,7 +34,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kun yhteys palvelimelle katkeaa, tämä luo yhteyden uudelleen."
 
@@ -137,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:483 src/gtkaccount.c:1761
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -153,17 +153,17 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2552 src/gtkpounce.c:411
-#: src/gtkprefs.c:1457 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:965 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2842
-#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5545
-#: src/protocols/oscar/oscar.c:6146
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1567 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:56
+#: src/protocols/jabber/presence.c:112 src/protocols/oscar/oscar.c:2879
+#: src/protocols/oscar/oscar.c:4659 src/protocols/oscar/oscar.c:5702
+#: src/protocols/oscar/oscar.c:6315
 msgid "Away"
 msgstr "Poissa"
 
 # src/menus.c:327
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#: plugins/docklet/docklet.c:159 src/away.c:518
 msgid "Back"
 msgstr "Palaa"
 
@@ -173,16 +173,16 @@
 msgstr "Vaimenna äänet"
 
 # NOTE source: gnomeicu
-#: plugins/docklet/docklet.c:172 src/gtkft.c:581
+#: plugins/docklet/docklet.c:172 src/gtkft.c:583
 msgid "File Transfers"
 msgstr "Tiedostosiirtot"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1920 src/main.c:288
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2554 src/main.c:294
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -221,6 +221,7 @@
 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 "
@@ -287,6 +288,7 @@
 msgid "Provides remote control for gaim applications."
 msgstr "Tuo kauko-ohjauksen Gaim-sovelluksille."
 
+#. *  description
 #: plugins/gaim-remote/remote.c:720
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
@@ -313,6 +315,7 @@
 msgid "An example plugin that does stuff - see the description."
 msgstr "Esimerkkiplugin joka tekee jotain - katso kuvaus."
 
+#. *  description
 #: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
@@ -362,6 +365,7 @@
 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"
@@ -378,6 +382,164 @@
 "Liikuta ylös ja sitten vasemmalle vaihtaaksesi edelliseen keskusteluun.\n"
 "Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
 
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:76
+msgid "Local Addressbook"
+msgstr "Paikallinen osoitekirja"
+
+#: plugins/gevolution/add_buddy_dialog.c:146
+#: plugins/gevolution/add_buddy_dialog.c:157
+#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
+#: src/gtkblist.c:2600 src/gtkprefs.c:843 src/gtkprefs.c:1595
+#: src/protocols/jabber/jabber.c:944
+msgid "None"
+msgstr "Ei mitään"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1972
+#: src/gtkroomlist.c:544 src/protocols/jabber/jabber.c:622
+#: src/protocols/msn/msn.c:1353 src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "Nimi"
+
+#: plugins/gevolution/add_buddy_dialog.c:201
+msgid "Instant Messaging"
+msgstr "Pikaviestitys"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:482
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:495
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6580
+msgid "Search"
+msgstr "Etsi"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3618
+#: src/gtkblist.c:3946
+msgid "Group:"
+msgstr "Ryhmä:"
+
+# XXX
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+msgid "New Person"
+msgstr "Uusi henkilö"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+msgid "Select Buddy"
+msgstr "Valitse tuttava"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:372
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Valitse henkilö osoitekirjasta johon lisäät tämän tuttavan, tai luo uusi "
+"henkilö."
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:451
+msgid "Show user details"
+msgstr "Näytä käyttäjän yksityiskohdat"
+
+#: plugins/gevolution/assoc-buddy.c:452
+msgid "Hide user details"
+msgstr "Piilota piilota käyttäjän yksityiskohdat"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+msgid "_Associate Buddy"
+msgstr "_Assosioi tuttava"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:674 src/blist.c:861 src/blist.c:2078 src/gtkblist.c:3443
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
+msgid "Buddies"
+msgstr "Tuttavat"
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr "Lisää osoitekirjaan"
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+msgid "Evolution Integration Configuration"
+msgstr "Evolution -integrointiasetukset"
+
+#. Label
+#: plugins/gevolution/gevolution.c:350
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Valitse kaikki tilit joihin tuttavat lisätään automaattisesti."
+
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+msgid "Account"
+msgstr "Tili"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:461
+msgid "Evolution Integration"
+msgstr "Evolution integrointi"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+msgid "Provides integration with Ximian Evolution."
+msgstr "Mahdollistaa integroinnin Ximian Evolution:in kanssa."
+
+#: plugins/gevolution/new_person_dialog.c:270
+msgid "Please enter the person's information below."
+msgstr "Syötä henkilön tiedot alle."
+
+#: plugins/gevolution/new_person_dialog.c:274
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Syötä tuttavan näyttönimi ja käyttäjätilityyppi alle."
+
+#: plugins/gevolution/new_person_dialog.c:294
+msgid "Account type:"
+msgstr "Käyttäjätilityyppi:"
+
+#: plugins/gevolution/new_person_dialog.c:298
+msgid "Screenname:"
+msgstr "Näyttönimi:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+msgid "Optional information:"
+msgstr "Valinnaiset lisätiedot:"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:319
+#: src/protocols/oscar/oscar.c:3114
+msgid "Buddy Icon"
+msgstr "Tuttavakuvake"
+
+#: plugins/gevolution/new_person_dialog.c:353
+msgid "First name:"
+msgstr "Etunimi:"
+
+#: plugins/gevolution/new_person_dialog.c:365
+msgid "Last name:"
+msgstr "Sukunimi:"
+
+#: plugins/gevolution/new_person_dialog.c:385
+msgid "E-mail:"
+msgstr "Sähköposti:"
+
 #: plugins/history.c:74
 msgid "History"
 msgstr "Historia"
@@ -463,6 +625,7 @@
 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 "
@@ -489,6 +652,7 @@
 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."
@@ -512,7 +676,7 @@
 
 #: plugins/notify.c:583
 msgid "C_hat windows"
-msgstr "_Ryhmäkeskustelu-ikkunoille"
+msgstr "C_hat-ikkunoille"
 
 # TODO Untranslated
 #: plugins/notify.c:590
@@ -594,14 +758,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr "Perl-plugin lataaja"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-plugineja."
 
@@ -669,6 +833,7 @@
 msgid "Checks periodically for new releases."
 msgstr "Tarkistaa määräajoin onko uusi Gaim-versio julkaistu."
 
+#. *  description
 #: plugins/relnot.c:139
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
@@ -805,7 +970,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:799
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s on poissa."
@@ -836,6 +1001,10 @@
 msgid "Buddy State Notification"
 msgstr "Tuttavan-tila ilmoitus"
 
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -843,11 +1012,11 @@
 msgstr ""
 "Ilmoittaa keskusteluikkunassa kun tuttava on poissa/jouten ja kun hän palaa."
 
-#: plugins/tcl/tcl.c:348
+#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-plugin lataaja"
 
-#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcp-pluginien latauksen."
 
@@ -858,7 +1027,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "Rullaava tuttavataulu"
 
@@ -866,7 +1035,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
 
@@ -925,7 +1094,7 @@
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:846
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
@@ -977,8 +1146,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2386
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2641
+#: src/gtkprefs.c:2471
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -997,8 +1166,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
-#: src/gtkprefs.c:2257
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:884
+#: src/gtkprefs.c:2472
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1014,16 +1183,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Spesifiset asetukset Windows Gaimille."
 
-#: src/about.c:57
+#: src/about.c:59
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/about.c:72
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:92
+#: src/about.c:94
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1034,328 +1203,323 @@
 "protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:aa ja on lisensoitu "
 "GPL:n mukaisesti.<BR><BR>"
 
-#: src/about.c:102
+#: src/about.c:104
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"3\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
 # NOTE source: 0.59.8
-#: src/about.c:107
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "Aktiiviset kehittäjät"
 
 # NOTE source: 0.59.8
-#: src/about.c:108
+#: src/about.c:110
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: src/about.c:110
+#: src/about.c:112
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: src/about.c:113
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr "Kehittäjä & verkkosivujen ylläpitäjä"
 
-#: src/about.c:114
+#: src/about.c:116
 msgid "win32 port"
 msgstr "win32 käännös"
 
 # NOTE source: 0.59.8 (plural -> singular)
-#: src/about.c:117 src/about.c:118 src/about.c:119
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "kehittäjä"
 
-#: src/about.c:120
+#: src/about.c:122
 msgid "support"
 msgstr "tuki"
 
-#: src/about.c:127
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:141
+#: src/about.c:143
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:142
+#: src/about.c:144
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:143
+#: src/about.c:145
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:146
+#: src/about.c:148
 msgid "former maintainer"
 msgstr "entinen ylläpitäjä"
 
-#: src/about.c:147
+#: src/about.c:149
 msgid "former Jabber developer"
 msgstr "entinen Jabber-ylläpitäjä"
 
-#: src/about.c:148
+#: src/about.c:150
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#: src/about.c:159
+msgstr "hakkeri sekä määrätty kuljettaja [laiska pummi]"
+
+#: src/about.c:161
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
 # NOTE source: netscape
-#: src/about.c:160 src/about.c:193
+#: src/about.c:162 src/about.c:195
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:161 src/about.c:194
+#: src/about.c:163 src/about.c:196
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Danish"
 msgstr "Tanska"
 
-#: src/about.c:163
+#: src/about.c:165
 msgid "British English"
 msgstr "Brittienglanti"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:166 src/about.c:197
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:165 src/about.c:196
+#: src/about.c:167 src/about.c:198
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:166 src/about.c:197
+#: src/about.c:168 src/about.c:199
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:169 src/about.c:200
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:168
+#: src/about.c:170
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:169
+#: src/about.c:171
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:170 src/about.c:200
+#: src/about.c:172 src/about.c:202
 msgid "Italian"
 msgstr "Italia"
 
 # NOTE source: netscape
-#: src/about.c:171 src/about.c:202
+#: src/about.c:173 src/about.c:204
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:172
+#: src/about.c:174
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
 # NOTE source: netscape
-#: src/about.c:173
+#: src/about.c:175
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:174 src/about.c:203
+#: src/about.c:176 src/about.c:205
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:175
+#: src/about.c:177
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:176
+#: src/about.c:178
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:177
+#: src/about.c:179
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:178 src/about.c:204
+#: src/about.c:180 src/about.c:206
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:179
+#: src/about.c:181
 msgid "Serbian"
 msgstr "Serbia"
 
-#: src/about.c:180 src/about.c:206
+#: src/about.c:182 src/about.c:208
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi-työryhmä"
 
 # XXX source: netscape + google
-#: src/about.c:182
+#: src/about.c:184
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:183
+#: src/about.c:185
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
-#: src/about.c:190
+#: src/about.c:192
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: src/about.c:191
+#: src/about.c:193
 msgid "Amharic"
 msgstr "Amhara"
 
-#: src/about.c:192
+#: src/about.c:194
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: src/about.c:199
+#: src/about.c:201
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/about.c:201
+#: src/about.c:203
 msgid "Japanese"
 msgstr "Japani"
 
 # NOTE source: netscape
-#: src/about.c:205
+#: src/about.c:207
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/account.c:272 src/protocols/jabber/jabber.c:1017
+#: src/account.c:275 src/protocols/jabber/jabber.c:1041
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: src/account.c:280
+#: src/account.c:283
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: src/account.c:305
+#: src/account.c:308
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: src/account.c:311
+#: src/account.c:314
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: src/account.c:317
+#: src/account.c:320
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/account.c:322
+#: src/account.c:325
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: src/account.c:330
+#: 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:333 src/connection.c:193 src/dialogs.c:1488
-#: src/dialogs.c:1505 src/dialogs.c:1524 src/gtkblist.c:1742
-#: src/gtkrequest.c:190 src/protocols/jabber/jabber.c:1062
-#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
+#: src/account.c:336 src/connection.c:198 src/dialogs.c:1478
+#: src/dialogs.c:1495 src/dialogs.c:1514 src/gtkblist.c:1999
+#: src/gtkrequest.c:192 src/protocols/jabber/jabber.c:1086
+#: src/protocols/jabber/xdata.c:328 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:2453
-#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:6196
-#: src/protocols/oscar/oscar.c:6292 src/protocols/oscar/oscar.c:6341
-#: src/protocols/oscar/oscar.c:6423 src/protocols/yahoo/yahoo.c:2398
-#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1018
+#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2570 src/protocols/oscar/oscar.c:6370
+#: src/protocols/oscar/oscar.c:6466 src/protocols/oscar/oscar.c:6515
+#: src/protocols/oscar/oscar.c:6597 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/yahoo/yahoo.c:2419 src/request.h:1042
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:334 src/account.c:368 src/connection.c:194 src/dialogs.c:351
-#: src/dialogs.c:363 src/dialogs.c:376 src/dialogs.c:397 src/dialogs.c:1322
-#: src/dialogs.c:1489 src/dialogs.c:1506 src/dialogs.c:1525
-#: src/gtkaccount.c:1612 src/gtkaccount.c:2081 src/gtkblist.c:1743
-#: src/gtkblist.c:3701 src/gtkconn.c:167 src/gtkprivacy.c:569
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:607 src/gtkprivacy.c:618
-#: src/gtkrequest.c:191 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:687
-#: src/protocols/jabber/jabber.c:1063 src/protocols/jabber/xdata.c:335
-#: 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:2417
-#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2489
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6024
-#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6293
-#: src/protocols/oscar/oscar.c:6342 src/protocols/oscar/oscar.c:6407
-#: src/protocols/oscar/oscar.c:6424 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
-#: src/request.h:1018 src/request.h:1028
+#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1321
+#: src/dialogs.c:1479 src/dialogs.c:1496 src/dialogs.c:1515
+#: src/gtkaccount.c:1614 src/gtkaccount.c:2083 src/gtkblist.c:2000
+#: src/gtkblist.c:3985 src/gtkconn.c:168 src/gtkprivacy.c:561
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:599 src/gtkprivacy.c:610
+#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/chat.c:698
+#: src/protocols/jabber/jabber.c:691 src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/xdata.c:329 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:2453 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2571
+#: src/protocols/oscar/oscar.c:6194 src/protocols/oscar/oscar.c:6371
+#: src/protocols/oscar/oscar.c:6467 src/protocols/oscar/oscar.c:6516
+#: src/protocols/oscar/oscar.c:6581 src/protocols/oscar/oscar.c:6598
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2420 src/request.h:1042 src/request.h:1052
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/account.c:360
+#: 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:367 src/dialogs.c:1310 src/gtkrequest.c:197
+#: src/account.c:370 src/dialogs.c:1309 src/gtkrequest.c:199
 #: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/away.c:208
+#: src/away.c:210
 msgid "Away!"
 msgstr "Poissa!"
 
-#: src/away.c:269
+#: src/away.c:271
 msgid "I'm Back!"
 msgstr "Olen palannut!"
 
-#: src/away.c:368
+#: src/away.c:371
 msgid "New Away Message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/away.c:388
+#: src/away.c:391
 msgid "Remove Away Message"
 msgstr "Poista poissaoloviesti"
 
-#: src/away.c:583
+#: src/away.c:586
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/blist.c:576 src/gtkprefs.c:2259
+#: src/blist.c:579 src/gtkprefs.c:2474
 msgid "Chats"
-msgstr "Ryhmäkeskustelut"
-
-#: src/blist.c:671 src/blist.c:858 src/blist.c:2077 src/gtkblist.c:3168
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
-msgid "Buddies"
-msgstr "Tuttavat"
-
-#: src/blist.c:1158
+msgstr "Chatit"
+
+#: src/blist.c:1165
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1366,30 +1530,30 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1167
+#: src/blist.c:1174
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
-#: src/protocols/jabber/auth.c:135 src/protocols/jabber/buddy.c:568
+#: src/blist.c:1224 src/gtkaccount.c:160 src/gtkutils.c:859
+#: src/protocols/jabber/auth.c:144 src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/blist.c:1544
+#: src/blist.c:1551
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmänimi"
 
-#: src/blist.c:2194
+#: src/blist.c:2193
 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:2196
+#: src/blist.c:2195
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
-#: src/buddy_chat.c:212 src/gtkblist.c:3591
+#: src/buddy_chat.c:216 src/gtkblist.c:3872
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1397,114 +1561,121 @@
 "Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: src/buddy_chat.c:223
+#: src/buddy_chat.c:227
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/buddy_chat.c:225 src/gtkblist.c:926
+#. join button
+#: src/buddy_chat.c:229 src/gtkblist.c:903 src/gtkroomlist.c:255
+#: src/gtkroomlist.c:411
 msgid "_Join"
 msgstr "_Liity"
 
-#: src/buddy_chat.c:242
+#: src/buddy_chat.c:246
 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:587 src/dialogs.c:662
-#: src/gtkpounce.c:358
+#: src/buddy_chat.c:257 src/dialogs.c:590 src/dialogs.c:667
+#: src/gtkpounce.c:361 src/gtkroomlist.c:355
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: src/connection.c:117 src/connection.c:165
+#: src/connection.c:119 src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-protokollaplugin puuttuu"
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr "Rekisteröintivirhe"
 
-#: src/connection.c:170
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
 # XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
-#: src/connection.c:191
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:297
+#: src/conversation.c:283
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:305
+#: src/conversation.c:291
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1898
+#: src/conversation.c:1930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1901
+#: src/conversation.c:1933
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:1986
+#: src/conversation.c:2025
+#, c-format
+msgid "You are now known as %s"
+msgstr "Olet nyt nimeltäsi %s"
+
+#: src/conversation.c:2028
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2028
+#: src/conversation.c:2071
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2030
+#: src/conversation.c:2073
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2103
+#: src/conversation.c:2146
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2105
+#: src/conversation.c:2148
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2387
+#: src/conversation.c:2428
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
 # XXX
-#: src/conversation.c:2389
+#: src/conversation.c:2430 src/gtkprefs.c:1371
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2391
+#: src/conversation.c:2432
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2393
+#: src/conversation.c:2434
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:202
 msgid "Warn User"
 msgstr "Varoita käyttäjää"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:205
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: src/dialogs.c:219
+#: src/dialogs.c:221
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1512,28 +1683,30 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 msgstr ""
-"Tämä nostaa %s:n varoitustasoa ja hän tulee saamaan kovemman "
-"taajuusrajoituksen.\n"
-
-#: src/dialogs.c:228
+"<span weight=\"bold\" size=\"larger\">Varoitetaanko %s?</span>\n"
+"\n"
+"Tämä nostaa %s:n varoitustasoa ja hän tulee saamaan kovemman taajuusrajoituksen.\n"
+"\n"
+
+#: src/dialogs.c:230
 msgid "Warn _anonymously?"
 msgstr "Varoitako _nimettömänä?"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:237
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Nimettömät varoitukset ovat vähemmän ankaria.</b>"
 
-#: src/dialogs.c:347
+#: 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:349 src/dialogs.c:350
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:359
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1542,11 +1715,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä '%s' tuttavalistaltasi.  Haluatko "
 "jatkaa?"
 
-#: src/dialogs.c:361 src/dialogs.c:362
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: src/dialogs.c:371
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1554,12 +1727,12 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä '%s' tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:374 src/dialogs.c:375
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
 # TODO Untranslated
-#: src/dialogs.c:392
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1569,125 +1742,125 @@
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
 # NOTE source: 0.59.8/0.60
-#: src/dialogs.c:395 src/dialogs.c:396
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:543
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/dialogs.c:559
-msgid "Please enter the screenname of the person you would like to IM.\n"
+#: src/dialogs.c:561
+msgid "Please enter the screen name 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:571 src/dialogs.c:646
-msgid "_Screenname:"
+#: src/dialogs.c:573 src/dialogs.c:650
+msgid "_Screen Name:"
 msgstr "_Näyttönimi:"
 
-#: src/dialogs.c:616
+#: src/dialogs.c:620
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: src/dialogs.c:634
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
+#: src/dialogs.c:638
+msgid ""
+"Please enter the screen name 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:740
+#: src/dialogs.c:744
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: src/dialogs.c:742
+#: src/dialogs.c:746
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/dialogs.c:767
+#: src/dialogs.c:771
 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:780
+#: src/dialogs.c:784
 msgid "_URL:"
 msgstr "_URL:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:798
 msgid "_Description:"
 msgstr "_Kuvaus:"
 
-#: src/dialogs.c:924 src/dialogs.c:941
+#: src/dialogs.c:922 src/dialogs.c:939
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: src/dialogs.c:976 src/dialogs.c:993
+#: src/dialogs.c:974 src/dialogs.c:991
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: src/dialogs.c:1078 src/dialogs.c:1104
+#: src/dialogs.c:1076 src/dialogs.c:1102
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: src/dialogs.c:1168
+#: src/dialogs.c:1166
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviestiä tyhjällä otsikolla"
 
-#: src/dialogs.c:1170
+#: src/dialogs.c:1168
 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:1180
+#: src/dialogs.c:1178
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:1242
+#: src/dialogs.c:1240
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:1263
+#: src/dialogs.c:1261
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:1314
+#: src/dialogs.c:1313
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
-#: src/dialogs.c:1318
+#: src/dialogs.c:1317
 msgid "Use"
 msgstr "Käytä"
 
 #. show everything
-#: src/dialogs.c:1467
+#: src/dialogs.c:1457
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:1485
+#: src/dialogs.c:1475
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:1476
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: src/dialogs.c:1502
+#: src/dialogs.c:1492
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1493
 msgid "Enter an alias for this contact."
 msgstr "Anna alias tälle kontaktiryhmälle."
 
 # XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
-#: src/dialogs.c:1520
+#: src/dialogs.c:1510
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: src/dialogs.c:1522
+#: src/dialogs.c:1512
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
@@ -1701,12 +1874,12 @@
 msgid "%s was not found.\n"
 msgstr "%s ei löydy.\n"
 
-#: src/ft.c:754
+#: src/ft.c:753
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Tiedostonsiirto %s:lle keskeytetty.\n"
 
-#: src/ft.c:756
+#: src/ft.c:755
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Tiedostonsiirto %s:lta keskeytetty.\n"
@@ -1748,13 +1921,13 @@
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1769,8 +1942,7 @@
 "\n"
 "AIM: URI:en käyttö:\n"
 "Pikaviestin lähetys näyttönimelle:\n"
-"            gaim-remote uri 'aim:goim?screenname=Penguin&message=hello"
-"+world'\n"
+"            gaim-remote uri 'aim:goim?screenname=Penguin&message=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"
@@ -1778,7 +1950,7 @@
 "Seuraava avaa vastaanottajalle ainoastaan keskusteluikkunan ilman viestiä:\n"
 "         gaim-remote uri aim:goim?screenname=Penguin\n"
 "\n"
-"Ryhmäkeskusteluun liittyminen:\n"
+"Chattiin liittyminen:\n"
 "                  gaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...liittyy 'PenguinLounge'-chathuoneeseen.\n"
 "\n"
@@ -1795,32 +1967,32 @@
 "Sulje käynnissäoleva Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Hetkisen poissa."
 
-#: src/gaimrc.c:373 src/gaimrc.c:1450
+#: src/gaimrc.c:375 src/gaimrc.c:1453
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2348
+#: src/gaimrc.c:1262 src/gtkblist.c:2602
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2349
+#: src/gaimrc.c:1264 src/gtkblist.c:2603
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2350
+#: src/gaimrc.c:1266 src/gtkblist.c:2604
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: src/gaimrc.c:1548
+#: src/gaimrc.c:1551
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/gtkaccount.c:285
+#: src/gtkaccount.c:288
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1831,178 +2003,174 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %dx%d"
 
-#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
-msgid "Buddy Icon"
-msgstr "Tuttavakuvake"
-
 #. Build the login options frame.
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:370
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:387
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:389
-msgid "Screenname:"
+#: src/gtkaccount.c:392 src/gtkblist.c:3590
+msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: src/gtkaccount.c:462 src/main.c:308
+#: src/gtkaccount.c:465
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
+#: src/gtkaccount.c:470 src/gtkblist.c:3604 src/gtkblist.c:3932
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:471
+#: src/gtkaccount.c:474
 msgid "Remember password"
 msgstr "Muista salasana"
 
 # XXX could be wrong
 #. Build the user options frame.
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:528
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: src/gtkaccount.c:538
+#: src/gtkaccount.c:541
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:550
 msgid "Buddy icon file:"
 msgstr "Tuttavakuvaketiedosto:"
 
-#: src/gtkaccount.c:556
+#: src/gtkaccount.c:560
 msgid "_Browse"
 msgstr "_Selaa"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:566
 msgid "_Reset"
 msgstr "_Nollaa"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:628
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:743
 msgid "Use Global Proxy Settings"
 msgstr "Käytä globaalia proxy-asetusta"
 
 #. No Proxy
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:750
 msgid "No Proxy"
 msgstr "Ei välityspalvelinta"
 
 #. HTTP
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:757
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:764
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:771
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:774 src/gtkprefs.c:1091
+#: src/gtkaccount.c:778 src/gtkprefs.c:1173
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: src/gtkaccount.c:807
-msgid "you can see the butterflies mating"
-msgstr "voit nähdä perhosten parittelevan"
-
 #: src/gtkaccount.c:811
+msgid "you can see the butterflies mating"
+msgstr "voit nähdä perhosten parittelevan"
+
+#: src/gtkaccount.c:815
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:831
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:843 src/gtkprefs.c:1085
+#: src/gtkaccount.c:847 src/gtkprefs.c:1167
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:852 src/gtkprefs.c:1115
+#: src/gtkaccount.c:856 src/gtkprefs.c:1197
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:856 src/gtkprefs.c:1132
+#: src/gtkaccount.c:860 src/gtkprefs.c:1215
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:868
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:869 src/gtkprefs.c:1167
+#: src/gtkaccount.c:873 src/gtkprefs.c:1252
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1210
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1212
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1234
+#: src/gtkaccount.c:1236
 msgid "Show more options"
 msgstr "Näytä enemmän valintoja"
 
-#: src/gtkaccount.c:1235
+#: src/gtkaccount.c:1237
 msgid "Show fewer options"
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
+#: src/gtkaccount.c:1264 src/protocols/jabber/jabber.c:690
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1609
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/gtkaccount.c:1611 src/gtkrequest.c:194
+#: src/gtkaccount.c:1613 src/gtkrequest.c:196
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:1725
+#: src/gtkaccount.c:1727
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:1748 src/protocols/jabber/jabber.c:963
-#: src/protocols/oscar/oscar.c:2848 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6145 src/protocols/yahoo/yahoo.c:2193
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:986
+#: src/protocols/oscar/oscar.c:2885 src/protocols/oscar/oscar.c:4657
+#: src/protocols/oscar/oscar.c:6314 src/protocols/yahoo/yahoo.c:2206
+#: src/protocols/zephyr/zephyr.c:963 src/protocols/zephyr/zephyr.c:973
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:1766
+#: src/gtkaccount.c:1768
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2056
+#: src/gtkaccount.c:2058
 #, 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:2070
+#: src/gtkaccount.c:2072
 msgid ""
 "\n"
 "\n"
@@ -2012,77 +2180,77 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2074
+#: src/gtkaccount.c:2076
 msgid "Information"
 msgstr "Tiedot"
 
-#: src/gtkaccount.c:2078
+#: src/gtkaccount.c:2080
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
 #. Add button
-#: src/gtkaccount.c:2080 src/gtkblist.c:3700 src/gtkconv.c:1256
-#: src/gtkconv.c:3239 src/gtkconv.c:3330 src/gtkrequest.c:195
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2690
+#: src/gtkaccount.c:2082 src/gtkblist.c:3984 src/gtkconv.c:1194
+#: src/gtkconv.c:3532 src/gtkconv.c:3623 src/gtkrequest.c:197
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2727
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:815
-msgid "_Get Info"
-msgstr "_Hae tiedot"
-
-#: src/gtkblist.c:818
-msgid "_IM"
+#: src/gtkblist.c:809 src/gtkblist.c:2791
+msgid "Get _Info"
+msgstr "Hae _tiedot"
+
+#: src/gtkblist.c:812 src/gtkblist.c:2782
+msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:820
+#: src/gtkblist.c:814
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:822
+#: src/gtkblist.c:816
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
+#: src/gtkblist.c:836 src/gtkblist.c:908 src/gtkblist.c:921
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
+#: src/gtkblist.c:838 src/gtkblist.c:910 src/gtkblist.c:926 src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:883
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:909
+#: src/gtkblist.c:885
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:911
+#: src/gtkblist.c:887
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:913
+#: src/gtkblist.c:889
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 # XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:928
+#: src/gtkblist.c:905
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:952 src/gtkblist.c:987
+#: src/gtkblist.c:923 src/gtkblist.c:949
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:992
+#: src/gtkblist.c:954
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1391 src/gtkconv.c:4006
+#: src/gtkblist.c:1605 src/gtkconv.c:4266
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2090,122 +2258,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:1690
+#: src/gtkblist.c:1946
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:1947
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:1948
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:1693
-msgid "/Buddies/Get _User Info..."
+#: src/gtkblist.c:1949
+msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:1951
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1952
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1953
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:1954
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:1699
+#: src/gtkblist.c:1955
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:1701
+#: src/gtkblist.c:1957
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:1702
+#: src/gtkblist.c:1958
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:1961
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:1706
+#: src/gtkblist.c:1962
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:1707
+#: src/gtkblist.c:1963
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:1964
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Työkalut/P_rotokollatoiminnot"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:1966
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:1967
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirtot..."
 
-#: src/gtkblist.c:1712
+#: src/gtkblist.c:1968
+msgid "/Tools/R_oom List"
+msgstr "/Työkalut/Chat-huone_lista"
+
+#: src/gtkblist.c:1969
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: src/gtkblist.c:1713
+#: src/gtkblist.c:1970
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:1716
+#: src/gtkblist.c:1973
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:1720
+#: src/gtkblist.c:1977
 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:1721
+#: src/gtkblist.c:1978
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:1722
+#: src/gtkblist.c:1979
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:1723
+#: src/gtkblist.c:1980
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:1996
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:1739
+#: src/gtkblist.c:1996
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:1740
+#: src/gtkblist.c:1997
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:1768
+#: src/gtkblist.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -2214,16 +2386,16 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
+#: src/gtkblist.c:2089 src/protocols/oscar/oscar.c:5682
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:2104
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1863
+#: src/gtkblist.c:2120
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2231,7 +2403,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:1864
+#: src/gtkblist.c:2121
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2239,7 +2411,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:1865
+#: src/gtkblist.c:2122
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2247,7 +2419,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1866
+#: src/gtkblist.c:2123
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2255,7 +2427,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:1867
+#: src/gtkblist.c:2124
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2263,7 +2435,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> "
 
-#: src/gtkblist.c:1868
+#: src/gtkblist.c:2125
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2271,7 +2443,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:1869
+#: src/gtkblist.c:2126
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2279,7 +2451,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:1871
+#: src/gtkblist.c:2128
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2287,7 +2459,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:2129
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2295,7 +2467,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:1873
+#: src/gtkblist.c:2130
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2303,86 +2475,78 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2143
+#: src/gtkblist.c:2400
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2145
+#: src/gtkblist.c:2402
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2150
+#: src/gtkblist.c:2407
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2153
+#: src/gtkblist.c:2410
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
-#: src/gtkblist.c:2346 src/gtkprefs.c:834 src/gtkprefs.c:1485
-msgid "None"
-msgstr "Ei mitään"
-
-#: src/gtkblist.c:2413
+#: src/gtkblist.c:2668
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2671
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:2674
 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:2506
+#: src/gtkblist.c:2762
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/_Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2764
 msgid "/Buddies/Show Empty Groups"
 msgstr "/_Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2526 src/gtkconv.c:1215
-msgid "IM"
-msgstr "Pikaviesti"
-
-#: src/gtkblist.c:2532
+#: src/gtkblist.c:2788
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:2535 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "Hae tiedot"
-
-#: src/gtkblist.c:2541
+#: src/gtkblist.c:2797
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
-msgid "Chat"
-msgstr "Ryhmäkeskustelu"
-
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:2800
+msgid "_Chat"
+msgstr "_Chat"
+
+#: src/gtkblist.c:2805
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
+#: src/gtkblist.c:2808
+msgid "_Away"
+msgstr "_Poissa"
+
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:2813
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3545 src/protocols/yahoo/yahoo.c:2338
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3568
 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. "
@@ -2392,24 +2556,16 @@
 "myös valita aliaksen (tai lempinimen) tuttavalle. Alias näytetään "
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
-#: src/gtkblist.c:3315 src/main.c:290
-msgid "Screen Name:"
-msgstr "Näyttönimi:"
-
-#: src/gtkblist.c:3341 src/gtkblist.c:3663
-msgid "Group:"
-msgstr "Ryhmä:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:3350 src/gtkblist.c:3631
+#: src/gtkblist.c:3628 src/gtkblist.c:3912
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:3598
+#: src/gtkblist.c:3879
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:3621
+#: src/gtkblist.c:3902
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2417,42 +2573,42 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:3697
+#: src/gtkblist.c:3981
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:3698
+#: src/gtkblist.c:3982
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4215
+#: src/gtkblist.c:4501
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
 # NOTE source: netscape
-#: src/gtkconn.c:77 src/gtkconn.c:249 src/gtkconn.c:260
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "Valmis."
 
 # NOTE: This shows when the user is (i.e., you are) signing on
-#: src/gtkconn.c:156
+#: src/gtkconn.c:157
 msgid "Signon: "
-msgstr "Kirjaudutaan sisään: "
+msgstr "Kirjaudutaan: "
 
 # NOTE: This shows when the user is (i.e., you are) signing on
-#: src/gtkconn.c:202
+#: src/gtkconn.c:203
 msgid "Signon"
-msgstr "Kirjaudutaan sisään"
-
-#: src/gtkconn.c:215
+msgstr "Kirjaudutaan"
+
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "Peruuta kaikki"
 
-#: src/gtkconn.c:358 src/gtkconn.c:585
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "_Uudelleenyhdistä"
 
-#: src/gtkconn.c:549
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2465,532 +2621,529 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:551
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "Tuntematon syy."
 
-#: src/gtkconn.c:590
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "Uudelleenyhdistä _kaikki"
 
-#: src/gtkconn.c:612
-msgid "Account"
-msgstr "Tili"
-
-#: src/gtkconn.c:620
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "Aika"
 
-#: src/gtkconv.c:187
+#: src/gtkconv.c:186
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: src/gtkconv.c:188 src/gtkft.c:1076
+#: src/gtkconv.c:187 src/gtkft.c:1084
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: src/gtkconv.c:244
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkconv.c:300
+#: src/gtkconv.c:299
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:604
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
-#: src/gtkconv.c:657
+#. Put our happy label in it.
+#: src/gtkconv.c:632
 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:678
+#: src/gtkconv.c:653
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:698
+#: src/gtkconv.c:673
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:788
+#: src/gtkconv.c:763
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:785
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1223
+#: src/gtkconv.c:1152
+msgid "IM"
+msgstr "Pikaviesti"
+
+#: src/gtkconv.c:1160
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1225 src/gtkprefs.c:767
+#: src/gtkconv.c:1162 src/gtkprefs.c:776
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1234 src/gtkconv.c:3253
+#: src/gtkconv.c:1171 src/gtkconv.c:3546
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1243
+#: src/gtkconv.c:1180
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
 #. Remove button
-#: src/gtkconv.c:1254 src/gtkconv.c:3246 src/gtkconv.c:3337
-#: src/gtkrequest.c:196
+#: src/gtkconv.c:1192 src/gtkconv.c:3539 src/gtkconv.c:3630
+#: src/gtkrequest.c:198
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gtkconv.c:2489
+#: src/gtkconv.c:2335
+msgid "Animate"
+msgstr "Animoi"
+
+#: src/gtkconv.c:2340
+msgid "Hide Icon"
+msgstr "Piilota kuvake"
+
+#: src/gtkconv.c:2346
+msgid "Save Icon As..."
+msgstr "Tallenna kuvake nimellä..."
+
+#: src/gtkconv.c:2780
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2788
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2600
+#: src/gtkconv.c:2891
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:3018
+#: src/gtkconv.c:3311
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 #. Conversation menu
-#: src/gtkconv.c:3035
+#: src/gtkconv.c:3328
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3330
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3335
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3043
+#: src/gtkconv.c:3336
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3044
+#: src/gtkconv.c:3337
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3049
+#: src/gtkconv.c:3342
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3051
+#: src/gtkconv.c:3344
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3346
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3055
+#: src/gtkconv.c:3348
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3353
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3062
+#: src/gtkconv.c:3355
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3357
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3359
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3071
+#: src/gtkconv.c:3364
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3073
+#: src/gtkconv.c:3366
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3371
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3082
+#: src/gtkconv.c:3375
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3083
+#: src/gtkconv.c:3376
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:3377
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3085
+#: src/gtkconv.c:3378
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3420
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:3425
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3138
+#: src/gtkconv.c:3431
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3435
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3439
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3445
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3449
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3160
+#: src/gtkconv.c:3453
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3457
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: src/gtkconv.c:3170
+#: src/gtkconv.c:3463
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3174
+#: src/gtkconv.c:3467
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Liitä kuva..."
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3473
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3183
+#: src/gtkconv.c:3476
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3186
+#: src/gtkconv.c:3479
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3209 src/gtkconv.c:3211 src/gtkconv.c:3309 src/gtkconv.c:3311
+#: src/gtkconv.c:3502 src/gtkconv.c:3504 src/gtkconv.c:3602 src/gtkconv.c:3604
 msgid "Send"
 msgstr "Lähetä"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3518
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3521
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
 #. Block button
-#: src/gtkconv.c:3232 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkconv.c:3525 src/gtkprivacy.c:598 src/gtkprivacy.c:609
 msgid "Block"
 msgstr "Estä"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3528
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3535
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3542
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
-#: src/gtkconv.c:3256 src/gtkconv.c:3754
+#: src/gtkconv.c:3549 src/gtkconv.c:4054
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Invite
-#: src/gtkconv.c:3323
+#: src/gtkconv.c:3616
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3326
+#: src/gtkconv.c:3619
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3626
 msgid "Add the chat to your buddy list"
 msgstr "Lisää chat tuttavalistalle"
 
-#: src/gtkconv.c:3340
+#: src/gtkconv.c:3633
 msgid "Remove the chat from your buddy list"
 msgstr "Poista chat tuttavalistalta"
 
-#: src/gtkconv.c:3396
+#: src/gtkconv.c:3689
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkconv.c:3407
+#: src/gtkconv.c:3700
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkconv.c:3418
+#: src/gtkconv.c:3711
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkconv.c:3434
+#: src/gtkconv.c:3727
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
-#: src/gtkconv.c:3446
-msgid "Normal font size"
-msgstr "Normaali kirjasin koko"
-
 # XXX might be wrong
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3752
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkconv.c:3475
+#: src/gtkconv.c:3769
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkconv.c:3487
+#: src/gtkconv.c:3781
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkconv.c:3499
+#: src/gtkconv.c:3793
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkconv.c:3514
+#: src/gtkconv.c:3808
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3819
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkconv.c:3536
+#: src/gtkconv.c:3830
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: src/gtkconv.c:3621
+#: src/gtkconv.c:3916
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3678
+#: src/gtkconv.c:3976
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3731
+#: src/gtkconv.c:4031
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3743
+#: src/gtkconv.c:4043
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4291
+#: src/gtkconv.c:4553
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:4815 src/gtkconv.c:4847 src/gtkconv.c:4968 src/gtkconv.c:5035
+#: src/gtkconv.c:5077 src/gtkconv.c:5109 src/gtkconv.c:5230 src/gtkconv.c:5297
 #, 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:5367
-msgid "Animate"
-msgstr "Animoi"
-
-#: src/gtkconv.c:5372
-msgid "Hide Icon"
-msgstr "Piilota kuvake"
-
-#: src/gtkconv.c:5378
-msgid "Save Icon As..."
-msgstr "Tallenna kuvake nimellä..."
-
-#: src/gtkconv.c:5774 src/gtkconv.c:5777
+#: src/gtkconv.c:5796 src/gtkconv.c:5799
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "Testausikkuna"
 
 # NOTE source: kde-fi.org
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "Tauko"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "Aikaleimat"
 
 # NOTE source (kt): galeon
-#: src/gtkft.c:133
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: src/gtkft.c:207
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan:</b>"
 
-#: src/gtkft.c:210
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: src/gtkft.c:458
+#: src/gtkft.c:460
 msgid "Progress"
 msgstr "Valmiina"
 
-#: src/gtkft.c:465
+#: src/gtkft.c:467
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/gtkft.c:472
+#: src/gtkft.c:474
 msgid "Size"
 msgstr "Koko"
 
-#: src/gtkft.c:479
+#: src/gtkft.c:481
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: src/gtkft.c:509
+#: src/gtkft.c:511
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:512
 msgid "Status:"
 msgstr "Tila:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:511
+#: src/gtkft.c:513
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: src/gtkft.c:512
+#: src/gtkft.c:514
 msgid "Time Elapsed:"
 msgstr "Aikaa kulunut:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:513
+#: src/gtkft.c:515
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: src/gtkft.c:610
+#: src/gtkft.c:612
 msgid "_Keep the dialog open"
 msgstr "Pidä tiedonsiirtoikkuna _auki"
 
-#: src/gtkft.c:620
+#: src/gtkft.c:622
 msgid "_Clear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: src/gtkft.c:629
+#: src/gtkft.c:631
 msgid "Show transfer details"
 msgstr "Näytä tiedostosiirron yksityiskohdat"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:632
 msgid "Hide transfer details"
 msgstr "Piilota tiedostosiirron yksityiskohdat"
 
 #. Pause button
-#: src/gtkft.c:672 src/stock.c:85
+#: src/gtkft.c:674 src/stock.c:87
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: src/gtkft.c:682
+#: src/gtkft.c:684
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: src/gtkft.c:882
+#: src/gtkft.c:886
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: src/gtkft.c:884
+#: src/gtkft.c:888
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: src/gtkft.c:1053
+#: src/gtkft.c:1060
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole."
 
-#: src/gtkft.c:1062
+#: src/gtkft.c:1069
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ei voida lähettää tiedostoa jonka koko on 0 tavua."
 
-#: src/gtkft.c:1075
+#: src/gtkft.c:1083
 msgid "That file already exists."
 msgstr "Tiedosto on jo olemassa."
 
-#: src/gtkft.c:1100
+#: src/gtkft.c:1109
 msgid "Open..."
 msgstr "Avaa..."
 
-#: src/gtkft.c:1102
+#: src/gtkft.c:1111
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: src/gtkft.c:1149
+#: src/gtkft.c:1159
 #, 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:719
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:731
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:741
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:1754
+#: src/gtkimhtml.c:2077
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2998,26 +3151,26 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:1762
+#: src/gtkimhtml.c:2085
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:1771
+#: src/gtkimhtml.c:2094
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:1794
+#: src/gtkimhtml.c:2117
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: src/gtklog.c:255
+#: src/gtklog.c:257
 msgid "Conversations with"
 msgstr "Keskustelut:"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:213
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -3025,17 +3178,17 @@
 msgstr[1] "%s:lla on %d uutta viestiä."
 
 # NOTE: source: balsa
-#: src/gtknotify.c:219
+#: src/gtknotify.c:221
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Lähettäjä:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:226
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Aihe:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:230
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3046,7 +3199,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3057,179 +3210,185 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
+#: src/gtknotify.c:415
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Selainkomento \"%s\" ei kelpaa."
+
+#: src/gtknotify.c:417 src/gtknotify.c:428 src/gtknotify.c:441
+#: src/gtknotify.c:511
 msgid "Unable to open URL"
 msgstr "Ei kyetty avaamaan URL:ää"
 
-#: src/gtknotify.c:431
+#: src/gtknotify.c:425 src/gtknotify.c:438
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Virhe käynnistettäessä \"%s\": %s"
+
+#: src/gtknotify.c:512
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
 
-#: src/gtknotify.c:448
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "Selain \"%s\" ei kelpaa."
-
-#: src/gtknotify.c:455
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "Virhe ajettaessa komentoa: %s"
-
-#: src/gtkpounce.c:140
+#: src/gtkpounce.c:143
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:192
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:333 src/gtkpounce.c:738
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
 # XXX probably partitive?
-#: src/gtkpounce.c:333
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 # XXX
-#: src/gtkpounce.c:377
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:399
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 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:336
-msgid "Sign on"
-msgstr "Loggaa sisään"
-
-# This was added so it will look similar with "sign on" translation above.
-#: src/gtkpounce.c:409
-msgid "Sign off"
-msgstr "Loggaa ulos"
-
-#: src/gtkpounce.c:413
-msgid "Return from away"
-msgstr "Palaa oltuaan poissa"
-
-#: src/gtkpounce.c:415 src/gtkprefs.c:1482 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2189
-msgid "Idle"
-msgstr "Jouten"
-
-#: src/gtkpounce.c:417
-msgid "Return from idle"
-msgstr "Palaa oltuaan jouten"
-
-#: src/gtkpounce.c:419
-msgid "Buddy starts typing"
-msgstr "Alkaa kirjoittaa"
-
-#: src/gtkpounce.c:421
-msgid "Buddy stops typing"
-msgstr "Lopettaa kirjoittamisen"
+#: src/gtkpounce.c:412
+msgid "_Sign on"
+msgstr "_Kirjautuu sisään"
+
+#: src/gtkpounce.c:414
+msgid "Sign _off"
+msgstr "Kirjautuu _ulos"
+
+#: src/gtkpounce.c:416
+msgid "A_way"
+msgstr "_Poissa"
+
+#: src/gtkpounce.c:418
+msgid "Re_turn from away"
+msgstr "Palaa oltuaan _poissa"
+
+#: src/gtkpounce.c:420
+msgid "_Idle"
+msgstr "_Jouten"
+
+#: src/gtkpounce.c:422
+msgid "Retur_n from idle"
+msgstr "Palaa oltuaan _jouten"
+
+#: src/gtkpounce.c:424
+msgid "Buddy starts _typing"
+msgstr "T_uttava alkaa kirjoittaa"
+
+#: src/gtkpounce.c:426
+msgid "Buddy stops t_yping"
+msgstr "Tuttava lope_ttaa kirjoittamisen"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:450
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/gtkpounce.c:457
-msgid "Open an IM window"
-msgstr "Avaa pikaviesti-ikkuna"
-
-#: src/gtkpounce.c:458
-msgid "Popup notification"
-msgstr "Näytä ilmoitus"
-
-#: src/gtkpounce.c:459
-msgid "Send a message"
-msgstr "Lähetä viesti"
-
-#: src/gtkpounce.c:460
-msgid "Execute a command"
-msgstr "Suorita komento"
-
-#: src/gtkpounce.c:461
-msgid "Play a sound"
-msgstr "Soita ääni"
-
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
-msgid "Browse"
-msgstr "Selaa"
-
-#: src/gtkpounce.c:468 src/gtkprefs.c:2072
-msgid "Test"
-msgstr "Kokeilu"
-
-#: src/gtkpounce.c:551
-msgid "_Save this pounce after activation"
+#: src/gtkpounce.c:462
+msgid "Op_en an IM window"
+msgstr "_Avaa pikaviesti-ikkuna"
+
+#: src/gtkpounce.c:463
+msgid "_Popup notification"
+msgstr "_Ponnahdus-ilmoitus"
+
+#: src/gtkpounce.c:464
+msgid "Send a _message"
+msgstr "Lähetä _viesti"
+
+#: src/gtkpounce.c:465
+msgid "E_xecute a command"
+msgstr "Suorita _komento"
+
+#: src/gtkpounce.c:466
+msgid "P_lay a sound"
+msgstr "S_oita ääni"
+
+#: src/gtkpounce.c:470
+msgid "B_rowse..."
+msgstr "_Selaa"
+
+#: src/gtkpounce.c:472
+msgid "Bro_wse..."
+msgstr "_Selaa"
+
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr "_Esikatselu"
+
+#: src/gtkpounce.c:556
+msgid "Sav_e this pounce after activation"
 msgstr "_Säilytä tämä ilmoitin aktivoinnin jälkeen"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:745
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s alkoi kirjoittaa"
 
-#: src/gtkpounce.c:793
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr "%s on kirjautunut sisään"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s on palannut oltuaan jouten"
 
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s on palannut oltuaan poissa"
 
-#: src/gtkpounce.c:796
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s on lopettanut kirjoittamisen sinulle"
 
-#: src/gtkpounce.c:797
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/gtkpounce.c:798
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr "%s on jouten"
 
-#: src/gtkpounce.c:800
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
-#: src/gtkprefs.c:365
+#: src/gtkprefs.c:374
 msgid "Interface Options"
 msgstr "Rajapintavalinnat"
 
-#: src/gtkprefs.c:367
+#: src/gtkprefs.c:376
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Näytä palvelimelle tallennettu lempinimi jos aliasta ei ole asetettu"
 
-#: src/gtkprefs.c:553
+#: src/gtkprefs.c:562
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3237,365 +3396,413 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: src/gtkprefs.c:588
+#: src/gtkprefs.c:597
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:595 src/gtkprefs.c:1794 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:748
+#: src/gtkprefs.c:604 src/gtkprefs.c:2009 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:690
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:671
 msgid "Style"
 msgstr "Tyyli"
 
-#: src/gtkprefs.c:663
+#: src/gtkprefs.c:672
 msgid "_Bold"
 msgstr "_Lihavoi"
 
-#: src/gtkprefs.c:665
+#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "_Kursivoi"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:676
 msgid "_Underline"
 msgstr "_Alleviivaa"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:678
 msgid "_Strikethrough"
 msgstr "_Yliviivaa"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:681
 msgid "Face"
 msgstr "Kirjasin tyyppi"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:684
 msgid "Use custo_m face"
 msgstr "Valitse _kirjasin"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:701
 msgid "Use custom si_ze"
 msgstr "Valitse k_oko"
 
-#: src/gtkprefs.c:704
+#: src/gtkprefs.c:713
 msgid "Color"
 msgstr "Väri"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:717
 msgid "_Text color"
 msgstr "_Tekstin väri"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:736
 msgid "Bac_kground color"
 msgstr "T_austaväri"
 
-#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
+#: src/gtkprefs.c:764 src/gtkprefs.c:996 src/gtkprefs.c:1044
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/gtkprefs.c:756
+#: src/gtkprefs.c:765
 msgid "Show graphical _smileys"
 msgstr "Näytä graafiset _hymiöt"
 
-#: src/gtkprefs.c:758
+#: src/gtkprefs.c:767
 msgid "Show _timestamp on messages"
 msgstr "Näytä _aikaleimat viesteissä"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:769
 msgid "Show _URLs as links"
 msgstr "Näytä _URL:t linkkeinä"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:773
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:777
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:779
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:781
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:794
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:795
 msgid "Enter _sends message"
 msgstr "\"Enter\" _lähettää viestin"
 
-#: src/gtkprefs.c:788
+#: src/gtkprefs.c:797
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" lähettää viestin"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:800
 msgid "Window Closing"
 msgstr "Ikkunan sulkeminen"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:801
 msgid "_Escape closes window"
 msgstr "\"_Escape\" sulkee ikkunan"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:804
 msgid "Insertions"
 msgstr "Lisäykset"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:805
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "\"Control-{B/I/U}\" lisää _HTML-tageja"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:807
 msgid "Control-(number) _inserts smileys"
 msgstr "\"Control-(numero)\" _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:823
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:823
-msgid "Sorting:"
-msgstr "Lajittelu:"
-
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:832
+msgid "_Sorting:"
+msgstr "_Järjestys:"
+
+#: src/gtkprefs.c:837
 msgid "Buddy List Toolbar"
 msgstr "Tuttavalistan työkalurivi"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
+#: src/gtkprefs.c:838 src/gtkprefs.c:969 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
+#: src/gtkprefs.c:840 src/gtkprefs.c:971 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
+#: src/gtkprefs.c:841 src/gtkprefs.c:972 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
+#: src/gtkprefs.c:842 src/gtkprefs.c:973 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
+#: src/gtkprefs.c:847 src/gtkprefs.c:984 src/gtkprefs.c:1035
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:850
 msgid "Group Display"
 msgstr "Ryhmien näyttö"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "Näytä _määrät ryhmissä"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "Tuttavien näyttö"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:982
+#: src/gtkprefs.c:855 src/gtkprefs.c:991
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "Näytä _varoitustasot"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:859
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:861
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:863
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:888
 msgid "_Placement:"
 msgstr "_Sijoitus:"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:895
 msgid "Send _URLs as Links"
 msgstr "Lähetä _URL:t linkkeinä"
 
-#: src/gtkprefs.c:889
-msgid "Show Formatting Toolbar"
-msgstr "Näytä muotoilu-työkalurivi"
-
-#: src/gtkprefs.c:892
+#: src/gtkprefs.c:898
+msgid "Show _Formatting Toolbar"
+msgstr "Näytä _muotoilu-työkalurivi"
+
+#: src/gtkprefs.c:901
 msgid "Show a_liases in tabs/titles"
 msgstr "Näytä a_liakset välilehdissä/otsikoissa"
 
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:904
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:906
 msgid "_Tab Placement:"
 msgstr "_Välilehtien sijoitus:"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:908
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:909
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:910
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:911
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:917
 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:911
+#: src/gtkprefs.c:920
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:930
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:941
 msgid "Show status _icons on tabs"
 msgstr "Näytä tila-ikoni välilehdissä"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1010
+#: src/gtkprefs.c:968 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "Ikkuna"
 
-#: src/gtkprefs.c:969 src/gtkprefs.c:1020
+#: src/gtkprefs.c:978 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "Uuden ikkunan _leveys:"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1022
+#: src/gtkprefs.c:980 src/gtkprefs.c:1031
 msgid "New window _height:"
 msgstr "Uuden ikkunan _korkeus:"
 
-#: src/gtkprefs.c:973 src/gtkprefs.c:1024
+#: src/gtkprefs.c:982 src/gtkprefs.c:1033
 msgid "_Entry field height:"
 msgstr "Kirjoitu_salueen korkeus:"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:986
 msgid "Hide window on _send"
 msgstr "Piilota ikkuna _lähetettäessä"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:990
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/gtkprefs.c:984
+#: src/gtkprefs.c:993
 msgid "Enable buddy icon a_nimation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:997
 msgid "Show _logins in window"
 msgstr "Näytä _sisäänkirjautumiset ikkunassa"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "Kirjoitusilmoitus"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1038
 msgid "Tab Completion"
 msgstr "\"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1030
+#: src/gtkprefs.c:1039
 msgid "_Tab-complete nicks"
 msgstr "\"_Tab\"-täydennys lempinimille"
 
-#: src/gtkprefs.c:1032
+#: src/gtkprefs.c:1041
 msgid "_Old-style tab completion"
 msgstr "_Vanhantyylinen \"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1045
 msgid "_Show people joining in window"
 msgstr "_Näytä ihmisten saapuminen ikkunassa"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1047
 msgid "_Show people leaving in window"
 msgstr "_Näytä ihmisten poistuminen ikkunassa"
 
-#: src/gtkprefs.c:1040
-msgid "Co_lorize screennames"
-msgstr "Väritä näyttönimet"
-
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1049
+msgid "Co_lorize screen names"
+msgstr "_Väritä näyttönimet"
+
+#: src/gtkprefs.c:1070
+msgid "IP Address"
+msgstr "IP-osoite"
+
+#: src/gtkprefs.c:1072
+msgid "_Autodetect IP Address"
+msgstr "_Hae IP-osoite automaattisesti"
+
+#: src/gtkprefs.c:1081
+msgid "Public _IP:"
+msgstr "Julkinen _IP:"
+
+#: src/gtkprefs.c:1105
+msgid "Ports"
+msgstr "Portit"
+
+#: src/gtkprefs.c:1108
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Aseta kuunneltava porttialue"
+
+#: src/gtkprefs.c:1111
+msgid "_Start Port:"
+msgstr "_Ensimmäinen portti:"
+
+#: src/gtkprefs.c:1118
+msgid "_End Port:"
+msgstr "Viimeinen _portti:"
+
+#: src/gtkprefs.c:1166
 msgid "Proxy Type"
 msgstr "Välityspalvelimen tyyppi"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1169
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1176
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1150
+#: src/gtkprefs.c:1234
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1290
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1291
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1292
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1293
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1294
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1296
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1305
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1356
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1360
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1367
+msgid "_Open link in:"
+msgstr "_Avaa linkki:"
+
+#: src/gtkprefs.c:1369
+msgid "Browser default"
+msgstr "Selaimen oletus"
+
+#: src/gtkprefs.c:1370
+msgid "Existing window"
+msgstr "Olemassaolevaan ikkunaan"
+
+#: src/gtkprefs.c:1372
+msgid "New tab"
+msgstr "Uuteen välilehteen"
+
+#: src/gtkprefs.c:1386
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3604,64 +3811,56 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1294
-msgid "Browser Options"
-msgstr "Selaimen valinnat"
-
-#: src/gtkprefs.c:1295
-msgid "Open new _window by default"
-msgstr "Avaa uusi _ikkuna oletuksena"
-
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1419
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1422
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1425
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1427
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1482
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1483
 msgid "_No sounds when you log in"
 msgstr "_Ei ääniä kun kirjaudut sisään"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1485
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1489
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1490
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1492
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1494
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1501
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1511
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3670,69 +3869,74 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1568
 msgid "_Sending messages removes away status"
 msgstr "Viestien _lähettäminen poistaa poissaolotilan"
 
-#: src/gtkprefs.c:1460
+#: src/gtkprefs.c:1570
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1573
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1466
+#: src/gtkprefs.c:1576
 msgid "Seconds before _resending:"
 msgstr "Sekunteja ennen _uudelleenlähetystä:"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1579
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1581
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
 # XXX
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1583
 msgid "Send auto-response in _active conversations"
 msgstr "Lähetä automaattista vastausta _aktiivisissa keskusteluissa"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1592 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2202
+msgid "Idle"
+msgstr "Jouten"
+
+#: src/gtkprefs.c:1593
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1486
+#: src/gtkprefs.c:1596
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1599
 msgid "X usage"
 msgstr "X:n käyttö"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1601
 msgid "Windows usage"
 msgstr "Windows:n käyttö"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1609
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1610
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1614
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1622
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1777
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3747,7 +3951,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1576
+#: src/gtkprefs.c:1782
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3762,181 +3966,192 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1965
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:1765 src/protocols/jabber/jabber.c:618
-#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "Nimi"
-
-#: src/gtkprefs.c:1812
+#: src/gtkprefs.c:1979
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#: src/gtkprefs.c:2027
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:1939
+#: src/gtkprefs.c:2154
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:2046
+#: src/gtkprefs.c:2261
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:2053
+#: src/gtkprefs.c:2268
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:2076
+#: src/gtkprefs.c:2287
+msgid "Test"
+msgstr "Kokeilu"
+
+#: src/gtkprefs.c:2291
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:2080
+#: src/gtkprefs.c:2295
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/gtkprefs.c:2215
+#: src/gtkprefs.c:2430
 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:2251
+#: src/gtkprefs.c:2466
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2467
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2468
 msgid "Fonts"
 msgstr "Kirjasimet"
 
 # XXX
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2469
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2255
+#: src/gtkprefs.c:2470
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2258
+#: src/gtkprefs.c:2473
 msgid "IMs"
 msgstr "Pikaviestit"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2475
+msgid "Network"
+msgstr "Verkko"
+
+#: src/gtkprefs.c:2476
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2479
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2481
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2482
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2483
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2484
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2485
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2487
+msgid "Protocols"
+msgstr "Protokollat"
+
+#: src/gtkprefs.c:2503
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien käyttäjien ottaa minuun yhteyttä"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
 msgstr "Salli vain käyttäjät tuttavalistassa"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat käyttäjät"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "Estä kaikki käyttäjät"
 
-#: src/gtkprivacy.c:90
-msgid "Block the users below"
-msgstr "Estä allaolevat käyttäjät"
-
-#: src/gtkprivacy.c:369
+#: src/gtkprivacy.c:81
+msgid "Block only the users below"
+msgstr "Estä vain allaolevat käyttäjät"
+
+#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1279
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/gtkprivacy.c:384
+#: src/gtkprivacy.c:375
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:396
+#: src/gtkprivacy.c:387
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
 # XXX
-#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
+#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:556
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
+#: src/gtkprivacy.c:557
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
+
+#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
+msgid "Permit"
+msgstr "Salli"
+
 #: src/gtkprivacy.c:565
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
-
-#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
-msgid "Permit"
-msgstr "Salli"
-
-#: src/gtkprivacy.c:573
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:575
+#: src/gtkprivacy.c:567
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:595
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:596
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: src/gtkprivacy.c:611
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: src/gtkprivacy.c:613
+#: src/gtkprivacy.c:605
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -3944,69 +4159,85 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:190 src/protocols/gg/gg.c:660 src/request.h:1033
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:191 src/protocols/gg/gg.c:660 src/request.h:1033
 msgid "No"
 msgstr "Ei"
 
 # XXX dia uses "Sovella"
-#: src/gtkrequest.c:192
+#: src/gtkrequest.c:194
 msgid "Apply"
 msgstr "Toteuta"
 
-#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+#: src/gtkrequest.c:195 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gtksound.c:61
+#: src/gtkroomlist.c:316
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr ""
+"Et ole kirjautuneena millään protokollalla jolla voisi listata chat-huoneita."
+
+#: src/gtkroomlist.c:329
+msgid "Room List"
+msgstr "Huonelista"
+
+#. list button
+#: src/gtkroomlist.c:404
+msgid "_Get List"
+msgstr "_Hae lista"
+
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: src/gtksound.c:64
-msgid "Message received begins conversation"
-msgstr "Vastaanotettu viesti aloittaa keskustelun"
-
 #: src/gtksound.c:65
-msgid "Message sent"
-msgstr "Viesti lähetetty"
+msgid "Message received begins conversation"
+msgstr "Vastaanotettu viesti aloittaa keskustelun"
 
 #: src/gtksound.c:66
+msgid "Message sent"
+msgstr "Viesti lähetetty"
+
+#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Joku saapuu chattiin"
 
-#: src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Joku poistuu chatistä"
-
 #: src/gtksound.c:68
+msgid "Person leaves chat"
+msgstr "Joku poistuu chatistä"
+
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Sinä puhut chatissä"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Muut puhuvat chatissä"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi chatissä"
 
-#: src/gtksound.c:156
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
 
-#: src/gtksound.c:172
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4014,7 +4245,7 @@
 "Äänen soito ei onnistu. 'Komento'-metodi on valittu mutta komentoa ei ole "
 "asetettu."
 
-#: src/gtksound.c:184
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4022,70 +4253,82 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: src/gtkutils.c:298
+#: src/gtkutils.c:296
 msgid "Can't save icon file to disk."
 msgstr "Ikonitiedostoa ei voida tallentaa levylle."
 
-#: src/gtkutils.c:333
+#: src/gtkutils.c:331
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: src/log.c:83
+#: src/log.c:88
 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:408
+#: src/log.c:433
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
-#, 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
-#, 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:534 src/log.c:669
+#: src/log.c:514
+#, c-format
+msgid ""
+"<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\">(%s) <b>%s &lt;AUTOMAATTIVASTAUS&gt;:</b></font> %"
+"s<br/>\n"
+
+#: src/log.c:516
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTOMAATTIVASTAUS&gt;:</b></font> %"
+"s<br/>\n"
+
+#: src/log.c:560 src/log.c:696
 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:544 src/log.c:679
+#: src/log.c:570 src/log.c:706
 #, 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:548
+#: src/log.c:574
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:622
+#: src/log.c:649
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: src/log.c:683
+#: src/log.c:710
 msgid "Plain text"
 msgstr "Teksti"
 
-#: src/main.c:149
-msgid "Please enter your login."
-msgstr "Anna sisäänkirjautumistietosi."
-
-# XXX
-#: src/main.c:232
-msgid "<New User>"
-msgstr "<Uusi käyttäjä>"
-
-#: src/main.c:274
+#: src/main.c:157
+msgid "Please create an account."
+msgstr "Luo uusi käyttäjätili"
+
+#: src/main.c:239
 msgid "Login"
 msgstr "Sisäänkirjautuminen"
 
-#: src/main.c:553
+#: src/main.c:257
+msgid "<b>Screen Name:</b>"
+msgstr "<b>Näyttönimi:</b>"
+
+#: src/main.c:271
+msgid "<b>Password:</b>"
+msgstr "<b>Salasana:</b>"
+
+#: src/main.c:300
+msgid "Sign on"
+msgstr "Kirjaudu"
+
+#. full help text
+#: src/main.c:519
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4119,12 +4362,12 @@
 "   -h, --help           näytä tämä viesti ja poistu\n"
 
 #. short message
-#: src/main.c:568
+#: src/main.c:534
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita '%s -h' saadaksesi lisää tietoja.\n"
 
-#: src/plugin.c:267
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4132,24 +4375,24 @@
 msgstr ""
 "Vaadittu liitännäinen %s puuttuu. Ole hyvä ja asenna se ja yritä uudelleen."
 
-#: src/plugin.c:272 src/plugin.c:300
+#: src/plugin.c:274 src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ei kyennyt lataamaan liitännäistäsi."
 
-#: src/plugin.c:296
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu plugin %s ei latautunut."
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:271
 msgid "Slightly less boring default"
 msgstr "Hieman vähemmän tylsä oletusviesti"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
 #: 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:2492
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2614
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -4161,11 +4404,12 @@
 msgid "Away for friends only"
 msgstr "Poissa vain ystäville"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:968
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:6151 src/protocols/yahoo/yahoo.c:2187
-#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:992
+#: src/protocols/jabber/presence.c:119 src/protocols/oscar/oscar.c:2883
+#: src/protocols/oscar/oscar.c:4579 src/protocols/oscar/oscar.c:4650
+#: src/protocols/oscar/oscar.c:4674 src/protocols/oscar/oscar.c:6320
+#: src/protocols/oscar/oscar.c:6324 src/protocols/yahoo/yahoo.c:2200
+#: src/protocols/yahoo/yahoo.c:2525 src/protocols/yahoo/yahoo.c:2624
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4186,8 +4430,8 @@
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
-#: src/protocols/jabber/auth.c:158 src/protocols/jabber/auth.c:317
-#: src/protocols/jabber/auth.c:417 src/protocols/jabber/auth.c:429
+#: src/protocols/jabber/auth.c:167 src/protocols/jabber/auth.c:333
+#: src/protocols/jabber/auth.c:431 src/protocols/jabber/auth.c:443
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
@@ -4223,11 +4467,11 @@
 #. 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/msn/dispatch.c:208 src/protocols/msn/msn.c:492
-#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1853 src/protocols/yahoo/yahoo.c:1884
-#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:141
+#: src/protocols/yahoo/yahoo.c:1865 src/protocols/yahoo/yahoo.c:1896
+#: src/protocols/yahoo/yahoo.c:1959 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
@@ -4290,29 +4534,29 @@
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:4017
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:3967 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:637
+#: src/protocols/oscar/oscar.c:4022 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:642
+#: src/protocols/oscar/oscar.c:4025 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4019
 msgid "Nick"
 msgstr "Kutsumanimi"
 
 #: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-msgid "Birth year"
+msgid "Birth Year"
 msgstr "Syntymävuosi"
 
 #: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
@@ -4321,8 +4565,8 @@
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:648
-#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:652
+#: src/protocols/oscar/oscar.c:4071 src/protocols/oscar/oscar.c:4087
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Kunta"
@@ -4330,12 +4574,12 @@
 # XXX need to check for gradation problems
 #. res[0] == username
 #. 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:2888 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2785
-#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
-#: src/protocols/yahoo/yahoo.c:2988 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1289
+#: src/protocols/msn/msn.c:1533 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2925 src/protocols/oscar/oscar.c:3251
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2798
+#: src/protocols/yahoo/yahoo.c:2820 src/protocols/yahoo/yahoo.c:2843
+#: src/protocols/yahoo/yahoo.c:3001 src/protocols/zephyr/zephyr.c:377
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -4438,7 +4682,7 @@
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1080
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1103
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
@@ -4478,7 +4722,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
@@ -4491,17 +4735,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:188
-#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
-#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2618
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
+#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2655
+#: src/protocols/oscar/oscar.c:5280
 msgid "Authorize"
 msgstr "Salli"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:189
-#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
-#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5143
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
+#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2657
+#: src/protocols/oscar/oscar.c:5281
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -4544,12 +4788,12 @@
 "<B>Tuetut IRC-komennot:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:470 src/protocols/jabber/chat.c:540
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:542
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -4595,10 +4839,18 @@
 msgid "Couldn't create socket"
 msgstr "Socketin luominen epäonnistui"
 
-#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:977
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
+#: src/protocols/irc/irc.c:492 src/protocols/yahoo/yahoochat.c:1320
+msgid "Users"
+msgstr "Käyttäjät"
+
+#: src/protocols/irc/irc.c:495 src/protocols/yahoo/yahoochat.c:1329
+msgid "Topic"
+msgstr "Aihe"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4608,32 +4860,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:598
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:599
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1213 src/protocols/napster/napster.c:636
+#: src/protocols/irc/irc.c:616 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1242 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1228
-#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
-#: src/protocols/trepia/trepia.c:1344
+#: src/protocols/irc/irc.c:619 src/protocols/jabber/jabber.c:1263
+#: src/protocols/msn/msn.c:1665 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1350
 msgid "Port"
 msgstr "Portti"
 
-#: src/protocols/irc/irc.c:557
+#: src/protocols/irc/irc.c:622
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:608
+#: src/protocols/irc/irc.c:625 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:612
 msgid "Username"
 msgstr "Käyttäjänimi"
 
@@ -4658,7 +4910,7 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2901
 msgid "Realname"
 msgstr "Oikea nimi"
 
@@ -4684,131 +4936,131 @@
 msgid "Buddy Information for %s"
 msgstr "Tuttavan %s tiedot"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:277
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:282
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:296
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti '%s'"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 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
+#: src/protocols/irc/msgs.c:400
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:381
+#: src/protocols/irc/msgs.c:411
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: src/protocols/irc/msgs.c:384
+#: src/protocols/irc/msgs.c:414
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: src/protocols/irc/msgs.c:389
+#: src/protocols/irc/msgs.c:419
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: src/protocols/irc/msgs.c:409
+#: src/protocols/irc/msgs.c:439
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:495
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:496
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:592
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: src/protocols/irc/msgs.c:591
+#: src/protocols/irc/msgs.c:618
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: src/protocols/irc/msgs.c:670
+#: src/protocols/irc/msgs.c:697
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:671
+#: src/protocols/irc/msgs.c:698
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:719
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: src/protocols/irc/msgs.c:730
+#: src/protocols/irc/msgs.c:759
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: src/protocols/irc/msgs.c:732
+#: src/protocols/irc/msgs.c:761
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: src/protocols/irc/msgs.c:802
+#: src/protocols/irc/msgs.c:836
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: src/protocols/irc/msgs.c:803
+#: src/protocols/irc/msgs.c:837
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: src/protocols/irc/msgs.c:833
+#: src/protocols/irc/msgs.c:867
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: src/protocols/irc/parse.c:161
+#: src/protocols/irc/parse.c:165
 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:292
+#: src/protocols/irc/parse.c:296
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:297
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:297
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: src/protocols/irc/parse.c:396 src/protocols/oscar/oscar.c:577
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
@@ -4818,55 +5070,59 @@
 msgid "Server requires SSL for login"
 msgstr "Palvelin vaatiin SSL:n sisäänkirjautumista varten"
 
-#: src/protocols/jabber/auth.c:106 src/protocols/jabber/auth.c:181
+#: src/protocols/jabber/auth.c:93 src/protocols/jabber/auth.c:193
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+"Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
+
+#: src/protocols/jabber/auth.c:115 src/protocols/jabber/auth.c:198
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/jabber.c:462
+#: src/protocols/jabber/auth.c:179 src/protocols/jabber/jabber.c:469
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:354
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
 # XXX
-#: src/protocols/jabber/auth.c:432
+#: src/protocols/jabber/auth.c:446
 msgid "Bad Protocol"
 msgstr "Epäkelpo protokolla"
 
-#: src/protocols/jabber/auth.c:435
+#: src/protocols/jabber/auth.c:449
 msgid "Encryption Required"
 msgstr "Vaatii salauksen"
 
 # XXX edit of similar string
-#: src/protocols/jabber/auth.c:438
+#: src/protocols/jabber/auth.c:452
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: src/protocols/jabber/auth.c:441
+#: src/protocols/jabber/auth.c:455
 msgid "Invalid Mechanism"
 msgstr "Epäkelpo mekanismi"
 
-#: src/protocols/jabber/auth.c:443
+#: src/protocols/jabber/auth.c:457
 msgid "Invalid Realm"
 msgstr "Epäkelpo \"Realm\""
 
-#: src/protocols/jabber/auth.c:446
+#: src/protocols/jabber/auth.c:460
 msgid "Mechanism Too Weak"
 msgstr "Mekanismi liian heikko"
 
-#: src/protocols/jabber/auth.c:449 src/protocols/jabber/jabber.c:148
-#: src/protocols/jabber/jabber.c:903 src/protocols/jabber/jabber.c:953
-#: src/protocols/oscar/oscar.c:5553
+#: src/protocols/jabber/auth.c:463 src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:901 src/protocols/oscar/oscar.c:5710
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: src/protocols/jabber/auth.c:452
+#: src/protocols/jabber/auth.c:466
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: src/protocols/jabber/auth.c:454
+#: src/protocols/jabber/auth.c:468
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
@@ -4883,11 +5139,11 @@
 msgstr "Etunimi"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:628 src/protocols/yahoo/yahoo.c:2884
+#: src/protocols/jabber/jabber.c:632 src/protocols/yahoo/yahoo.c:2897
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:672
 msgid "URL"
 msgstr "URL"
 
@@ -4908,7 +5164,7 @@
 msgstr "Seutu"
 
 #: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:662
 msgid "Postal Code"
 msgstr "Postinumero"
 
@@ -4924,7 +5180,7 @@
 msgstr "Puhelin"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2893
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -4945,7 +5201,7 @@
 msgstr "Asema"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:4051
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -4961,17 +5217,16 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: src/protocols/jabber/buddy.c:551
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:940
-#: src/protocols/jabber/jabber.c:953
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:958
 msgid "Status"
 msgstr "Tila"
 
-#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1245
 msgid "Resource"
 msgstr "Lähde"
 
@@ -4979,8 +5234,8 @@
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:647
+#: src/protocols/oscar/oscar.c:4068 src/protocols/oscar/oscar.c:4084
 msgid "Address"
 msgstr "Osoite"
 
@@ -4997,31 +5252,36 @@
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:775
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber-profiili"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:883 src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:6415 src/protocols/yahoo/yahoo.c:2363
+msgid "Send File"
+msgstr "Lähetä tiedosto"
+
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: src/protocols/jabber/buddy.c:918
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
-#: src/protocols/jabber/buddy.c:926
+#: src/protocols/jabber/buddy.c:905
 msgid "Cancel Presence Notification"
 msgstr "Peruuta paikallaoloilmoitus"
 
-#: src/protocols/jabber/buddy.c:934
+#: src/protocols/jabber/buddy.c:913
 msgid "(Re-)Request authorization"
 msgstr "Pyydetään lupaa uudelleen"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:919
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:942
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -5033,166 +5293,182 @@
 msgid "_Handle:"
 msgstr "_chat-alias:"
 
-#: src/protocols/jabber/chat.c:161
+#: src/protocols/jabber/chat.c:164
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ei ole kelvollinen keskusteluhuoneen nimi."
 
-#: src/protocols/jabber/chat.c:162
+#: src/protocols/jabber/chat.c:165
 msgid "Invalid Room Name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-#: src/protocols/jabber/chat.c:167
+#: src/protocols/jabber/chat.c:170
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ei ole kelvollinen palvelinnimi."
 
-#: src/protocols/jabber/chat.c:168 src/protocols/jabber/chat.c:169
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 msgid "Invalid Server Name"
 msgstr "Palvelimen nimi ei kelpaa"
 
-#: src/protocols/jabber/chat.c:173
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ei ole kelvollinen chat-nimi (room handle)"
 
-#: src/protocols/jabber/chat.c:174 src/protocols/jabber/chat.c:175
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 msgid "Invalid Room Handle"
 msgstr "Chat-alias ei kelpaa"
 
-#: src/protocols/jabber/chat.c:336 src/protocols/jabber/chat.c:489
-#: src/protocols/jabber/message.c:299
+#: src/protocols/jabber/chat.c:334 src/protocols/jabber/chat.c:485
+#: src/protocols/jabber/message.c:280
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
 
-#: src/protocols/jabber/chat.c:339
+#: src/protocols/jabber/chat.c:337
 msgid "Configuration error"
 msgstr "Konfigurointivirhe."
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:348 src/protocols/jabber/chat.c:499
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida."
 
-#: src/protocols/jabber/chat.c:364
+#: src/protocols/jabber/chat.c:362
 msgid "Room Configuration Error"
 msgstr "Huoneen konfigurointivirhe"
 
-#: src/protocols/jabber/chat.c:365
+#: src/protocols/jabber/chat.c:363
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: src/protocols/jabber/chat.c:492
+#: src/protocols/jabber/chat.c:488
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:569
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa ei-MUC chat-huoneissa"
 
+#: src/protocols/jabber/chat.c:658
+msgid "Invalid Server"
+msgstr "Palvelin ei kelpaa"
+
+#: src/protocols/jabber/chat.c:695
+msgid "Enter a Conference Server"
+msgstr "Syötä konferenssipalvelin"
+
+#: src/protocols/jabber/chat.c:696
+msgid "Select a conference server to query"
+msgstr "Valitse konferenssipalvelin"
+
+#: src/protocols/jabber/chat.c:698
+msgid "Find Rooms"
+msgstr "Etsi huoneita"
+
 #: src/protocols/jabber/jabber.c:72
 msgid "Error initializing session"
 msgstr "Virhe session alustuksessa"
 
-#: src/protocols/jabber/jabber.c:123
+#: src/protocols/jabber/jabber.c:129
 msgid "Bad Format"
 msgstr "Väärä formaatti"
 
-#: src/protocols/jabber/jabber.c:125
+#: src/protocols/jabber/jabber.c:131
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: src/protocols/jabber/jabber.c:128
+#: src/protocols/jabber/jabber.c:134
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:136
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: src/protocols/jabber/jabber.c:132
+#: src/protocols/jabber/jabber.c:138
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: src/protocols/jabber/jabber.c:134
+#: src/protocols/jabber/jabber.c:140
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: src/protocols/jabber/jabber.c:136
+#: src/protocols/jabber/jabber.c:142
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: src/protocols/jabber/jabber.c:138
+#: src/protocols/jabber/jabber.c:144
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:146
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:148
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:150
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: src/protocols/jabber/jabber.c:146
+#: src/protocols/jabber/jabber.c:152
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: src/protocols/jabber/jabber.c:150
+#: src/protocols/jabber/jabber.c:156
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:158
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:160
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: src/protocols/jabber/jabber.c:156
+#: src/protocols/jabber/jabber.c:162
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: src/protocols/jabber/jabber.c:158
-msgid "See Other Host"
-msgstr "Etsi toinen isäntä"
-
-#: src/protocols/jabber/jabber.c:160
-msgid "System Shutdown"
-msgstr "Järjestelmän alasajo"
-
-#: src/protocols/jabber/jabber.c:162
-msgid "Undefined Condition"
-msgstr "Määrittelemätön tila"
-
 #: src/protocols/jabber/jabber.c:164
-msgid "Unsupported Encoding"
-msgstr "Koodausta ei tuettu"
+msgid "See Other Host"
+msgstr "Etsi toinen isäntä"
 
 #: src/protocols/jabber/jabber.c:166
+msgid "System Shutdown"
+msgstr "Järjestelmän alasajo"
+
+#: src/protocols/jabber/jabber.c:168
+msgid "Undefined Condition"
+msgstr "Määrittelemätön tila"
+
+#: src/protocols/jabber/jabber.c:170
+msgid "Unsupported Encoding"
+msgstr "Koodausta ei tuettu"
+
+#: src/protocols/jabber/jabber.c:172
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(Stanza type) ei tuettu"
 
-#: src/protocols/jabber/jabber.c:168
+#: src/protocols/jabber/jabber.c:174
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: src/protocols/jabber/jabber.c:170
+#: src/protocols/jabber/jabber.c:176
 msgid "XML Not Well Formed"
 msgstr "Huonostimuotoiltua XML:ää"
 
-#: src/protocols/jabber/jabber.c:172
+#: src/protocols/jabber/jabber.c:178
 msgid "Stream Error"
 msgstr "Datavirta(stream) -virhe"
 
-#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
+#: src/protocols/jabber/jabber.c:243 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:538 src/protocols/msn/msn.c:709
@@ -5202,164 +5478,189 @@
 #: 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:1680 src/protocols/msn/notification.c:1700
-#: 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
+#: src/protocols/msn/msn.c:1071 src/protocols/msn/msn.c:1104
+#: src/protocols/msn/msn.c:1125 src/protocols/msn/msn.c:1136
+#: src/protocols/msn/msn.c:1147 src/protocols/msn/msn.c:1171
+#: src/protocols/msn/msn.c:1183 src/protocols/msn/msn.c:1264
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
+#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1038
+#: src/protocols/trepia/trepia.c:1082 src/protocols/trepia/trepia.c:1181
+#: src/protocols/trepia/trepia.c:1237
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
+#: src/protocols/jabber/jabber.c:281 src/protocols/jabber/jabber.c:301
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: src/protocols/jabber/jabber.c:349
+#: src/protocols/jabber/jabber.c:355
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: src/protocols/jabber/jabber.c:387 src/protocols/jabber/jabber.c:717
+#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:721
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:415 src/protocols/jabber/jabber.c:744
+#: src/protocols/jabber/jabber.c:422 src/protocols/jabber/jabber.c:748
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: src/protocols/jabber/jabber.c:425 src/protocols/jabber/jabber.c:754
-#: src/protocols/trepia/trepia.c:1116
+#: src/protocols/jabber/jabber.c:432 src/protocols/jabber/jabber.c:758
+#: src/protocols/trepia/trepia.c:1121
 msgid "Unable to create socket"
 msgstr "Socketin luonti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:450
+#: src/protocols/jabber/jabber.c:457
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
+#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:465
+#: src/protocols/jabber/jabber.c:472
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "%s@%s:n rekisteröinti epäonnistui: %s"
 
-#: src/protocols/jabber/jabber.c:467 src/protocols/jabber/jabber.c:468
+#: src/protocols/jabber/jabber.c:474 src/protocols/jabber/jabber.c:475
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:580 src/protocols/jabber/jabber.c:581
+#: src/protocols/jabber/jabber.c:587 src/protocols/jabber/jabber.c:588
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: src/protocols/jabber/jabber.c:612 src/protocols/jabber/jabber.c:1050
+#: src/protocols/jabber/jabber.c:616 src/protocols/jabber/jabber.c:1074
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocols/jabber/jabber.c:623
+#: src/protocols/jabber/jabber.c:627
 msgid "E-Mail"
 msgstr "Sähköposti"
 
 #. State
-#: src/protocols/jabber/jabber.c:653 src/protocols/oscar/oscar.c:4019
-#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:657 src/protocols/oscar/oscar.c:4074
+#: src/protocols/oscar/oscar.c:4090 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/jabber.c:667
 msgid "Phone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:677
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/protocols/jabber/jabber.c:681
+#: src/protocols/jabber/jabber.c:685
 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:684 src/protocols/jabber/jabber.c:685
+#: src/protocols/jabber/jabber.c:688 src/protocols/jabber/jabber.c:689
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: src/protocols/jabber/jabber.c:803 src/protocols/msn/dispatch.c:212
+#: src/protocols/jabber/jabber.c:802 src/protocols/msn/dispatch.c:212
 #: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:693 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2073
+#: src/protocols/oscar/oscar.c:736 src/protocols/trepia/trepia.c:1115
+#: src/protocols/yahoo/yahoo.c:2084
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/protocols/jabber/jabber.c:807
+#: src/protocols/jabber/jabber.c:806
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:813
+#: src/protocols/jabber/jabber.c:812
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:823
+#: src/protocols/jabber/jabber.c:821
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:948 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/jabber.c:933
+msgid "Both"
+msgstr "molemmille"
+
+#: src/protocols/jabber/jabber.c:935
+msgid "From (To pending)"
+msgstr "vain sinulle (odottaa lupaa)"
+
+#: src/protocols/jabber/jabber.c:937
+msgid "From"
+msgstr "vain sinulle"
+
+#: src/protocols/jabber/jabber.c:940
+msgid "To"
+msgstr "vain sinulta"
+
+#: src/protocols/jabber/jabber.c:942
+msgid "None (To pending)"
+msgstr "Ei mitään (odottaa lupaa)"
+
+#: src/protocols/jabber/jabber.c:946
+msgid "Subscription"
+msgstr "Tilailmoitus"
+
+#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jabber.c:1025
+#: src/protocols/jabber/presence.c:327
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jutil.c:101
-#: src/protocols/jabber/presence.c:82
+#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jutil.c:102
+#: src/protocols/jabber/presence.c:59 src/protocols/jabber/presence.c:110
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jutil.c:104
-#: src/protocols/jabber/presence.c:87
+#: src/protocols/jabber/jabber.c:989 src/protocols/jabber/jutil.c:105
+#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:115
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:967 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2836
-#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6147
+#: src/protocols/jabber/jabber.c:990 src/protocols/jabber/jutil.c:108
+#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
+#: src/protocols/oscar/oscar.c:2873 src/protocols/oscar/oscar.c:4662
+#: src/protocols/oscar/oscar.c:6316
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jabber.c:1007
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:1008
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: src/protocols/jabber/jabber.c:994
+#: src/protocols/jabber/jabber.c:1018
 #, c-format
 msgid "Error changing password: %s"
 msgstr "Salasanan vaihdossa tapahtui virhe: %s"
 
-#: src/protocols/jabber/jabber.c:998
+#: src/protocols/jabber/jabber.c:1022
 msgid "Unknown error occurred changing password"
 msgstr "Tuntematon virhe vaihdettaessa salasanaa"
 
-#: src/protocols/jabber/jabber.c:1055
+#: src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
 # XXX minor editing of existing string
-#: src/protocols/jabber/jabber.c:1060 src/protocols/jabber/jabber.c:1061
+#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasanaa"
 
-#: src/protocols/jabber/jabber.c:1061
+#: src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: src/protocols/jabber/jabber.c:1073 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1096 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
@@ -5374,64 +5675,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1221 src/protocols/jabber/jabber.c:1223
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1248
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1253
 msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1258
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
+
+#: src/protocols/jabber/jabber.c:1267
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: src/protocols/jabber/message.c:125
+#: src/protocols/jabber/jabber.c:1284
+msgid "Hide Operating System"
+msgstr "Piilota käyttöjärjestelmä"
+
+#: src/protocols/jabber/message.c:106
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: src/protocols/jabber/message.c:187
+#: src/protocols/jabber/message.c:168
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: src/protocols/jabber/message.c:189
+#: src/protocols/jabber/message.c:170
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: src/protocols/jabber/message.c:236
+#: src/protocols/jabber/message.c:217
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: src/protocols/jabber/message.c:239
+#: src/protocols/jabber/message.c:220
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Virhe XML-parsinnassa"
 
-#: src/protocols/jabber/presence.c:178
+#: src/protocols/jabber/presence.c:222
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/presence.c:183
+#: src/protocols/jabber/presence.c:227
 #, 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:244 src/protocols/jabber/presence.c:245
+#: src/protocols/jabber/presence.c:278 src/protocols/jabber/presence.c:279
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: src/protocols/jabber/presence.c:246
+#: src/protocols/jabber/presence.c:280
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5439,45 +5748,44 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: src/protocols/jabber/presence.c:248
+#: src/protocols/jabber/presence.c:282
 msgid "Configure Room"
 msgstr "Aseta huoneen asetukset"
 
-#: src/protocols/jabber/presence.c:250
+#: src/protocols/jabber/presence.c:284
 msgid "Accept Defaults"
 msgstr "Hyväksy oletusasetukset"
 
-#: src/protocols/jabber/presence.c:283 src/protocols/oscar/oscar.c:2947
+#: src/protocols/jabber/presence.c:317 src/protocols/oscar/oscar.c:2984
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/presence.c:289
+#: src/protocols/jabber/presence.c:323
 msgid "Unable to join chat"
 msgstr "Ei voitu liittyä chattiin"
 
-#: src/protocols/jabber/si.c:233
+#: src/protocols/jabber/si.c:309
 #, c-format
 msgid "Could not send %s to %s, protocol not supported."
 msgstr "Ei voitu lähettää %s %s:lle, protokollaa ei tuettu."
 
-#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
+#: src/protocols/jabber/si.c:310 src/protocols/jabber/si.c:311
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
 msgid "Unable to request USR\n"
 msgstr "Ei kyetty pyytämään USR:ä\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
 msgid "Unable to login using MD5"
 msgstr "Ei kyetty kirjautumaan sisään MD5:llä"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
 msgid "Unable to send USR"
 msgstr "USR:ää ei voitu lähettää"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
 msgid "Requesting to send password"
 msgstr "Pyydetään salasanan lähettämistä"
 
@@ -5486,16 +5794,16 @@
 msgid "Protocol version not supported"
 msgstr "Protokollan versiota ei tuettu"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
 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:801
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
 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:1927
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
 msgid "Got invalid XFR"
 msgstr "Epäkelpo XFR vastaanotettu"
 
@@ -5507,16 +5815,16 @@
 msgid "Unable to parse message."
 msgstr "Viestin käsittely epäonnistui"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
-#: src/protocols/msn/notification.c:2187
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:1811
 msgid "Unable to write to server"
 msgstr "Palvelimelle ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
 msgid "Syncing with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
 msgid "Error reading from server"
 msgstr "Virhe luettaessa palvelimelta"
 
@@ -5616,113 +5924,121 @@
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
 #: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr "Sisäinen palvelinvirhe"
+msgid "Service Temporarily Unavailable"
+msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
 #: src/protocols/msn/error.c:117
+msgid "Command disabled"
+msgstr "Komento poistettu käytöstä"
+
+#: src/protocols/msn/error.c:120
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:123
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:126
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:130
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
 
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
+#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:201
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:136
 msgid "Peer Notification server down"
 msgstr "Vastapään tiedottajapalvelin ei toiminnassa"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:139
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:143
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:150
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:154
 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:636
+#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:160
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:163
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:166
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
 msgid "Not expected"
 msgstr "Odottamaton"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:172
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:180
 msgid "Friendly name changes too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:189
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
+#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1117
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:196
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:204
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:208
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:212
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:215
+msgid "Bad ticket"
+msgstr "Bad ticket"
+
+#: src/protocols/msn/error.c:219
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tuntematon virhekoodi %d"
@@ -5779,7 +6095,7 @@
 msgid "Page"
 msgstr "Lähetä"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2314
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
@@ -5790,31 +6106,31 @@
 msgstr "Poissa tietokoneelta"
 
 #: 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
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2182
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2615
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
 #: 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
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2509 src/protocols/yahoo/yahoo.c:2616
 msgid "Busy"
 msgstr "Varattu"
 
 #: 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
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2192
+#: src/protocols/yahoo/yahoo.c:2517 src/protocols/yahoo/yahoo.c:2620
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
 #: 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
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2196
+#: src/protocols/yahoo/yahoo.c:2521 src/protocols/yahoo/yahoo.c:2622
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
 #: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/zephyr/zephyr.c:960 src/protocols/zephyr/zephyr.c:975
 msgid "Hidden"
 msgstr "Piilotettu"
 
@@ -5861,100 +6177,100 @@
 #: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your allow list."
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
 msgstr ""
 "MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit %"
 "s@hotmail.com. Muutoksia sallitut-listaan ei tehty."
 
 # XXX
 #: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
-msgid "Invalid MSN screenname"
+msgid "Invalid MSN screen name"
 msgstr "Epäkelpo MSN-näyttönimi"
 
 #: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your block list."
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
 msgstr ""
 "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:1287 src/protocols/yahoo/yahoo.c:2786
+#: src/protocols/msn/msn.c:1290 src/protocols/yahoo/yahoo.c:2799
 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:1357 src/protocols/oscar/oscar.c:4001
+#: src/protocols/msn/msn.c:1360 src/protocols/oscar/oscar.c:4056
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2909
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
+#: src/protocols/msn/msn.c:1367 src/protocols/oscar/oscar.c:4042
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:2917
 msgid "Gender"
 msgstr "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/msn/msn.c:1375 src/protocols/yahoo/yahoo.c:2913
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
+#: src/protocols/msn/msn.c:1382 src/protocols/yahoo/yahoo.c:2905
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/msn/msn.c:1390 src/protocols/yahoo/yahoo.c:2921
 msgid "Occupation"
 msgstr "Ammatti"
 
 # NOTE actual string used by msn itself, lit. "Self description"
-#: 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
+#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1420 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1456
+#: src/protocols/msn/msn.c:1463
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/msn/msn.c:1482
+#: src/protocols/msn/msn.c:1472 src/protocols/msn/msn.c:1478
+#: src/protocols/msn/msn.c:1485
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/msn/msn.c:1494 src/protocols/msn/msn.c:1500
+#: src/protocols/yahoo/yahoo.c:2956
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/msn/msn.c:1508 src/protocols/yahoo/yahoo.c:2992
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1519 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1541 src/protocols/yahoo/yahoo.c:3007
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
+#: src/protocols/msn/msn.c:1543 src/protocols/yahoo/yahoo.c:3009
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
@@ -5969,92 +6285,80 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
+#: src/protocols/msn/msn.c:1641 src/protocols/msn/msn.c:1643
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
+#: src/protocols/msn/msn.c:1660 src/protocols/trepia/trepia.c:1345
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1670
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: src/protocols/msn/notification.c:247
-#, c-format
-msgid "MSN Error: %s\n"
-msgstr "MSN-virhe: %s\n"
-
-#: src/protocols/msn/notification.c:322
+#: src/protocols/msn/nexus.c:56
 msgid "Unable to connect to server"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
 msgid "Unable to write to MSN Nexus server."
 msgstr "MSN:n Nexus-palvelimelle ei kyetty kirjoittamaan."
 
-#: 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:406
+#: src/protocols/msn/nexus.c:147
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus-palvelin palautti virheellistä edelleenohjaustietoa."
 
-#: src/protocols/msn/notification.c:460
+#: src/protocols/msn/nexus.c:204
 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:572
-msgid "MSN Nexus server returned invalid information."
-msgstr "MSN Nexus-palvelin palautti virheellistä tietoa."
-
-#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:215
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN-virhe: %s\n"
+
+#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: src/protocols/msn/notification.c:711
-msgid "Unable to connect to passport server"
-msgstr "Passport-palvelimeen ei kyetty muodostamaan yhteyttä"
-
-#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
-#: src/protocols/oscar/oscar.c:1361
+#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
+#: src/protocols/oscar/oscar.c:1404
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: src/protocols/msn/notification.c:743
+#: src/protocols/msn/notification.c:367
 msgid "Unable to send password"
 msgstr "Ei kyetty lähettämään salasanaa"
 
-#: src/protocols/msn/notification.c:779
+#: src/protocols/msn/notification.c:403
 msgid "Protocol not supported"
 msgstr "Protokollaa ei tuettu"
 
-#: src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:445
 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:826
+#: src/protocols/msn/notification.c:450
 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:953
+#: src/protocols/msn/notification.c:577
 #, 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:1278 src/protocols/msn/notification.c:1445
+#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
 #, 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:1972
+#: src/protocols/msn/notification.c:1596
 msgid "Unable to transfer to notification server"
 msgstr "Tiedonsiirto ei onnistunut ilmoituspalvelimelle"
 
-#: src/protocols/msn/notification.c:2128
+#: src/protocols/msn/notification.c:1752
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6146,7 +6450,11 @@
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
+#: src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "Hae tiedot"
+
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5351
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "_Ryhmä"
@@ -6162,181 +6470,182 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to host"
 msgstr "Nopeus isäntään"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:182
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:184
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:185
 msgid "Service not defined"
 msgstr "Palvelua ei määritelty"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:186
 msgid "Obsolete SNAC"
 msgstr "Vanhentunut SNAC"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:187
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkoisännässä"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:188
 msgid "Not supported by client"
 msgstr "Ei tuettu asiakasohjelmassa"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:189
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:190
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:191
 msgid "Responses lost"
 msgstr "Vastaukset menetetty"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:192
 msgid "Request denied"
 msgstr "Pyyntö evätty"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:193
 msgid "Busted SNAC payload"
 msgstr "Rikkoutunut SNAC-data"
 
-#: src/protocols/oscar/oscar.c:193
-msgid "Insufficient rights"
-msgstr "Liian vähän oikeuksia"
-
 #: src/protocols/oscar/oscar.c:194
-msgid "In local permit/deny"
-msgstr ""
+msgid "Insufficient rights"
+msgstr "Liian vähän oikeuksia"
 
 #: src/protocols/oscar/oscar.c:195
+msgid "In local permit/deny"
+msgstr "Paikallisessa sallittujen/estettyjen listassa"
+
+#: src/protocols/oscar/oscar.c:196
 msgid "Too evil (sender)"
 msgstr "Lähettäjä liian paha(evil)"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:197
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:198
 msgid "User temporarily unavailable"
 msgstr "Käyttäjä ei tilapäisesti saatavilla."
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:199
 msgid "No match"
 msgstr "Ei tuloksia"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:200
 msgid "List overflow"
 msgstr "Lista-ylivuoto"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "Pyyntö ei ole yksiselitteinen"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:202
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:517
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:519
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:589 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:605
 msgid "Chat is currently unavailable"
 msgstr "Chat ei ole parhaillaan käytettävissä"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:732
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:686
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:720
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
+#: src/protocols/oscar/oscar.c:821 src/protocols/oscar/oscar.c:1209
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:829
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
-#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
-#: src/protocols/oscar/oscar.c:871 src/protocols/yahoo/yahoo_filexfer.c:204
-#: src/protocols/yahoo/yahoo_filexfer.c:212
+#: src/protocols/oscar/oscar.c:893 src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/yahoo/yahoo_filexfer.c:208
+#: src/protocols/yahoo/yahoo_filexfer.c:217
 msgid "File Transfer Aborted"
 msgstr "Tiedostosiirto keskeytetty"
 
-#: src/protocols/oscar/oscar.c:854
+#: src/protocols/oscar/oscar.c:894
 msgid "Unable to establish listener socket."
 msgstr "Socketin muodostus epäonnistui."
 
 # XXX minor but not completely trivial editing of fuzzy text
 # NOTE "file descriptor" translation from ATK sanasto
-#: src/protocols/oscar/oscar.c:867 src/protocols/yahoo/yahoo_filexfer.c:205
-#: src/protocols/yahoo/yahoo_filexfer.c:213
+#: src/protocols/oscar/oscar.c:907 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:912
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1094 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:1057
+#: src/protocols/oscar/oscar.c:1099
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1103
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1108
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6346,21 +6655,21 @@
 "pidempään."
 
 # NOTE source: 0.59.8 (+ "%s")
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1113
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä %s"
 
-#: src/protocols/oscar/oscar.c:1103
+#: src/protocols/oscar/oscar.c:1145
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:1173
+#: src/protocols/oscar/oscar.c:1216
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1251 src/protocols/oscar/oscar.c:1281
+#: src/protocols/oscar/oscar.c:1369
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6369,29 +6678,29 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-protokollaa "
 "kunnes tämä on korjattu. Tarkista päivitykset: %s "
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1254 src/protocols/oscar/oscar.c:1284
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ei saanut kelvollista AIM:n sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1372
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
+#: src/protocols/oscar/oscar.c:1946 src/protocols/oscar/oscar.c:5811
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
+#: src/protocols/oscar/oscar.c:2275 src/protocols/oscar/oscar.c:2297
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:2408
+#: src/protocols/oscar/oscar.c:2444
 #, 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:2411
+#: src/protocols/oscar/oscar.c:2447
 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 "
@@ -6402,23 +6711,23 @@
 "yksityisyysriskinä."
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:2452 src/protocols/oscar/oscar.c:6193
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:2443
+#: src/protocols/oscar/oscar.c:2479
 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:2451
+#: src/protocols/oscar/oscar.c:2487
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2488
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2517
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6427,23 +6736,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:2485 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2522 src/protocols/oscar/oscar.c:2524
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:2523 src/protocols/oscar/oscar.c:2525
-#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2608
-#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2984
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5134
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:2560 src/protocols/oscar/oscar.c:2562
+#: src/protocols/oscar/oscar.c:2569 src/protocols/oscar/oscar.c:2645
+#: src/protocols/oscar/oscar.c:2665 src/protocols/oscar/oscar.c:3021
+#: src/protocols/oscar/oscar.c:3081 src/protocols/oscar/oscar.c:5272
+#: src/protocols/oscar/oscar.c:5318
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2568
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2645
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6452,11 +6761,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:2653 src/protocols/oscar/oscar.c:5278
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2665
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6467,17 +6776,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2666
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2673
 #, 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:2644
+#: src/protocols/oscar/oscar.c:2681
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6490,7 +6799,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2652
+#: src/protocols/oscar/oscar.c:2689
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6503,7 +6812,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2660
+#: src/protocols/oscar/oscar.c:2697
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6516,36 +6825,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2681
+#: src/protocols/oscar/oscar.c:2718
 #, 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:2687
+#: src/protocols/oscar/oscar.c:2724
 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:2691
+#: src/protocols/oscar/oscar.c:2728
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2810
 #, 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:2782
+#: src/protocols/oscar/oscar.c:2819
 #, 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:2791
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6555,7 +6864,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:2800
+#: src/protocols/oscar/oscar.c:2837
 #, 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."
@@ -6563,14 +6872,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:2809
+#: src/protocols/oscar/oscar.c:2846
 #, 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:2818
+#: src/protocols/oscar/oscar.c:2855
 #, 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."
@@ -6578,164 +6887,171 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4608
-#: src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:2871 src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:6319
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:2875 src/protocols/oscar/oscar.c:4665
+#: src/protocols/oscar/oscar.c:6317
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
-#: src/protocols/oscar/oscar.c:6149
+#: src/protocols/oscar/oscar.c:2877 src/protocols/oscar/oscar.c:4668
+#: src/protocols/oscar/oscar.c:6318
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:2881
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2924
 #, 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:2946
+#: src/protocols/oscar/oscar.c:2983
 #, 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:2982
+#: src/protocols/oscar/oscar.c:3019
 #, 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:3078
 #, 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:3117
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3120
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:3123
+msgid "Chat"
+msgstr "Chat"
+
+#: src/protocols/oscar/oscar.c:3126 src/protocols/oscar/oscar.c:6423
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6241
-#: src/protocols/yahoo/yahoo.c:2350
-msgid "Send File"
-msgstr "Lähetä tiedosto"
-
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3133
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3136
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3139
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3142
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3145
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3148
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3151
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3154
 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:3157
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3160
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3163
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3166
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3169
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3172
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3176
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3179
+msgid "Live Video"
+msgstr "Video"
+
+#: src/protocols/oscar/oscar.c:3182
+msgid "Camera"
+msgstr "Kamera"
+
+#: src/protocols/oscar/oscar.c:3211
 #, 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:3168
+#: src/protocols/oscar/oscar.c:3212
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Varoitustaso: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3215
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Kirjautuneena: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3175
+#: src/protocols/oscar/oscar.c:3219
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Rekisteröitynyt: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3224
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Jouten: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3227
 msgid "Idle: <b>Active</b>"
 msgstr "Jouten: <b>Aktiivinen</b>"
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3270
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
-#: src/protocols/oscar/oscar.c:3616
+#: src/protocols/oscar/oscar.c:3671
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:3617
+#: src/protocols/oscar/oscar.c:3672
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6744,119 +7060,119 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3735
 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:3682
+#: src/protocols/oscar/oscar.c:3737
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3768
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:4028 src/protocols/oscar/oscar.c:4034
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4039
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4042 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4042 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4059
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4062
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4011
+#: src/protocols/oscar/oscar.c:4066
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4077 src/protocols/oscar/oscar.c:4093
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4082
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4098
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4100
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4048
+#: src/protocols/oscar/oscar.c:4103
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4106
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4054
+#: src/protocols/oscar/oscar.c:4109
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4060
+#: src/protocols/oscar/oscar.c:4115
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4110
+#: src/protocols/oscar/oscar.c:4165
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4131
-#, c-format
-msgid "The following screennames are associated with %s"
+#: src/protocols/oscar/oscar.c:4186
+#, c-format
+msgid "The following screen names are associated with %s"
 msgstr "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4190
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4207
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4228
 #, 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:4175
+#: src/protocols/oscar/oscar.c:4230
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4258
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4261
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6865,7 +7181,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4264
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6874,7 +7190,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:4212
+#: src/protocols/oscar/oscar.c:4267
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6883,16 +7199,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4215
+#: src/protocols/oscar/oscar.c:4270
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
-msgstr ""
-"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:4218
+msgstr "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle on jo käsittelemätön muutospyyntö."
+
+#: src/protocols/oscar/oscar.c:4273
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6901,7 +7215,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:4221
+#: src/protocols/oscar/oscar.c:4276
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6910,12 +7224,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: src/protocols/oscar/oscar.c:4224
+#: src/protocols/oscar/oscar.c:4279
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4289
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6924,20 +7238,20 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
+#: src/protocols/oscar/oscar.c:4290 src/protocols/oscar/oscar.c:4297
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4295
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4527
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4528
 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 "
@@ -6947,7 +7261,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4555
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6960,15 +7274,19 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: src/protocols/oscar/oscar.c:4505
+#: src/protocols/oscar/oscar.c:4560
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:6323
+msgid "Visible"
+msgstr "Näkyvä"
+
+#: src/protocols/oscar/oscar.c:4587
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:4523
+#: src/protocols/oscar/oscar.c:4588
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6978,7 +7296,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4628
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6992,15 +7310,31 @@
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
 # XXX
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4633
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4782
+#: src/protocols/oscar/oscar.c:4726
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+"Ei voitu lisätä tuttavaa %s koska näyttönimi on virheellinen. Näyttönimen \n"
+"tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
+"välilyöntejä tai sisältää vain numeroita."
+
+#: src/protocols/oscar/oscar.c:4727 src/protocols/oscar/oscar.c:5139
+#: src/protocols/oscar/oscar.c:5152
+msgid "Unable To Add"
+msgstr "Lisääminen epäonnistui"
+
+#: src/protocols/oscar/oscar.c:4863
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:4783
+#: src/protocols/oscar/oscar.c:4864
 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 "
@@ -7009,12 +7343,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
-#: src/protocols/oscar/oscar.c:4881
+#: src/protocols/oscar/oscar.c:5040 src/protocols/oscar/oscar.c:5041
+#: src/protocols/oscar/oscar.c:5046 src/protocols/oscar/oscar.c:5196
+#: src/protocols/oscar/oscar.c:5197 src/protocols/oscar/oscar.c:5202
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5138
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7024,15 +7359,11 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5138 src/protocols/oscar/oscar.c:5151
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: 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:5060
+#: src/protocols/oscar/oscar.c:5151
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7042,7 +7373,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:5095
+#: src/protocols/oscar/oscar.c:5233
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7052,11 +7383,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:5101
+#: src/protocols/oscar/oscar.c:5239
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5272
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7066,17 +7397,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5314
 #, 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:5177
+#: src/protocols/oscar/oscar.c:5315
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:5318
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7087,56 +7418,56 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5181
+#: src/protocols/oscar/oscar.c:5319
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5356 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5611
 msgid "<b>Status:</b> "
 msgstr "<b>Tila:</b> "
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5623
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP-osoite:</b> "
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5631
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Kyvyt:</b> "
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5640
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>Tuttavakommentti:</b>"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5649
 msgid "<b>Available:</b> "
 msgstr "<b>Tavoitettavissa:</b> "
 
-#: src/protocols/oscar/oscar.c:5512
+#: src/protocols/oscar/oscar.c:5669
 msgid "<b>Away Message:</b> "
 msgstr "<b>Poissaoloviesti:</b> "
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:5678
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Tila:</b> Ei valtuutettu"
 
-#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
+#: src/protocols/oscar/oscar.c:5712 src/protocols/yahoo/yahoo.c:2204
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:6173
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
 
-#: src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6186
 #, 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:6019
+#: src/protocols/oscar/oscar.c:6189
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7144,53 +7475,53 @@
 "Koska tämä paljastaa IP-osoitteesi se voidaan ajatella yksityisyysriskinä. "
 "Haluatko jatkaa? "
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6368
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6384
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6218
+#: src/protocols/oscar/oscar.c:6392
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6407
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6262
+#: src/protocols/oscar/oscar.c:6436
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6457
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Screenname formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6458
+msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: src/protocols/oscar/oscar.c:6290
-msgid "New screenname formatting:"
+#: src/protocols/oscar/oscar.c:6464
+msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6513
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6557
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6386
+#: src/protocols/oscar/oscar.c:6560
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/oscar/oscar.c:6561
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7199,72 +7530,68 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6575
 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:6402
+#: src/protocols/oscar/oscar.c:6576
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6403
+#: src/protocols/oscar/oscar.c:6577
 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:6406
-msgid "Search"
-msgstr "Etsi"
-
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6594
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6595
 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:6492
+#: src/protocols/oscar/oscar.c:6666
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6673
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6680
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6687
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:6521
+#: src/protocols/oscar/oscar.c:6695
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:6532
-msgid "Format Screenname..."
+#: src/protocols/oscar/oscar.c:6706
+msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6712
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:6544
+#: src/protocols/oscar/oscar.c:6718
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:6550
+#: src/protocols/oscar/oscar.c:6724
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6733
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6741
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
@@ -7279,15 +7606,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
+#: src/protocols/oscar/oscar.c:6862 src/protocols/oscar/oscar.c:6864
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6881
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6886
 msgid "Auth port"
 msgstr "portti"
 
@@ -7498,15 +7825,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2178
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2182
 msgid "TOC port"
 msgstr "TOC-portti"
 
@@ -7576,7 +7903,7 @@
 msgid "Local Users"
 msgstr "Paikalliset käyttäjät"
 
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1078
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
@@ -7591,11 +7918,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
+#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokollaliitännäinen"
 
-#: src/protocols/yahoo/yahoo.c:297
+#: src/protocols/yahoo/yahoo.c:305
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -7603,23 +7930,23 @@
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai "
 "laitteesta."
 
-#: src/protocols/yahoo/yahoo.c:730
+#: src/protocols/yahoo/yahoo.c:738
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: src/protocols/yahoo/yahoo.c:772
+#: src/protocols/yahoo/yahoo.c:780
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! järjestelmäviesti käyttäjälle %s:"
 
-#: src/protocols/yahoo/yahoo.c:838
+#: src/protocols/yahoo/yahoo.c:846
 #, 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:841
+#: src/protocols/yahoo/yahoo.c:849
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7628,11 +7955,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: src/protocols/yahoo/yahoo.c:844
+#: src/protocols/yahoo/yahoo.c:852
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/yahoo/yahoo.c:1506
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7644,11 +7971,11 @@
 "päivitykset osoitteesta: %s."
 
 # NOTE edit of "Authentication failed"
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1509
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: src/protocols/yahoo/yahoo.c:1570
+#: src/protocols/yahoo/yahoo.c:1582
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7658,100 +7985,101 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1585
 msgid "Ignore buddy?"
 msgstr "Älä välitä?"
 
-#: src/protocols/yahoo/yahoo.c:1606
+#: src/protocols/yahoo/yahoo.c:1618
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: src/protocols/yahoo/yahoo.c:1609
+#: src/protocols/yahoo/yahoo.c:1621
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: src/protocols/yahoo/yahoo.c:1612
+#: src/protocols/yahoo/yahoo.c:1624
 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
+#: src/protocols/yahoo/yahoo.c:1627
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Tuntematon virhekoodi %d."
 
-#: src/protocols/yahoo/yahoo.c:1672
+#: src/protocols/yahoo/yahoo.c:1684
 #, 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:1674
+#: src/protocols/yahoo/yahoo.c:1686
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
+#: src/protocols/yahoo/yahoo.c:1796 src/protocols/yahoo/yahoo.c:1927
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo.c:2059
+#: src/protocols/yahoo/yahoo.c:2102 src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1398
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
-#: src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2186 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo.c:2617
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2188 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/yahoo/yahoo.c:2618
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2190 src/protocols/yahoo/yahoo.c:2515
+#: src/protocols/yahoo/yahoo.c:2619
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2194 src/protocols/yahoo/yahoo.c:2519
+#: src/protocols/yahoo/yahoo.c:2621
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
-#: src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2198 src/protocols/yahoo/yahoo.c:2523
+#: src/protocols/yahoo/yahoo.c:2623
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2262 src/protocols/yahoo/yahoo.c:2294
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2337
+#: src/protocols/yahoo/yahoo.c:2350
 msgid "Join in Chat"
 msgstr "Liity chattiin"
 
-#: src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2356
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2396
+#: src/protocols/yahoo/yahoo.c:2409
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/yahoo/yahoo.c:2417
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään chatissä?"
 
-#: src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/yahoo/yahoo.c:2428
 msgid "Activate ID..."
 msgstr "Aktivoi ID..."
 
-#: src/protocols/yahoo/yahoo.c:2421
+#: src/protocols/yahoo/yahoo.c:2434
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
-#: src/protocols/yahoo/yahoo.c:2803
+#: src/protocols/yahoo/yahoo.c:2816
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7759,7 +8087,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:2804 src/protocols/yahoo/yahoo.c:2827
+#: src/protocols/yahoo/yahoo.c:2817 src/protocols/yahoo/yahoo.c:2840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7767,44 +8095,44 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi<br>"
 
-#: src/protocols/yahoo/yahoo.c:2826
+#: src/protocols/yahoo/yahoo.c:2839
 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:2874 src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/yahoo/yahoo.c:2887 src/protocols/yahoo/yahoo.c:2888
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 # NOTE from msn
-#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:2932 src/protocols/yahoo/yahoo.c:2935
+#: src/protocols/yahoo/yahoo.c:2938
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:2947 src/protocols/yahoo/yahoo.c:2950
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: src/protocols/yahoo/yahoo.c:2951
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2976
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/yahoo/yahoo.c:2980
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/yahoo/yahoo.c:2982
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2988
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
@@ -7819,83 +8147,120 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
+#: src/protocols/yahoo/yahoo.c:3194 src/protocols/yahoo/yahoo.c:3196
 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:3194
+#: src/protocols/yahoo/yahoo.c:3213
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3197
+#: src/protocols/yahoo/yahoo.c:3216
 msgid "Pager port"
 msgstr "Portti"
 
 # NOTE source: gnomeicu
-#: src/protocols/yahoo/yahoo.c:3200
+#: src/protocols/yahoo/yahoo.c:3219
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: src/protocols/yahoo/yahoo.c:3203
+#: src/protocols/yahoo/yahoo.c:3222
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3225
+msgid "Chat Room List Url"
+msgstr "Chathuonelista Url"
+
+#: src/protocols/yahoo/yahoo_filexfer.c:200
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+msgstr ""
+"Gaim ei voi lähettää Yahoo!-protokollan kautta tiedostoja jotka ovat "
+"suurempia kuin yksi megatavu (1 048 576 tavua)."
+
+#: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Failed to join chat"
 msgstr "Chattiin liittyminen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr "Ehkä huone on täynnä?"
 
-#: src/protocols/yahoo/yahoochat.c:558
+#: src/protocols/yahoo/yahoochat.c:562
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan chat-huoneeseen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:559
+#: src/protocols/yahoo/yahoochat.c:563
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole chatissä?"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/yahoo/yahoochat.c:1278
+msgid "Unable to connect"
+msgstr "Yhteyden muodostaminen epäonnistui"
+
+#: src/protocols/yahoo/yahoochat.c:1278
+msgid "Fetching the room list failed."
+msgstr "Huonelistan haku epäonnistui."
+
+#: src/protocols/yahoo/yahoochat.c:1323
+msgid "Voices"
+msgstr "Äänet"
+
+#: src/protocols/yahoo/yahoochat.c:1326
+msgid "Webcams"
+msgstr "Web-kamerat"
+
+#: src/protocols/yahoo/yahoochat.c:1337 src/protocols/yahoo/yahoochat.c:1398
+msgid "Unable to fetch room list."
+msgstr "Huonelistaa ei voida hakea."
+
+#: src/protocols/yahoo/yahoochat.c:1391
+msgid "User Rooms"
+msgstr "Käyttäjän Huoneet"
+
+#: src/protocols/zephyr/zephyr.c:366
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:368
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:370
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
 # TODO
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:374
 #, c-format
 msgid "<br>At %s since %s"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+msgstr "<br>Paikassa: %s saapunut: %s"
+
+# Context unclear.
+#: src/protocols/zephyr/zephyr.c:632 src/protocols/zephyr/zephyr.c:633
 msgid "Anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:609
+msgstr "Kuka tahansa"
+
+#: src/protocols/zephyr/zephyr.c:659
 msgid "Already logged in with Zephyr"
 msgstr "Zephyriin jo kirjauduttu"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:660
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7903,19 +8268,19 @@
 "Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin yhtä "
 "tiliä."
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:945
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:908
+#: src/protocols/zephyr/zephyr.c:985
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:913
+#: src/protocols/zephyr/zephyr.c:990
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:995
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
@@ -7930,26 +8295,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
+#: src/protocols/zephyr/zephyr.c:1145 src/protocols/zephyr/zephyr.c:1147
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
+#: src/protocols/zephyr/zephyr.c:1164
+msgid "Export to .anyone"
+msgstr "Vie tiedostoon .anyone"
+
+#: src/protocols/zephyr/zephyr.c:1167
+msgid "Export to .zephyr.subs"
+msgstr "Vie tiedostoon .zephyr.subs"
+
+# Dont know really what is the context so translation could be wrong.
+#: src/protocols/zephyr/zephyr.c:1170
+msgid "Exposure"
+msgstr "Altistus"
+
 #. Forbidden
-#: src/proxy.c:1014
+#: src/proxy.c:954
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "Pääsy evätty: proxy-palvelin estää portin 80 tunneloinnin."
 
-#: src/proxy.c:1016
+#: src/proxy.c:956
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy-yhteysvirhe %d"
 
 # XXX relatively minor editing
-#: src/proxy.c:1736
+#: src/proxy.c:1695
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välityspalvelinvalinnat"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1695
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7957,43 +8335,43 @@
 "Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle. "
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:189
 msgid "Custom"
 msgstr "Oma"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1028
+#: src/request.h:1052
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:948
+#: src/server.c:958
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d viesti)"
 msgstr[1] "(%d viestiä)"
 
-#: src/server.c:961
+#: src/server.c:971
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1158 src/server.c:1168
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1185 src/server.c:1193
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/server.c:1227
+#: src/server.c:1240
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8002,11 +8380,11 @@
 "Tiliä %s on juuri varoittanut %s.\n"
 "Uusi varoitustasosi on %d%%"
 
-#: src/server.c:1230
+#: src/server.c:1243
 msgid "an anonymous person"
 msgstr "nimetön käyttäjä"
 
-#: src/server.c:1333
+#: src/server.c:1346
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8015,75 +8393,102 @@
 "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 "%s"
 
-#: src/server.c:1337
+#: src/server.c:1350
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 
-#: src/server.c:1343
+#: src/server.c:1356
 msgid "Accept chat invitation?"
 msgstr "Hyväksy kutsu?"
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr "Piipahdin hetkeksi ulos!"
 
 # XXX consistency
-#: src/stock.c:83
+#: src/stock.c:85
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: src/stock.c:84
+#: src/stock.c:86
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
-#: src/util.c:1892
+#: src/util.c:1855
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: src/util.c:1895
+#: src/util.c:1858
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/util.c:1926 src/util.c:1931 src/util.c:1936 src/util.c:1939
+#: src/util.c:1889 src/util.c:1894 src/util.c:1899 src/util.c:1902
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: src/util.c:1927 src/util.c:1931 src/util.c:1945 src/util.c:1947
+#: src/util.c:1890 src/util.c:1894 src/util.c:1908 src/util.c:1910
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: src/util.c:1927 src/util.c:1936 src/util.c:1945 src/util.c:1950
+#: src/util.c:1890 src/util.c:1899 src/util.c:1908 src/util.c:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:2282
+#: src/util.c:2245
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
-#: src/win32/win32dep.c:271
+#: src/win32/win32dep.c:272
 msgid "Moving Gaim Settings.."
 msgstr "Siirretään Gaimin asetuksia..."
 
-#: src/win32/win32dep.c:274
+#: src/win32/win32dep.c:275
 msgid "Moving Gaim user settings to: "
 msgstr "Siirretään Gaimin asetuksia:"
 
-#: src/win32/win32dep.c:276
+#: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "Ilmoitus"
 
-#~ msgid "First name"
-#~ msgstr "Etunimi"
+#~ msgid "_Screenname:"
+#~ msgstr "_Näyttönimi:"
+
+#~ msgid "_Get Info"
+#~ msgstr "_Hae tiedot"
+
+#~ msgid "_IM"
+#~ msgstr "_Pikaviesti"
+
+#~ msgid "Browser Options"
+#~ msgstr "Selaimen valinnat"
+
+#~ msgid "Open new _window by default"
+#~ msgstr "Avaa uusi _ikkuna oletuksena"
+
+#~ msgid "Internal server error"
+#~ msgstr "Sisäinen palvelinvirhe"
+
+#~ msgid "Unable to read from MSN Nexus server."
+#~ msgstr "MSN:n Nexus-palvelimelta ei kyetty lukemaan."
+
+#~ msgid "MSN Nexus server returned invalid information."
+#~ msgstr "MSN Nexus-palvelin palautti virheellistä tietoa."
+
+#~ msgid "Unable to connect to passport server"
+#~ msgstr "Passport-palvelimeen ei kyetty muodostamaan yhteyttä"
+
+#~ msgid "Normal font size"
+#~ msgstr "Normaali kirjasin koko"
 
 #~ msgid "Disconnected"
 #~ msgstr "Yhteys katkennut"
@@ -8091,9 +8496,6 @@
 #~ msgid "Invalid response from server"
 #~ msgstr "Kelvoton vastaus palvelimelta"
 
-#~ msgid "Unable to connect"
-#~ msgstr "Yhteyden muodostaminen epäonnistui"
-
 #~ msgid "Could not connect for transfer!"
 #~ msgstr "Yhteyttä siirtoa varten ei voitu muodostaa!"
 
@@ -8527,9 +8929,6 @@
 #~ msgid "First Name:"
 #~ msgstr "Etunimi:"
 
-#~ msgid "Last Name:"
-#~ msgstr "Sukunimi:"
-
 #~ msgid "Gender:"
 #~ msgstr "Sukupuoli:"
 
@@ -8555,9 +8954,6 @@
 #~ msgid "DCC Chat with %s closed"
 #~ msgstr "DCC-keskustelu %s:n kanssa suljettu"
 
-#~ msgid "User"
-#~ msgstr "Käyttäjä"
-
 #, fuzzy
 #~ msgid "Rehashing server"
 #~ msgstr "Luetaan palvelinavainta"
@@ -9089,9 +9485,6 @@
 #~ msgid "Unload the selected plugin"
 #~ msgstr "Poista valittu liitännäinen"
 
-#~ msgid "Close this window"
-#~ msgstr "Sulje tämä ikkuna"
-
 #, fuzzy
 #~ msgid "Use _borderless buttons"
 #~ msgstr "Käytä reunattomia painikkeita"
@@ -9208,9 +9601,6 @@
 #~ msgid "Perl Scripts"
 #~ msgstr "Perlskripti"
 
-#~ msgid "Select"
-#~ msgstr "Valitse"
-
 #~ msgid "Automatically show buddy list on sign on"
 #~ msgstr "Näytä automaattisesti tuttavalista kirjauduttaessa sisään"