diff po/fi.po @ 9664:ce26d84eed8f

[gaim-migrate @ 10516] 7 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 04 Aug 2004 23:10:58 +0000
parents 8c4d99bea74d
children 14c1ffd053e5
line wrap: on
line diff
--- a/po/fi.po	Wed Aug 04 18:27:09 2004 +0000
+++ b/po/fi.po	Wed Aug 04 23:10:58 2004 +0000
@@ -7,10 +7,10 @@
 # NOTE gftt is http://gnome-fi.sourceforge.net/
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.79\n"
+"Project-Id-Version: gaim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
-"PO-Revision-Date: 2004-06-22 18:18+0300\n"
+"POT-Creation-Date: 2004-08-03 06:28+0300\n"
+"PO-Revision-Date: 2004-08-04 18:43+0300\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "Virheilmoitusten vaimennus"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "Piilota yhteydenkatkaisu-virheilmoitukset"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "Piilota sisäänkirjautumis-virheet"
 
+#: plugins/autorecon.c:245
+msgid "Restore Away State On Reconnent"
+msgstr "Palauta poissaolotila uudelleenyhdistettäessä"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -37,7 +41,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "Uudelleenyhdistäjä"
 
@@ -45,7 +49,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kun yhteys palvelimelle katkeaa, tämä luo yhteyden uudelleen."
 
@@ -148,7 +152,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -164,13 +168,13 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2722
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6494 src/protocols/oscar/oscar.c:6694
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -178,8 +182,8 @@
 
 # src/menus.c:327
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
+#: plugins/docklet/docklet.c:159 src/away.c:565
+#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6702
 msgid "Back"
 msgstr "Palaa"
 
@@ -193,11 +197,11 @@
 msgid "File Transfers"
 msgstr "Tiedostosiirtot"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -263,9 +267,8 @@
 msgstr "Keskustelujen määrä per ikkuna"
 
 #: plugins/extplacement.c:107
-#, fuzzy
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
+msgstr "Erota pikaviesti ja chat-ikkunat aseteltaessa määrän mukaan"
 
 #. *< api_version
 #. *< type
@@ -287,13 +290,10 @@
 #. *< summary
 #. *  description
 #: plugins/extplacement.c:130
-#, fuzzy
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr ""
-"Rajoita joko keskustelujen määrää ikkunaa kohti tai käytä eri ikkunaa "
-"pikaviesteille ja chateille"
+msgstr "Rajoita keskustelujen määrää ikkunaa kohti, valinnaisesti erotellen pikaviesti ja chat-keskustelut"
 
 #. *< api_version
 #. *< type
@@ -314,23 +314,23 @@
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Mahdollistaa Gaimin kontrolloinnin komentotiedostolla."
 
-#: plugins/gaim-remote/remote.c:89
+#: plugins/gaim-remote/remote.c:90
 msgid "Not connected to AIM"
 msgstr "Ei olla yhteydessä Gaimiin"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
 msgid "No screenname given."
 msgstr "Näyttönimeä ei annettu."
 
-#: plugins/gaim-remote/remote.c:174
+#: plugins/gaim-remote/remote.c:175
 msgid "No roomname given."
 msgstr "Huoneen nimeä ei annettu."
 
-#: plugins/gaim-remote/remote.c:193
+#: plugins/gaim-remote/remote.c:194
 msgid "Invalid AIM URI"
 msgstr "Epäkelpo AIM:n URI"
 
-#: plugins/gaim-remote/remote.c:651
+#: plugins/gaim-remote/remote.c:668
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -339,7 +339,7 @@
 "Ei voitu liittää %s pistokkeeseen:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:674
+#: plugins/gaim-remote/remote.c:691
 msgid "Unable to open socket"
 msgstr "Ei kyetty avaamaan pistoketta"
 
@@ -350,19 +350,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:722
+#: plugins/gaim-remote/remote.c:739
 msgid "Remote Control"
 msgstr "Kauko-ohjain"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:725
+#: plugins/gaim-remote/remote.c:742
 msgid "Provides remote control for gaim applications."
 msgstr "Tuo kauko-ohjauksen Gaim-sovelluksille."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:727
+#: plugins/gaim-remote/remote.c:744
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -463,14 +463,14 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
+#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Ei mitään"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
+#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nimi"
@@ -486,13 +486,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6978
 msgid "Search"
 msgstr "Etsi"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
-#: src/gtkblist.c:4374
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4044
+#: src/gtkblist.c:4372
 msgid "Group:"
 msgstr "Ryhmä:"
 
@@ -532,7 +532,7 @@
 msgstr "_Assosioi tuttava"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Tuttavat"
@@ -551,7 +551,7 @@
 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:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
 msgid "Account"
 msgstr "Tili"
 
@@ -596,8 +596,8 @@
 msgstr "Valinnaiset lisätiedot:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
@@ -665,7 +665,7 @@
 msgid "_Set"
 msgstr "_Aseta"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/dialogs.c:808
 msgid "_Cancel"
 msgstr "_Peruuta"
 
@@ -829,14 +829,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:531
+#: plugins/perl/perl.c:532
 msgid "Perl Plugin Loader"
 msgstr "Perl-plugin lataaja"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
+#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-plugineja."
 
@@ -920,7 +920,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:582
 msgid "Signals Test"
 msgstr "Signaalitesti"
 
@@ -928,7 +928,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
 
@@ -1009,7 +1009,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:314
 msgid "NSS"
 msgstr "NSS"
 
@@ -1017,7 +1017,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -1041,26 +1041,38 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
-#: plugins/statenotify.c:30
+#: plugins/statenotify.c:37
 #, c-format
 msgid "%s has gone away."
 msgstr "%s on poissa."
 
-#: plugins/statenotify.c:36
+#: plugins/statenotify.c:44
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s on palannut."
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:51
 #, c-format
 msgid "%s has become idle."
 msgstr "%s on jouten."
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:58
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ei enää ole jouten."
 
+#: plugins/statenotify.c:69
+msgid "Notify When"
+msgstr "Huomautus kun"
+
+#: plugins/statenotify.c:72
+msgid "Buddy Goes _Away"
+msgstr "Tuttava _poistuu"
+
+#: plugins/statenotify.c:75
+msgid "Buddy Goes _Idle"
+msgstr "Tuttava on _jouten"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1068,7 +1080,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:78
+#: plugins/statenotify.c:113
 msgid "Buddy State Notification"
 msgstr "Tuttavan-tila ilmoitus"
 
@@ -1076,7 +1088,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
+#: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1169,7 +1181,7 @@
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
@@ -1226,8 +1238,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
-#: src/gtkprefs.c:2412
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1246,8 +1258,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
-#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
+#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1267,12 +1279,12 @@
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/about.c:75
+#: 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:95
+#: src/about.c:94
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -1283,235 +1295,234 @@
 "Zephyr- ja Gadu-Gadu-protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:"
 "aa ja on lisensoitu GPL:n mukaisesti.<BR><BR>"
 
-#: src/about.c:106
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
 # NOTE source: 0.59.8
-#: src/about.c:111
+#: src/about.c:110
 msgid "Active Developers"
 msgstr "Aktiiviset kehittäjät"
 
 # NOTE source: 0.59.8
-#: src/about.c:112
+#: src/about.c:111
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: src/about.c:114
+#: src/about.c:113
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: src/about.c:117
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "Kehittäjä & verkkosivujen ylläpitäjä"
 
-#: src/about.c:118
+#: src/about.c:117
 msgid "win32 port"
 msgstr "win32 käännös"
 
 # NOTE source: 0.59.8 (plural -> singular)
-#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "kehittäjä"
 
-#: src/about.c:125
+#: src/about.c:124
 msgid "support"
 msgstr "tuki"
 
-#: src/about.c:132
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:148
+#: src/about.c:147
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:149
+#: src/about.c:148
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:150
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:153
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "entinen ylläpitäjä"
 
+#: src/about.c:153
+msgid "former Jabber developer"
+msgstr "entinen Jabber-ylläpitäjä"
+
 #: src/about.c:154
-msgid "former Jabber developer"
-msgstr "entinen Jabber-ylläpitäjä"
-
-#: src/about.c:155
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:158
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri sekä määrätty kuljettaja [laiska pummi]"
 
-#: src/about.c:166
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: src/about.c:167 src/about.c:206
+#: src/about.c:166 src/about.c:205
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
 # NOTE source: netscape
-#: src/about.c:168 src/about.c:207
+#: src/about.c:167 src/about.c:206
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:169 src/about.c:208
+#: src/about.c:168 src/about.c:207
 msgid "Czech"
 msgstr "Tsekki"
 
+#: src/about.c:169
+msgid "Danish"
+msgstr "Tanska"
+
 #: src/about.c:170
-msgid "Danish"
-msgstr "Tanska"
-
-#: src/about.c:171
 msgid "British English"
 msgstr "Brittienglanti"
 
-#: src/about.c:172
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Kanadan Englanti"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:172 src/about.c:208
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:173 src/about.c:209
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:174 src/about.c:210
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:176 src/about.c:212
+#: src/about.c:175 src/about.c:211
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:177
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/about.c:178
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:179
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:180 src/about.c:213
+#: src/about.c:179 src/about.c:212
 msgid "Italian"
 msgstr "Italia"
 
-#: src/about.c:181 src/about.c:214
+#: src/about.c:180 src/about.c:213
 msgid "Japanese"
 msgstr "Japani"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Lithuanian"
-msgstr ""
+msgstr "Liettua"
 
 # NOTE source: netscape
-#: src/about.c:183 src/about.c:215
+#: src/about.c:182 src/about.c:214
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:184
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
-#: src/about.c:185
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Makedonia"
 
 # NOTE source: netscape
-#: src/about.c:186
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:187 src/about.c:216
+#: src/about.c:186 src/about.c:215
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:188
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:189
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:190
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:191 src/about.c:217 src/about.c:218
+#: src/about.c:190 src/about.c:216 src/about.c:217
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:192
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Serbia"
 
 # NOTE source: netscape
-#: src/about.c:193
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Sloveeni"
 
-#: src/about.c:194 src/about.c:220
+#: src/about.c:193 src/about.c:219
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: src/about.c:195
-#, fuzzy
+#: src/about.c:194
 msgid "and the Gnome-Vi Team"
-msgstr "Gnome Vi-työryhmä"
+msgstr "ja Gnome Vi-työryhmä"
 
 # XXX source: netscape + google
-#: src/about.c:196
+#: src/about.c:195
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:197
+#: src/about.c:196
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
+#: src/about.c:203
+msgid "Past Translators"
+msgstr "Aikaisemmat kielenkääntäjät"
+
 #: src/about.c:204
-msgid "Past Translators"
-msgstr "Aikaisemmat kielenkääntäjät"
-
-#: src/about.c:205
 msgid "Amharic"
 msgstr "Amhara"
 
 # NOTE source: netscape
-#: src/about.c:219
+#: src/about.c:218
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:221
+#: src/about.c:220
 msgid "Chinese"
 msgstr "Kiina"
 
@@ -1547,46 +1558,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
+#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
-#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
-#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:6765 src/protocols/oscar/oscar.c:6857
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6995
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
+#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
 #: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
-#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
+#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
-#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
-#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
-#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
-#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6766
+#: src/protocols/oscar/oscar.c:6858 src/protocols/oscar/oscar.c:6910
+#: src/protocols/oscar/oscar.c:6979 src/protocols/oscar/oscar.c:6996
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
 #: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Peruuta"
@@ -1602,34 +1613,34 @@
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "Poissa!"
 
-#: src/away.c:276
+#: src/away.c:291
 msgid "I'm Back!"
 msgstr "Olen palannut!"
 
-#: src/away.c:330
+#: src/away.c:345
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "Oletko varma että haluat poistaa poissaoloviestin \"%s\"?"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:347 src/away.c:438
 msgid "Remove Away Message"
 msgstr "Poista poissaoloviesti"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Poista"
 
-#: src/away.c:403
+#: src/away.c:418
 msgid "New Away Message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/away.c:618
+#: src/away.c:633
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
@@ -1637,7 +1648,7 @@
 msgid "Chats"
 msgstr "Chatit"
 
-#: src/blist.c:1321
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1648,16 +1659,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1330
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: src/blist.c:2001
+#: src/blist.c:2030
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1666,7 +1672,7 @@
 "on siirretty tiedostoon blist.xml~."
 
 # XXX probably better than forming yet another new compound?
-#: src/blist.c:2004
+#: src/blist.c:2033
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
@@ -1689,72 +1695,72 @@
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1950
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1953
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:2047
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2093
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2094
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2165
+#: src/conversation.c:2164
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2166
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2457
+#: src/conversation.c:2571
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2573
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
 # XXX
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2575 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2577
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2579
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -1834,103 +1840,103 @@
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
 msgid "_Screen name"
 msgstr "_Näyttönimi"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: src/dialogs.c:457
+#: src/dialogs.c:468
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Syötä sen henkilön näyttönimi, jolle haluat lähettää pikaviestin."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:524
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Syötä sen henkilön näyttönimi, jonka tiedot haluat nähdä."
 
-#: src/dialogs.c:566
+#: src/dialogs.c:577
 msgid "Get User Log"
 msgstr "Hae käyttäjäloki"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: src/dialogs.c:623
+#: src/dialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviestiä tyhjällä otsikolla"
 
-#: src/dialogs.c:625
+#: src/dialogs.c:647
 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:635
+#: src/dialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:697
+#: src/dialogs.c:719
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:718
+#: src/dialogs.c:740
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
 # src/menus.c:280
-#: src/dialogs.c:774
+#: src/dialogs.c:796
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: src/dialogs.c:782
+#: src/dialogs.c:804
 msgid "_Use"
 msgstr "_Käytä"
 
-#: src/dialogs.c:804
+#: src/dialogs.c:826
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: src/dialogs.c:805
+#: src/dialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:842
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-#: src/dialogs.c:821
+#: src/dialogs.c:843
 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:837
+#: src/dialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: src/dialogs.c:839
+#: src/dialogs.c:861
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
@@ -1998,6 +2004,9 @@
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -2007,16 +2016,19 @@
 "\n"
 "        KOMENNOT:\n"
 "           uri                  Käsittele AIM:n URI\n"
+"           away                 Tuo esiin poissaoloviesti-ikkuna oletusviestillä\n"
+"           back                 Poista poissaoloviesti-ikkuna\n"
 "           quit                 Sulje käynnissäoleva Gaim\n"
 "\n"
 "        OPTIOT:\n"
 "           -h, --help [komento] Näytä komennon ohje\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
+#: src/gaim-remote.c:224
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim ei ole käynnissä (sessiossa 0)\n"
 
-#: src/gaim-remote.c:203
+#: src/gaim-remote.c:238
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2058,7 +2070,7 @@
 "         gaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...pyytää lisäämään tuttavan 'Penguin' tuttavalistalle.\n"
 
-#: src/gaim-remote.c:222
+#: src/gaim-remote.c:257
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2066,28 +2078,12 @@
 "\n"
 "Sulje käynnissäoleva Gaim\n"
 
-#. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:46
-msgid "sorry, i ran out for a while. bbl"
-msgstr "Hetkisen poissa."
-
-#: src/gaimrc.c:372 src/gaimrc.c:1417
-msgid "boring default"
-msgstr "Tylsä perusviesti"
-
-#: src/gaimrc.c:1227 src/gtkblist.c:3017
-msgid "Alphabetical"
-msgstr "Aakkosellinen"
-
-#: src/gaimrc.c:1229 src/gtkblist.c:3018
-msgid "By status"
-msgstr "Tilan mukaan"
-
-#: src/gaimrc.c:1231 src/gtkblist.c:3019
-msgid "By log size"
-msgstr "Lokin koon mukaan"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2734
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2099,166 +2095,166 @@
 "<b>Kuvan koko:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:621
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:638
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:643 src/gtkblist.c:4016
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:716
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:721 src/gtkblist.c:4030 src/gtkblist.c:4358
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:725
 msgid "Remember password"
 msgstr "Muista salasana"
 
 # XXX could be wrong
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:781
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:794
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:803
 msgid "Buddy icon:"
 msgstr "Tuttavakuvake:"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:892
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
 msgid "Use Global Proxy Settings"
 msgstr "Käytä globaalia proxy-asetusta"
 
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
 msgid "No Proxy"
 msgstr "Ei välityspalvelinta"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1149
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1153
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1169
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1208
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1581
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1583
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1607
 msgid "Show more options"
 msgstr "Näytä enemmän valintoja"
 
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1608
 msgid "Show fewer options"
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:2000
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2004 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:6693 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
+#: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2163
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2476
 #, 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:2487
+#: src/gtkaccount.c:2490
 msgid ""
 "\n"
 "\n"
@@ -2268,104 +2264,103 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2494
 msgid "Information"
 msgstr "Tiedot"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2498
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/gtkaccount.c:2500 src/gtkblist.c:4409 src/gtkconv.c:1380
+#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:802
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:836
+#: src/gtkblist.c:823
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Anna tiedot chatistä johon haluat liittyä.\n"
 
-#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
+#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:3212
+#: src/gtkblist.c:1122 src/gtkblist.c:3204
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: src/gtkblist.c:1136 src/gtkblist.c:3203
+#: src/gtkblist.c:1125 src/gtkblist.c:3194
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:1141
-#, fuzzy
+#: src/gtkblist.c:1130
 msgid "_Send File"
-msgstr "Lähetä tiedosto"
-
-#: src/gtkblist.c:1145
+msgstr "_Lähetä tiedosto"
+
+#: src/gtkblist.c:1134
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1136
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
+#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
+#: src/gtkconn.c:360
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1194
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1196
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1198
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Liity"
 
 # XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1222
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:1257 src/gtkblist.c:1286
+#: src/gtkblist.c:1246 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:1291
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2373,134 +2368,134 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2325
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2326
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2327
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2328
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2329
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2331
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2332
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2333
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2334
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2335
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2337
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2338
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2341
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2342
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2343
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2344
 msgid "/Tools/Account Ac_tions"
 msgstr "/Työkalut/_Käyttäjätilitoiminnot"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2345
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Työkalut/_Liitännäistoiminnot"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2347
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2348
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirtot..."
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2349
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Chat-huone_lista"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2350
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2351
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2356
 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:2368
+#: src/gtkblist.c:2357
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2358
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2359
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2378
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2406
 #, c-format
 msgid ""
 "\n"
@@ -2509,7 +2504,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2517,12 +2512,12 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2485
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2530,7 +2525,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2538,7 +2533,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2546,7 +2541,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2554,7 +2549,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2505
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2562,7 +2557,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> "
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2570,7 +2565,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2578,7 +2573,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2509
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2586,7 +2581,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2510
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2594,7 +2589,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2511
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2602,97 +2597,109 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2814
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2932
+#: src/gtkblist.c:2921
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity Chattiin..."
 
-#: src/gtkblist.c:2935
+#: src/gtkblist.c:2924
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Chat-lista"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:2927
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
+#: src/gtkblist.c:3008
+msgid "Alphabetical"
+msgstr "Aakkosellinen"
+
+#: src/gtkblist.c:3009
+msgid "By status"
+msgstr "Tilan mukaan"
+
+#: src/gtkblist.c:3010
+msgid "By log size"
+msgstr "Lokin koon mukaan"
+
+#: src/gtkblist.c:3076
+msgid "/Tools/Away"
+msgstr "/Työkalut/Poissa"
+
+#: src/gtkblist.c:3079
+msgid "/Tools/Buddy Pounce"
+msgstr "/Työkalut/Tuttavailmoitin"
+
+#: src/gtkblist.c:3082
+msgid "/Tools/Account Actions"
+msgstr "/Työkalut/Käyttäjätilitoiminnot"
+
 #: src/gtkblist.c:3085
-msgid "/Tools/Away"
-msgstr "/Työkalut/Poissa"
-
-#: src/gtkblist.c:3088
-msgid "/Tools/Buddy Pounce"
-msgstr "/Työkalut/Tuttavailmoitin"
-
-#: src/gtkblist.c:3091
-msgid "/Tools/Account Actions"
-msgstr "/Työkalut/Käyttäjätilitoiminnot"
-
-#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Työkalut/Liitännäistoiminnot"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3174
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3176
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3200
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3210
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3214
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3226
+#: src/gtkblist.c:3219
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3224
 msgid "_Away"
 msgstr "_Poissa"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:3234
+#: src/gtkblist.c:3229
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3970 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3996
+#: src/gtkblist.c:3994
 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. "
@@ -2703,11 +2710,11 @@
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4056 src/gtkblist.c:4340
+#: src/gtkblist.c:4054 src/gtkblist.c:4338
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:4299
+#: src/gtkblist.c:4297
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2715,11 +2722,11 @@
 "Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: src/gtkblist.c:4306
+#: src/gtkblist.c:4304
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:4330
+#: src/gtkblist.c:4328
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2727,20 +2734,20 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:4408
+#: src/gtkblist.c:4406
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:4409
+#: src/gtkblist.c:4407
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4976 src/gtkblist.c:5073
+#: src/gtkblist.c:4974 src/gtkblist.c:5071
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
 # NOTE source: netscape
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "Valmis."
 
@@ -2754,15 +2761,15 @@
 msgid "Signon"
 msgstr "Kirjaudutaan"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Peruuta kaikki"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:360 src/gtkconn.c:592
 msgid "_Reconnect"
 msgstr "_Uudelleenyhdistä"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:556
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2775,15 +2782,15 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:558
 msgid "Reason Unknown."
 msgstr "Tuntematon syy."
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:597
 msgid "Reconnect _All"
 msgstr "Uudelleenyhdistä _kaikki"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:627
 msgid "Time"
 msgstr "Aika"
 
@@ -2796,7 +2803,11 @@
 msgid "Supported debug options are:  version"
 msgstr "Tuetut debug valinnat ovat: versio"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:347
+msgid "No such command (in this context)."
+msgstr "Komento ei saatavilla (tässä kontekstissa)."
+
+#: src/gtkconv.c:350
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2804,11 +2815,7 @@
 "Kirjoita \"/help &alt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: src/gtkconv.c:370
-msgid "No such command (in this context)."
-msgstr "Komento ei saatavilla (tässä kontekstissa)."
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:434
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2818,7 +2825,7 @@
 "komennot pois käytöstä Työkalut->Asetukset->Keskustelut->Käytä \"kauttaviiva"
 "\"-komentoja."
 
-#: src/gtkconv.c:451
+#: src/gtkconv.c:442
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2828,394 +2835,385 @@
 "ollut tarkoitus kirjoittaa komentoa, voit ottaa komennot pois käytöstä "
 "Työkalut->Asetukset->Keskustelut->Käytä \"kauttaviiva\"-komentoja."
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:449
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:456
 msgid "That command only works in Chats, not IMs."
 msgstr "Tämä komento toimii vain chatissä, ei pikaviesteissä."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:459
 msgid "That command only works in IMs, not Chats."
 msgstr "Tämä komento toimii vain pikaviesteissä, ei chatissä."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:463
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle protokollalle."
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:685
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:713
 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:742
+#: src/gtkconv.c:734
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:762
+#: src/gtkconv.c:754
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
-#, fuzzy
+#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
 msgid "Unable to open file."
-msgstr "Ei kyetty lukemaan tiedostoa %s."
-
-#: src/gtkconv.c:804
+msgstr "Ei kyetty avaamaan tiedostoa."
+
+#: src/gtkconv.c:796
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:810
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1328
 msgid "IM"
 msgstr "Pikaviesti"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
-#: src/protocols/oscar/oscar.c:6798
+#. Send File button
+#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1346
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#: src/gtkconv.c:1348 src/gtkprefs.c:825
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1357 src/gtkconv.c:3725
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1366
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/gtkconv.c:2497
-#, fuzzy
+#: src/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "Ikonitiedostoa ei voida tallentaa levylle."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2501
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2531
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2536
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2542
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:2939
+#: src/gtkconv.c:2926
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2934
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3037
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3488
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3490
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3495
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3497
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3498
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3500
 msgid "/Conversation/Clear"
 msgstr "/Keskustelu/Tyhjennä"
 
-#: src/gtkconv.c:3466
-#, fuzzy
+#: src/gtkconv.c:3504
 msgid "/Conversation/Se_nd File..."
-msgstr "/Keskustelu/Lähetä Tiedosto..."
-
-#: src/gtkconv.c:3467
+msgstr "/Keskustelu/_Lähetä Tiedosto..."
+
+#: src/gtkconv.c:3505
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3511
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3516
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3527
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3529
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3534
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3538
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3539
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3540
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3541
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3542
 msgid "/Options/Show T_imestamps"
 msgstr "/Valinnat/Näytä _aikaleima"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3584
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3589
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä Tiedosto..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3593
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3599
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3603
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3607
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3613
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3617
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3621
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3625
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3631
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3635
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Liitä kuva..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3641
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3647
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3650
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
 msgid "Send"
 msgstr "Lähetä"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3690
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3693
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "Estä"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3700
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
-#: src/gtkconv.c:3669
-#, fuzzy
+#: src/gtkconv.c:3707
 msgid "Send a file to the user"
-msgstr "Lähetä mobiiliviestinä"
-
-#: src/gtkconv.c:3676
+msgstr "Lähetä tiedosto käyttäjälle"
+
+#: src/gtkconv.c:3714
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3721
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3728 src/gtkconv.c:4108
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3808
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3811
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3818
 msgid "Add the chat to your buddy list"
 msgstr "Lisää chat tuttavalistalle"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3825
 msgid "Remove the chat from your buddy list"
 msgstr "Poista chat tuttavalistalta"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3961
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4024
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4085
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4097
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4695
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
 #, 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:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5958 src/gtkconv.c:5961
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6333
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai chattiin."
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6336
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: src/gtkconv.c:6283
-msgid "help:  List available commands."
-msgstr "help: Listaa saatavillaolevat komennot."
-
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6340
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
@@ -3242,11 +3240,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: src/gtkft.c:157 src/gtkft.c:967
+#: src/gtkft.c:157 src/gtkft.c:962
 msgid "Finished"
 msgstr "Valmis"
 
-#: src/gtkft.c:160 src/gtkft.c:918
+#: src/gtkft.c:160 src/gtkft.c:913
 msgid "Canceled"
 msgstr "Peruutettu"
 
@@ -3308,34 +3306,34 @@
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: src/gtkft.c:641
+#: src/gtkft.c:636
 msgid "_Keep the dialog open"
 msgstr "Pidä tiedonsiirtoikkuna _auki"
 
-#: src/gtkft.c:651
+#: src/gtkft.c:646
 msgid "_Clear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: src/gtkft.c:660
+#: src/gtkft.c:655
 msgid "Show transfer details"
 msgstr "Näytä tiedostosiirron yksityiskohdat"
 
-#: src/gtkft.c:661
+#: src/gtkft.c:656
 msgid "Hide transfer details"
 msgstr "Piilota tiedostosiirron yksityiskohdat"
 
 #. Pause button
-#: src/gtkft.c:703 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:90
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: src/gtkft.c:713
+#: src/gtkft.c:708
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: src/gtkft.c:920
+#: src/gtkft.c:915
 msgid "Failed"
 msgstr "Epäonnistunut"
 
@@ -3363,7 +3361,7 @@
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:2797
+#: src/gtkimhtml.c:2803
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3371,18 +3369,18 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:2805
+#: src/gtkimhtml.c:2811
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:2814
+#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:2837
+#: src/gtkimhtml.c:2921
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -3398,15 +3396,15 @@
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:397
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: src/gtkimhtmltoolbar.c:400
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3414,88 +3412,89 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: src/gtkimhtmltoolbar.c:404
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: src/gtkimhtmltoolbar.c:413
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:655
+#: src/gtkimhtmltoolbar.c:661
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:670
+#: src/gtkimhtmltoolbar.c:676
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/gtkimhtmltoolbar.c:888
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:926
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkimhtmltoolbar.c:994
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkimhtmltoolbar.c:1004
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
 #: src/gtklog.c:302
-msgid "Conversations with"
-msgstr "Keskustelut:"
+#, c-format
+msgid "Conversations with %s"
+msgstr "Keskustelut tuttavan %s kanssa"
 
 #. Window **********
-#: src/gtklog.c:392 src/gtklog.c:408
+#: src/gtklog.c:395 src/gtklog.c:411
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
@@ -3540,22 +3539,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:421
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" ei kelpaa."
 
-#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:579
+#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
+#: src/gtknotify.c:571
 msgid "Unable to open URL"
 msgstr "Ei kyetty avaamaan URL:ää"
 
-#: src/gtknotify.c:443 src/gtknotify.c:458
+#: src/gtknotify.c:435 src/gtknotify.c:450
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:572
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
@@ -3569,7 +3568,7 @@
 msgstr "Syötä ilmoitettava tuttava."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:890
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
@@ -3579,139 +3578,139 @@
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:405
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 # XXX
-#: src/gtkpounce.c:432
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:456
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "Ilmoitetaan kun"
 
-#: src/gtkpounce.c:464 src/main.c:296
-msgid "_Sign on"
-msgstr "_Kirjautuu sisään"
-
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:463
+msgid "Si_gn on"
+msgstr "_Kirjaudu"
+
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "Kirjautuu _ulos"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "_Poissa"
 
-#: src/gtkpounce.c:470
-msgid "Re_turn from away"
-msgstr "Palaa oltuaan _poissa"
-
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:469
+msgid "_Return from away"
+msgstr "_Poista poissaolotila"
+
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "_Jouten"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "Palaa oltuaan _jouten"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "T_uttava alkaa kirjoittaa"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "Tuttava lope_ttaa kirjoittamisen"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "_Avaa pikaviesti-ikkuna"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "_Ponnahdus-ilmoitus"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "_Selaa"
 
+#: src/gtkpounce.c:528
+msgid "Bro_wse..."
+msgstr "_Selaa"
+
 #: src/gtkpounce.c:529
-msgid "Bro_wse..."
-msgstr "_Selaa"
-
-#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "_Säilytä tämä ilmoitin aktivoinnin jälkeen"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:897
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
@@ -3735,8 +3734,8 @@
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -3752,31 +3751,27 @@
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:826
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:828
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:830
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
-#: src/gtkprefs.c:834
-msgid "_Ignore formatting on incoming messages"
-msgstr "_Sivuuta muotoilut tulevissa viesteissä"
-
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:833
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:835
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Lähetä oletusmuotoilu lähetettävien viestien mukana"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3784,273 +3779,273 @@
 "Tältä ulosmenevä viesti näyttää kun käytät protokollaa joka tukee "
 "muotoiluja. :)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "_Clear Formatting"
 msgstr "_Tyhjennä muotoilu"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:907
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:908
 msgid "Enter _sends message"
 msgstr "\"Enter\" _lähettää viestin"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:910
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" lähettää viestin"
 
+#: src/gtkprefs.c:913
+msgid "Window Closing"
+msgstr "Ikkunan sulkeminen"
+
+#: src/gtkprefs.c:914
+msgid "_Escape closes window"
+msgstr "\"_Escape\" sulkee ikkunan"
+
+#: src/gtkprefs.c:917
+msgid "Insertions"
+msgstr "Lisäykset"
+
 #: src/gtkprefs.c:918
-msgid "Window Closing"
-msgstr "Ikkunan sulkeminen"
-
-#: src/gtkprefs.c:919
-msgid "_Escape closes window"
-msgstr "\"_Escape\" sulkee ikkunan"
-
-#: src/gtkprefs.c:922
-msgid "Insertions"
-msgstr "Lisäykset"
-
-#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} muuttaa tekstimuotoiluja"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:920
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(numero) _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:936
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:945
 msgid "_Sorting:"
 msgstr "_Järjestys:"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:951 src/gtkprefs.c:1003
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+#: src/gtkprefs.c:953 src/gtkprefs.c:1005
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:955 src/gtkprefs.c:1007
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:958
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:961
 msgid "Buddy Display"
 msgstr "Tuttavien näyttö"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1027
+#: src/gtkprefs.c:962 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:964
 msgid "Show _warning levels"
 msgstr "Näytä _varoitustasot"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:966
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:968
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:970
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1013
 msgid "Enable \"_slash\" commands"
 msgstr "Käytä \"kauttaviiva\"-komentoja"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1016
 msgid "Show _formatting toolbar"
 msgstr "Näytä _muotoilu-työkalurivi"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1018
 msgid "Show _aliases in tabs/titles"
 msgstr "Näytä _a_liakset välilehdissä/otsikoissa"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1022
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1024
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1026
 msgid "_Raise IM window on events"
 msgstr "_Nosta pikaviesti-ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1029
 msgid "Raise chat _window on events"
 msgstr "Nosta _chat-ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1031
 msgid "Use _multi-colored screen names in chats"
 msgstr "Käytä _monivärisiä näyttönimiä chatissä"
 
 #. All the tab options!
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1035
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1037
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1052
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1055
 msgid "Tab p_lacement:"
 msgstr "_Välilehtien sijoitus:"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1057
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1058
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1059
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1060
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1066
 msgid "New conversation _placement:"
 msgstr "Uusi keskustelu_asetettelu:"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
-#: src/protocols/oscar/oscar.c:4855
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
+#: src/protocols/oscar/oscar.c:4848
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1119
 msgid "_Autodetect IP Address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1128
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1152
 msgid "Ports"
 msgstr "Portit"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1155
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
+#: src/gtkprefs.c:1158
+msgid "_Start Port:"
+msgstr "_Ensimmäinen portti:"
+
 #: src/gtkprefs.c:1165
-msgid "_Start Port:"
-msgstr "_Ensimmäinen portti:"
+msgid "_End Port:"
+msgstr "Viimeinen _portti:"
 
 #: src/gtkprefs.c:1172
-msgid "_End Port:"
-msgstr "Viimeinen _portti:"
-
-#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1176
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1238
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1294
 msgid "Epiphany"
-msgstr ""
-
-#: src/gtkprefs.c:1302
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1297
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1298
 msgid "Gnome Default"
 msgstr "Gnome oletus"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1299
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1301
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1311
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1362
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1366
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1373
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1375
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1376
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1378
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1392
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4059,84 +4054,84 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1429
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1432
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1435
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1437
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1440
 msgid "System Logs"
 msgstr "Järjestelmälokit"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1442
 msgid "_Enable system log"
 msgstr "Ota järjestelmäloki _käyttöön"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1445
 msgid "Log when buddies _sign on/sign off"
 msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1451
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1457
 msgid "Log when buddies go away/come _back"
 msgstr "Kirjaa lokiin tuttavien poistumiset/_palaamiset"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1463
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Kirjaa lokiin _omat sisäänkirjautumiset/joutenolot/poissaolot"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1589
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1640
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
+#: src/gtkprefs.c:1641
+msgid "Sounds when conversation has _focus"
+msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
+
+#: src/gtkprefs.c:1643
+msgid "_Sounds while away"
+msgstr "Ää_net poissaollessasi"
+
+#: src/gtkprefs.c:1647
+msgid "Sound Method"
+msgstr "Äänimenetelmä"
+
 #: src/gtkprefs.c:1648
-msgid "Sounds when conversation has _focus"
-msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
+msgid "_Method:"
+msgstr "_Menetelmä:"
 
 #: src/gtkprefs.c:1650
-msgid "_Sounds while away"
-msgstr "Ää_net poissaollessasi"
-
-#: src/gtkprefs.c:1654
-msgid "Sound Method"
-msgstr "Äänimenetelmä"
-
-#: src/gtkprefs.c:1655
-msgid "_Method:"
-msgstr "_Menetelmä:"
-
-#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1652
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1659
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1667
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4145,88 +4140,92 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1694
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1745
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1752
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1771
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1775
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1779
 msgid "Choose..."
 msgstr "Valitse..."
 
+#: src/gtkprefs.c:1803
+msgid "_Queue new messages when away"
+msgstr "Laita uudet viestit _jonoon poissaollessa"
+
+#: src/gtkprefs.c:1806
+msgid "_Auto-reply:"
+msgstr "_Automaattivastaus:"
+
+#: src/gtkprefs.c:1808
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: src/gtkprefs.c:1809
+msgid "Only when away"
+msgstr "Vain poissaollessa"
+
 #: src/gtkprefs.c:1810
-msgid "_Queue new messages when away"
-msgstr "Laita uudet viestit _jonoon poissaollessa"
-
-#: src/gtkprefs.c:1813
-msgid "Auto-response"
-msgstr "Automaattinen vastaus"
-
-#: src/gtkprefs.c:1814
-msgid "_Send auto-response"
-msgstr "_Lähetä automaattinen vastaus"
-
-#: src/gtkprefs.c:1816
-msgid "_Only send auto-response when idle"
-msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
-
-#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+msgid "Only when away and idle"
+msgstr "Vain ollessa poissa ja jouten"
+
+#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2728
+#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Jouten"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1814
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1817
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1820
 msgid "X usage"
 msgstr "X:n käyttö"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1822
 msgid "Windows usage"
 msgstr "Windows:n käyttö"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1830
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1831
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1835
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1849
+#: src/gtkprefs.c:1843
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1930
+#: src/gtkprefs.c:1912
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4241,7 +4240,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4256,66 +4255,66 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:2168
+#: src/gtkprefs.c:2150
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2164
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2212
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:2375
+#: src/gtkprefs.c:2357
 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:2411
+#: src/gtkprefs.c:2393
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
 # XXX
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2396
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2397
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2416
+#: src/gtkprefs.c:2398
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2417
+#: src/gtkprefs.c:2399
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2400
 msgid "Network"
 msgstr "Verkko"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2403
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2405
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2424
+#: src/gtkprefs.c:2406
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2407
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2410
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -4339,64 +4338,64 @@
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/gtkprivacy.c:400
+#: src/gtkprivacy.c:398
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:412
+#: src/gtkprivacy.c:410
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
 # XXX
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:581
 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:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "Salli"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:620
 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:629
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -4426,30 +4425,28 @@
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
-#, fuzzy
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
-msgstr "Lähetä tiedosto..."
-
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
-#, fuzzy
+msgstr "Tallenna tiedosto..."
+
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
-msgstr "Lähetä tiedosto..."
+msgstr "Avaa tiedosto..."
 
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Huonelista"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:401
 msgid "_Get List"
 msgstr "_Hae lista"
 
@@ -4522,7 +4519,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:574
+#: src/log.c:575
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4531,7 +4528,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:576
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4540,55 +4537,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:627 src/log.c:814
+#: src/log.c:628 src/log.c:815
 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:637 src/log.c:826
+#: src/log.c:638 src/log.c:827
 #, 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:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:759
+#: src/log.c:760
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: src/log.c:859
+#: src/log.c:860
 msgid "Plain text"
 msgstr "Teksti"
 
-#: src/main.c:153
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "Luo uusi käyttäjätili"
 
-#: src/main.c:235
+#: src/main.c:232
 msgid "Login"
 msgstr "Sisäänkirjautuminen"
 
-#: src/main.c:253
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>Käyttäjätili:</b>"
 
-#: src/main.c:267
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>_Salasana:</b>"
 
 #. And now for the buttons
-#: src/main.c:284
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "_Käyttäjätilit"
 
-#: src/main.c:290
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "_Asetukset"
 
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "_Kirjautuu sisään"
+
 #. full help text
-#: src/main.c:520
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4623,11 +4624,22 @@
 "   -h, --help           näytä tämä viesti ja poistu\n"
 
 #. short message
-#: src/main.c:535
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita '%s -h' saadaksesi lisää tietoja.\n"
 
+#: src/main.c:845
+msgid "Unable to load preferences"
+msgstr "Ei voitu ladata asetuksia"
+
+#: src/main.c:845
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr "Gaim ei voinut lukea asetuksia koska ne ovat vanhassa tiedostotyypissä joka ei ole enää käytössä. Ole hyvä ja syötä asetuksesi uudelleen käyttäen Asetukset-ikkunaa."
+
 #: src/plugin.c:286
 #, c-format
 msgid ""
@@ -4652,10 +4664,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2719
+#: src/protocols/novell/novell.c:2838 src/protocols/novell/novell.c:2889
+#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -4668,11 +4680,11 @@
 msgstr "Poissa vain ystäville"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
 #: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
-#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
-#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6704 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4715,7 +4727,7 @@
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
 #, 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"
@@ -4723,10 +4735,10 @@
 # XXX need to check for gradation problems
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:644
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -4746,10 +4758,10 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109
+#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
@@ -4812,26 +4824,26 @@
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4840
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4851 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4841
+#: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "Kutsumanimi"
 
@@ -4846,7 +4858,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:4903
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Kunta"
@@ -4952,7 +4964,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1551
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
@@ -5004,15 +5016,15 @@
 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:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:6129
 msgid "Authorize"
 msgstr "Salli"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:6130
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -5037,13 +5049,13 @@
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
@@ -5076,52 +5088,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
-#, fuzzy
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
-msgstr "Yhteys katkennut"
-
-#: src/protocols/irc/irc.c:147
+msgstr "Palvelin on katkaissut yhteyden"
+
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "Socketin luominen epäonnistui"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Aihe"
 
@@ -5134,51 +5145,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
-#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Portti"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
+#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Väärä tila"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sinut on kielletty kanavalta %s."
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 msgid "Banned"
 msgstr "Kielletty"
 
+#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/msgs.c:214
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
@@ -5187,138 +5204,145 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:958
+#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Oikea nimi"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Jouten:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:214
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:217
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Kuvaava adjektiivi</b> Kunniakas<br>"
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:224
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Tuttavan %s tiedot"
 
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:289
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:306
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti '%s'"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 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:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:424
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:435
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:438
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:443
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:463
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:519
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:520
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -5417,7 +5441,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -5505,27 +5529,27 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
 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:382
+#: src/protocols/irc/parse.c:394
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5562,12 +5586,12 @@
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:795
 msgid "Full Name"
 msgstr "Koko nimi"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:807
 msgid "Family Name"
 msgstr "Sukunimi"
 
@@ -5577,8 +5601,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
+#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Kutsumanimi"
@@ -5642,7 +5666,7 @@
 msgstr "Asema"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4876
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -5664,24 +5688,24 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
-#: src/protocols/yahoo/yahoo.c:2634
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2741
+#: src/protocols/novell/novell.c:2745 src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "Tila"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
 msgid "Resource"
 msgstr "Lähde"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:4902
+#: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "Osoite"
 
@@ -5765,51 +5789,51 @@
 msgid "Invalid Room Handle"
 msgstr "Chat-alias ei kelpaa"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "Konfigurointivirhe."
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida."
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "Huoneen konfigurointivirhe"
 
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa ei-MUC chat-huoneissa"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "Huonelista-virhe"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "Virhe haettaessa huonelistaa"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "Palvelin ei kelpaa"
 
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "Syötä konferenssipalvelin"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "Valitse konferenssipalvelin"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
@@ -5879,13 +5903,13 @@
 msgstr "Sähköposti"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
-#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:4904 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Puhelin"
@@ -5908,9 +5932,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2103
+#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
 msgstr "Yhdistetään"
 
@@ -5928,7 +5952,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6502
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
@@ -5961,19 +5985,19 @@
 msgstr "Virhe"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
 msgid "Chatty"
 msgstr "Chatty"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6690
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6695
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
@@ -6002,7 +6026,7 @@
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
@@ -6124,7 +6148,7 @@
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
@@ -6216,49 +6240,49 @@
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1402
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi chat-huone."
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1406
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi chat-huone."
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1415
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1420
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy chat-huoneeseen."
 
-#: src/protocols/jabber/jabber.c:1419
+#: src/protocols/jabber/jabber.c:1426
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: src/protocols/jabber/jabber.c:1423
+#: src/protocols/jabber/jabber.c:1432
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1438
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [huone]: Kutsu käyttäjä huoneeseen."
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;huone&gt; [palvelin]: Liity chattiin tällä palvelimella."
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1450
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: src/protocols/jabber/jabber.c:1439
+#: src/protocols/jabber/jabber.c:1455
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msh &lt;käyttäjä&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle."
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1470
 msgid "Hide Operating System"
 msgstr "Piilota käyttöjärjestelmä"
 
@@ -6273,24 +6297,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1582
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1587
 msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1592
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -6309,16 +6333,16 @@
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: src/protocols/jabber/message.c:228
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: src/protocols/jabber/message.c:291
+#: src/protocols/jabber/message.c:293
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
@@ -6327,20 +6351,20 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-parsinnassa"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:230
 #, 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:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:285
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6348,20 +6372,20 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:287
 msgid "Configure Room"
 msgstr "Aseta huoneen asetukset"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289
 msgid "Accept Defaults"
 msgstr "Hyväksy oletusasetukset"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe chatissä: %s"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:314
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä chättiin %s"
@@ -6381,11 +6405,11 @@
 msgid "Miscellaneous error"
 msgstr "Sekalainen virhe"
 
-#: src/protocols/msn/cmdproc.c:338
+#: src/protocols/msn/cmdproc.c:339
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
-#: src/protocols/msn/cmdproc.c:340
+#: src/protocols/msn/cmdproc.c:341
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
@@ -6434,7 +6458,7 @@
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
@@ -6582,8 +6606,8 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
@@ -6669,40 +6693,49 @@
 msgid "Page"
 msgstr "Lähetä"
 
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
 #: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2725
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2894
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
-#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
 msgid "Busy"
 msgstr "Varattu"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
-#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
 msgid "Hidden"
 msgstr "Piilotettu"
 
@@ -6751,7 +6784,7 @@
 "http://gaim.sf.net/faq-ssl.php."
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:626
+#: src/protocols/zephyr/zephyr.c:635
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
@@ -6766,17 +6799,11 @@
 #: src/protocols/msn/msn.c:1173
 #, c-format
 msgid "<font sml=\"msn\">%s</font><br>"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
 
 #: src/protocols/msn/msn.c:1242
-#, fuzzy
 msgid "MSN Profile"
-msgstr "Aseta profiili"
+msgstr "MSN profiili"
 
 #: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
 #: src/protocols/yahoo/yahoo_profile.c:761
@@ -6784,14 +6811,14 @@
 msgstr "Virhe haettaessa profiilia"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4881
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4867
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6842,37 +6869,37 @@
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Kotisivu"
 
 #: src/protocols/msn/msn.c:1501
 msgid "The user has not created a public profile."
-msgstr ""
+msgstr "Käyttäjällä ei ole julkista profiilia."
 
 #: src/protocols/msn/msn.c:1502
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
-msgstr ""
+msgstr "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
 #: src/protocols/msn/msn.c:1506
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
-msgstr ""
+msgstr "Gaim ei löytänyt mitään tietoja käyttäjän profiilista. Käyttäjää ei todennäköisesti ole olemassa."
 
 #: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "Profiili URL"
 
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1644
 msgid "Display conversation closed notices"
 msgstr "Näytä keskustelu suljettu-viestit"
 
-#: src/protocols/msn/msn.c:1648
+#: src/protocols/msn/msn.c:1649
 msgid "Display timeout notices"
 msgstr "Näytä aikakatkaisuviestit"
 
@@ -6887,15 +6914,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/msn/msn.c:1763
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
@@ -6917,7 +6944,7 @@
 msgstr "Noudetaan tuttavalista"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2315
+#: src/protocols/oscar/oscar.c:2306
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
@@ -7047,8 +7074,8 @@
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6200
+#: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "_Ryhmä"
 
@@ -7356,12 +7383,12 @@
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1936
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:1990
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7371,7 +7398,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2088
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7379,29 +7406,29 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2110
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2419
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
-#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/novell/novell.c:2731 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6504 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 # src/sidebar.c:103
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2742
 msgid "Message"
 msgstr "Viesti"
 
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2897
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3291
 msgid "Initiate _Chat"
 msgstr "Aloita _Chat"
 
@@ -7416,15 +7443,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GrouWise Messenger-protokollaliitännäinen"
 
-#: src/protocols/novell/novell.c:3410
+#: src/protocols/novell/novell.c:3408
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3412
 msgid "Server port"
 msgstr "Palvelimen portti"
 
@@ -7525,169 +7552,167 @@
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: src/protocols/oscar/oscar.c:403
-#, fuzzy
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
-msgstr ""
-"(Tämän viestin muunnoksessa oli virhe. Katso 'koodaus'-optio tilieditorista)"
-
-#: src/protocols/oscar/oscar.c:441
+msgstr "(Tämän viestin muunnoksessa oli virhe. Henkilö jonka kanssa keskustelet käyttää todennäköisesti virheellistä asiakasohjelmaa.)"
+
+#: src/protocols/oscar/oscar.c:425
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:428
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6806
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:441
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:444
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:447
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:450
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:453
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:456
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:459
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:462
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:465
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:468
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:471
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:474
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:477
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: src/protocols/oscar/oscar.c:496
+#: src/protocols/oscar/oscar.c:480
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:500
+#: src/protocols/oscar/oscar.c:484
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:503
+#: src/protocols/oscar/oscar.c:487
 msgid "Live Video"
 msgstr "Video"
 
-#: src/protocols/oscar/oscar.c:506
+#: src/protocols/oscar/oscar.c:490
 msgid "Camera"
 msgstr "Kamera"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6698
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6696
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6697
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:534
+#: src/protocols/oscar/oscar.c:518
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:586
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:595
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: src/protocols/oscar/oscar.c:744
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:732
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:739
 msgid "Direct Connect failed"
 msgstr "Suorayhteys epäonnistui"
 
-#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:911
+#: src/protocols/oscar/oscar.c:897
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Yritetään yhdistää %s @ %s:%h suoraa pikaviestiä varten."
-
-#: src/protocols/oscar/oscar.c:1328
+msgstr "Yritetään yhdistää %s at %s:%hu suoraa pikaviestiä varten."
+
+#: src/protocols/oscar/oscar.c:1314
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
-"Pyydetään %s yhdistämään meihin @ %s:%h suoraa pikaviestiyhteyttä varten."
-
-#: src/protocols/oscar/oscar.c:1333
+"Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä varten."
+
+#: src/protocols/oscar/oscar.c:1319
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
 
-#: src/protocols/oscar/oscar.c:1368
+#: src/protocols/oscar/oscar.c:1354
 #, 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:1372
+#: src/protocols/oscar/oscar.c:1358
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7696,24 +7721,24 @@
 "Haluatko jatkaa? "
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:1362 src/protocols/oscar/oscar.c:3320
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:1458
+#: src/protocols/oscar/oscar.c:1448
 msgid "Chat is currently unavailable"
 msgstr "Chat ei ole parhaillaan käytettävissä"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1529
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: src/protocols/oscar/oscar.c:1553
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7724,48 +7749,48 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: src/protocols/oscar/oscar.c:1581
+#: src/protocols/oscar/oscar.c:1571
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
+#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:1690
+#: src/protocols/oscar/oscar.c:1680
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 # XXX minor but not completely trivial editing of fuzzy text
 # NOTE "file descriptor" translation from ATK sanasto
-#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1798
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1879
+#: src/protocols/oscar/oscar.c:1869
 msgid "Unable to establish listener socket."
 msgstr "Socketin muodostus epäonnistui."
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:2008
+#: src/protocols/oscar/oscar.c:1998
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2002
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2007
 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."
@@ -7775,21 +7800,21 @@
 "pidempään."
 
 # NOTE source: 0.59.8 (+ "%s")
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2012
 #, 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:2054
+#: src/protocols/oscar/oscar.c:2044
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
-#: src/protocols/oscar/oscar.c:2280
+#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
+#: src/protocols/oscar/oscar.c:2271
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7798,24 +7823,24 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-protokollaa "
 "kunnes tämä on korjattu. Tarkista päivitykset: %s "
 
-#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
+#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
 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:2283
+#: src/protocols/oscar/oscar.c:2274
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3312
 #, 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:3324
+#: src/protocols/oscar/oscar.c:3315
 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 "
@@ -7825,19 +7850,19 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3351
 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:3368
+#: src/protocols/oscar/oscar.c:3359
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3390
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7846,23 +7871,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:3404 src/protocols/oscar/oscar.c:3406
+#: src/protocols/oscar/oscar.c:3395 src/protocols/oscar/oscar.c:3397
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
-#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
-#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:6121 src/protocols/oscar/oscar.c:6167
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3453
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3536
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7871,11 +7896,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6127
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7886,17 +7911,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3557
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3573
+#: src/protocols/oscar/oscar.c:3564
 #, 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:3581
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7909,7 +7934,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7922,7 +7947,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3597
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7935,36 +7960,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:3609
 #, 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:3624
+#: src/protocols/oscar/oscar.c:3615
 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:3628
+#: src/protocols/oscar/oscar.c:3619
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3703
 #, 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:3722
+#: src/protocols/oscar/oscar.c:3712
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3721
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7974,7 +7999,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:3740
+#: src/protocols/oscar/oscar.c:3730
 #, 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."
@@ -7982,64 +8007,72 @@
 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:3749
+#: src/protocols/oscar/oscar.c:3739
 #, 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:3758
+#: src/protocols/oscar/oscar.c:3748
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3815 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: src/protocols/oscar/oscar.c:3881
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3869
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:3905
+msgid "Your message did not get sent."
+msgstr "Viestiäsi ei lähetetty."
+
+#: src/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3965
+#, c-format
+msgid "User information not available: %s"
+msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
+
+#: src/protocols/oscar/oscar.c:3967
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3991
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:3994
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4082
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 # NOTE source: 0.59.8 (%d -> %hu)
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4268
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8047,11 +8080,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: src/protocols/oscar/oscar.c:4494
+#: src/protocols/oscar/oscar.c:4486
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4487
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8060,115 +8093,115 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4550
 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:4560
+#: src/protocols/oscar/oscar.c:4552
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:4583
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4854 src/protocols/oscar/oscar.c:4861
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4866 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4867
 msgid "Not specified"
 msgstr "Ei määritelty"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4884
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4888
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4893
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4901
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4909
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4917
+#: src/protocols/oscar/oscar.c:4910
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4918
+#: src/protocols/oscar/oscar.c:4911
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4919
+#: src/protocols/oscar/oscar.c:4912
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:4914
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4924
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4976
+#: src/protocols/oscar/oscar.c:4973
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4994
 #, 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:5001
+#: src/protocols/oscar/oscar.c:4998
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:5018
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5036
 #, 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:5041
+#: src/protocols/oscar/oscar.c:5038
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
@@ -8291,7 +8324,7 @@
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6703
 msgid "Visible"
 msgstr "Näkyvä"
 
@@ -8338,16 +8371,16 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:5998
+#: src/protocols/oscar/oscar.c:5538 src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:6001
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5699
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5700
 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 "
@@ -8356,13 +8389,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
-#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5882 src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:5888 src/protocols/oscar/oscar.c:6045
+#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6051
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8372,11 +8405,11 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5985 src/protocols/oscar/oscar.c:5999
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5999
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8386,7 +8419,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:6079
+#: src/protocols/oscar/oscar.c:6082
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8396,11 +8429,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6088
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6121
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8410,17 +8443,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6163
 #, 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:6161
+#: src/protocols/oscar/oscar.c:6164
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6167
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8431,74 +8464,79 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6168
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6205 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: src/protocols/oscar/oscar.c:6224
+#: src/protocols/oscar/oscar.c:6227
 msgid "Invalid chat name specified."
 msgstr "Virheellinen chat nimi annettu."
 
-#: src/protocols/oscar/oscar.c:6314
+#: src/protocols/oscar/oscar.c:6317
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM chatissä."
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6475
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6762
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "Tuttavakommentti käyttäjälle %s"
+
+#: src/protocols/oscar/oscar.c:6763
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6774
+#: src/protocols/oscar/oscar.c:6782
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6788
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6800
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6817
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6847
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6848
 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:6852
+#: src/protocols/oscar/oscar.c:6855
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6907
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6952
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6955
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6956
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8507,76 +8545,76 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6973
 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:6971
+#: src/protocols/oscar/oscar.c:6974
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6975
 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:6989
+#: src/protocols/oscar/oscar.c:6992
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:6993
 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:7072 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7075 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:7077
+#: src/protocols/oscar/oscar.c:7080
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7086
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7091 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7096
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:7100
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7109
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7113
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7117
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7121
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7128
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:7131
+#: src/protocols/oscar/oscar.c:7134
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7139
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
@@ -8591,15 +8629,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
+#: src/protocols/oscar/oscar.c:7257 src/protocols/oscar/oscar.c:7259
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7278
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7283
 msgid "Auth port"
 msgstr "portti"
 
@@ -8688,12 +8726,12 @@
 msgstr "Aseta pikaviestin salasana"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
+#: src/protocols/silc/ops.c:1277
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
@@ -8706,14 +8744,14 @@
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
+#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
+#: src/protocols/silc/ops.c:1089
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
@@ -8850,37 +8888,36 @@
 msgid "Anxious"
 msgstr "Levoton"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
-#, fuzzy
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
 msgid "User Modes"
-msgstr "Käyttäjätila"
-
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+msgstr "Käyttäjätilat"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "Mood"
 msgstr "Mieliala"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
 msgid "Preferred Language"
 msgstr "Suosittu kieli"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
 msgid "Device"
 msgstr "Laite"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
@@ -8900,7 +8937,7 @@
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
@@ -8922,60 +8959,48 @@
 msgstr "Ei saada kanavatietoja"
 
 #: src/protocols/silc/chat.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "Kanavan nimi:           %s\n"
+msgstr "<b>Kanavan nimi:</b> %s"
 
 #: src/protocols/silc/chat.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<b>Käyttäjä:</b> %s<br>"
+msgstr "<br><b>Käyttäjämäärä:</b> %d"
 
 #: src/protocols/silc/chat.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "Kanavan perustaja:      %s\n"
+msgstr "<br><b>Kanavan perustaja:</b> %s"
 
 #: src/protocols/silc/chat.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "Kanavan salausalgoritmi:                %s\n"
+msgstr "<br><b>Kanavan salausalgoritmi:<b> %s"
 
 #: src/protocols/silc/chat.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "Kanavan HMAC:           %s\n"
+msgstr "<br><b>Kanavan HMAC:</b> %s"
 
 #: src/protocols/silc/chat.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr ""
-"\n"
-"Kanavan aihe:\n"
-"        %s\n"
+msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
 #: src/protocols/silc/chat.c:137
-#, fuzzy
 msgid "<br><b>Channel Modes:</b> "
-msgstr ""
-"\n"
-"Kanavan tilat:\n"
+msgstr "<br><b>Kanavan tilat:</b> "
 
 #: src/protocols/silc/chat.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
-"\n"
-"Perustajan avain Fingerprint\n"
-"%s\n"
-"\n"
+msgstr "<br><b>Perustajan avain Fingerprint</b><br>%s"
 
 #: src/protocols/silc/chat.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr ""
-"Perustajan avain Babbleprint:\n"
-"%s"
+msgstr "<br><b>Perustajan avain Babbleprint:</b><br>%s"
 
 #: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
@@ -9022,7 +9047,7 @@
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
 msgid "Passphrase"
 msgstr "Salasana"
 
@@ -9096,36 +9121,36 @@
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <<I>%s</I> on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1046
+#: src/protocols/silc/chat.c:1039
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -9182,148 +9207,144 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: src/protocols/silc/ops.c:413
+#: src/protocols/silc/ops.c:414
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: src/protocols/silc/ops.c:417
+#: src/protocols/silc/ops.c:418
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: src/protocols/silc/ops.c:448
+#: src/protocols/silc/ops.c:451
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: src/protocols/silc/ops.c:452
+#: src/protocols/silc/ops.c:459
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: src/protocols/silc/ops.c:479
+#: src/protocols/silc/ops.c:488
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:518 src/protocols/silc/ops.c:523
+#: src/protocols/silc/ops.c:528
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
+#: src/protocols/silc/ops.c:559
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Poistettu %s (%s)"
 
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:605
 msgid "Server signoff"
 msgstr "Kirjaa ulos palvelimelta"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:792
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:815
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:819
 msgid "Job Title"
 msgstr "Titteli"
 
-#: src/protocols/silc/ops.c:814
+#: src/protocols/silc/ops.c:823
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:827
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:831
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:850
 msgid "EMail"
 msgstr "Sähköposti"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:855
 msgid "Note"
 msgstr "Huomautus"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:903
 msgid "Join Chat"
 msgstr "Liity Chattiin"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen Fingerprint"
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen Babbleprint"
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1073
 msgid "More..."
 msgstr "Lisää..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1144
 msgid "Cannot detach"
 msgstr "Ei voida irroittaa"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot set topic"
 msgstr "Ei voida asettaa aihetta"
 
-#: src/protocols/silc/ops.c:1184
-#, fuzzy
+#: src/protocols/silc/ops.c:1193
 msgid "Failed to change nickname"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Roomlist"
 msgstr "Huonelista"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Cannot get room list"
 msgstr "Huonelistaa ei saatu"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1278
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1292
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
-#, fuzzy
+#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
 msgid "Server Statistics"
-msgstr "Palvelimen osoite"
-
-#: src/protocols/silc/ops.c:1315
-#, fuzzy
-msgid "Cannot get server statistics"
-msgstr "Ei saada palvelimen tietoja"
+msgstr "Palvelimen tilastoja"
 
 #: src/protocols/silc/ops.c:1324
-#, fuzzy
-msgid "No server statisitics available"
-msgstr "Ei toimintoja saatavilla."
-
-#: src/protocols/silc/ops.c:1346
+msgid "Cannot get server statistics"
+msgstr "Ei saatu palvelimen tilastoja"
+
+#: src/protocols/silc/ops.c:1333
+msgid "No server statistics available"
+msgstr "Palvelimen tilastoja ei saatavilla."
+
+#: src/protocols/silc/ops.c:1355
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9342,103 +9363,115 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-
-#: src/protocols/silc/ops.c:1369
+"Paikallisen palvelimen käynnistysaika: %s\n"
+"Paikallisen palvelimen käynnissäoloaika: %s\n"
+"Paikallisen palvelimen asiakkaat: %d\n"
+"Paikallisen palvelimen kanavat: %d\n"
+"Paikallisen palvelimen operaattorit: %d\n"
+"Paikallisen reitittimen operaattorit: %d\n"
+"Paikallisen solun asiakkaat: %d\n"
+"Paikallisen solun kanavat: %d\n"
+"Paikallisen solun palvelimet: %d\n"
+"Asiakkaat yhteensä: %d\n"
+"Kanavat yhteensä: %d\n"
+"Palvelimet yhteensä: %d\n"
+"Reitittimet yhteensä: %d\n"
+"Palvelinoperaattorit yhteensä: %d\n"
+"Reititinoperaattorit yhteensä: %d\n"
+
+#: src/protocols/silc/ops.c:1378
 msgid "Network Statistics"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
-#, fuzzy
+msgstr "Verkkotilastoja"
+
+#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
 msgid "Ping"
-msgstr "Kaukohaku"
-
-#: src/protocols/silc/ops.c:1377
-#, fuzzy
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1386
 msgid "Ping failed"
-msgstr "Yhteys epäonnistui"
-
-#: src/protocols/silc/ops.c:1382
-#, fuzzy
+msgstr "Ping epäonnistui"
+
+#: src/protocols/silc/ops.c:1391
 msgid "Ping reply received from server"
-msgstr "Kelvoton vastaus palvelimelta"
-
-#: src/protocols/silc/ops.c:1390
+msgstr "Ping-vastaus saatu palvelimelta"
+
+#: src/protocols/silc/ops.c:1399
 msgid "Could not kill user"
 msgstr "Ei voitu poistaa käyttäjää"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1480
 msgid "Error during connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1485
 msgid "Key Exchange failed"
 msgstr "Avaintenvaihto epäonnistui"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1494
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1529
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1591
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1638
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1679
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: src/protocols/silc/ops.c:1699
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Virhe: Versio-virhe, päivitä ohjelmisto"
-
-#: src/protocols/silc/ops.c:1702
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
-
-#: src/protocols/silc/ops.c:1705
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
-
 #: src/protocols/silc/ops.c:1708
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Virhe: Versio-virhe, päivitä ohjelmisto"
 
 #: src/protocols/silc/ops.c:1711
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:a"
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
 #: src/protocols/silc/ops.c:1714
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Virhe: Etäkone ei tue ehdotettua hash-funktiota"
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
 #: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
+
+#: src/protocols/silc/ops.c:1720
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:a"
+
+#: src/protocols/silc/ops.c:1723
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Virhe: Etäkone ei tue ehdotettua hash-funktiota"
+
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
@@ -9591,53 +9624,49 @@
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
 #: src/protocols/silc/silc.c:962
-#, fuzzy
 msgid "Failed to leave channel"
-msgstr "Chattiin liittyminen epäonnistui"
+msgstr "Kanavalta poistuminen epäonnistui"
 
 #: src/protocols/silc/silc.c:1006
-#, fuzzy
 msgid "Topic too long"
-msgstr "Profiili on liian pitkä"
+msgstr "Aihe liian pitkä"
 
 #: src/protocols/silc/silc.c:1087
 msgid "You must specify a nick"
-msgstr ""
+msgstr "Sinun täytyy syöttää lempinimi"
 
 #: src/protocols/silc/silc.c:1189
-#, fuzzy, c-format
+#, c-format
 msgid "channel %s not found"
-msgstr "Konferenssia ei löydy"
+msgstr "Kanavaa %s ei löydy"
 
 #: src/protocols/silc/silc.c:1194
-#, fuzzy, c-format
+#, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s:n aihe on: %s"
+msgstr "kanavan tilat kanavalle %s: %s"
 
 #: src/protocols/silc/silc.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "no channel modes are set on %s"
-msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
+msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
 #: src/protocols/silc/silc.c:1209
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Kuvan tallennus epäonnistui: %s\n"
+msgstr "cmodes asetus epäonnistui, %s"
 
 #: src/protocols/silc/silc.c:1239
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Tuntematon komento: %s"
+msgstr "Tuntematon komento: %s, (mahdollisesti Gaimin virhe)"
 
 #: src/protocols/silc/silc.c:1302
-#, fuzzy
 msgid "part [channel]:  Leave the chat"
-msgstr "part: Poistu chatistä"
+msgstr "part [kanava]:  Poistu chatistä"
 
 #: src/protocols/silc/silc.c:1306
-#, fuzzy
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave: Poistu chatistä"
+msgstr "leave [kanava]:  Poistu chatistä"
 
 #: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
@@ -9655,7 +9684,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
@@ -9672,132 +9701,118 @@
 msgstr "detach: Irroita tämä istunto"
 
 #: src/protocols/silc/silc.c:1343
-#, fuzzy
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
+msgstr "quit [viesti]:  Katkaise yhteys palvelimelle, valinnainen viesti."
 
 #: src/protocols/silc/silc.c:1347
-#, fuzzy
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
-
-#: src/protocols/silc/silc.c:1352
+msgstr "call &lt;komento&gt;: Kutsu mitä vain silc asiakas-komentoa."
+
+#: src/protocols/silc/silc.c:1353
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1356
-#, fuzzy
+msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
+
+#: src/protocols/silc/silc.c:1357
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
-
-#: src/protocols/silc/silc.c:1360
-#, fuzzy
+msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi-)nimesi."
+
+#: src/protocols/silc/silc.c:1361
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
-
-#: src/protocols/silc/silc.c:1364
-#, fuzzy
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
+
+#: src/protocols/silc/silc.c:1365
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr ""
-"mode &lt;nimi|kanava&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Aseta tai poista kanavan "
-"tai käyttäjän tila."
-
-#: src/protocols/silc/silc.c:1368
-#, fuzzy
+msgstr "cmode &lt;kanava&gt; [+|-&lt;tilagt;] [argumentit]: Aseta tai näytä kanavan tila."
+
+#: src/protocols/silc/silc.c:1369
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
-msgstr ""
-"mode &lt;nimi|kanava&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Aseta tai poista kanavan "
-"tai käyttäjän tila."
-
-#: src/protocols/silc/silc.c:1372
-#, fuzzy
+msgstr "cumode &lt;kanava&gt; +|-&lt;tilagt;: Muuta nimen tilaa kanavalla."
+
+#: src/protocols/silc/silc.c:1373
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;käyttäjätilat&gt;: Aseta itsellesi käyttäjätilavalinnat"
-
-#: src/protocols/silc/silc.c:1376
+msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
+
+#: src/protocols/silc/silc.c:1377
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1380
-#, fuzzy
+msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
+
+#: src/protocols/silc/silc.c:1381
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
-msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
-
-#: src/protocols/silc/silc.c:1384
+msgstr "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista kanavan kutsu-listalta"
+
+#: src/protocols/silc/silc.c:1385
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1388
+msgstr "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
+
+#: src/protocols/silc/silc.c:1389
 msgid "info [server]:  View server administrative details"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1392
-#, fuzzy
+msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
+
+#: src/protocols/silc/silc.c:1393
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
-
-#: src/protocols/silc/silc.c:1396
+msgstr "ban &lt;kanava&gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
+
+#: src/protocols/silc/silc.c:1397
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1400
+msgstr "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
+
+#: src/protocols/silc/silc.c:1401
 msgid "stats:  View server and network statistics"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1404
+msgstr "stats:  Näytä palvelimen ja verkon tilastot"
+
+#: src/protocols/silc/silc.c:1405
 msgid "ping:  Send PING to the connected server"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1409
-#, fuzzy
+msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
+
+#: src/protocols/silc/silc.c:1410
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
-
-#: src/protocols/silc/silc.c:1413
+msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
+
+#: src/protocols/silc/silc.c:1414
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1425
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanava(t)&gt;: Näytä tietyt käyttäjät kanavilla"
+
+#: src/protocols/silc/silc.c:1426
 msgid "Instant Messages"
 msgstr "Pikaviestit"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1431
 msgid "Digitally sign all IM messages"
 msgstr "Allekirjoita kaikki pikaviestit digitaalisesti"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1436
 msgid "Verify all IM message signatures"
 msgstr "Tarkista kaikki pikaviesti allekirjoitukset"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1439
 msgid "Channel Messages"
 msgstr "Kanavaviestit"
 
-#: src/protocols/silc/silc.c:1443
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all channel messages"
 msgstr "Allekirjoita kaikki kanavaviestit digitaalisesti"
 
-#: src/protocols/silc/silc.c:1448
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all channel message signatures"
 msgstr "Tarkista kaikki kanavan viesti-allekirjoitukset"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1452
 msgid "Default SILC Key Pair"
 msgstr "Oletus SILC avainpari"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Public Key"
 msgstr "SILC julkinen avain"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1462
 msgid "SILC Private Key"
 msgstr "SILC Yksityinen avain"
 
@@ -9811,40 +9826,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1547
+#: src/protocols/silc/silc.c:1548
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokollaplugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1549
+#: src/protocols/silc/silc.c:1550
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokolla"
 
-#: src/protocols/silc/silc.c:1579
+#: src/protocols/silc/silc.c:1580
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: src/protocols/silc/silc.c:1585
+#: src/protocols/silc/silc.c:1586
 msgid "Public Key File"
 msgstr "Julkinen avaintiedosto"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1590
 msgid "Private Key File"
 msgstr "Yksityinen avaintiedosto"
 
-#: src/protocols/silc/silc.c:1594
+#: src/protocols/silc/silc.c:1595
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: src/protocols/silc/silc.c:1597
+#: src/protocols/silc/silc.c:1598
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1601
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolo-tilan atribuuttipyynnöt"
 
@@ -9886,9 +9901,9 @@
 msgstr "Maa: \t%s\n"
 
 #: src/protocols/silc/util.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "Algoritmi: \t\t%s\n"
+msgstr "Algoritmi: \t%s\n"
 
 #: src/protocols/silc/util.c:322
 #, c-format
@@ -10069,15 +10084,15 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:891
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:895
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC on lähettänyt PAUSE-komennon."
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:896
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10087,45 +10102,45 @@
 "voi potkaista sinut ulos jos lähetät viestin. Gaim estää kaiken läpimenon. "
 "Tämä on vain väliaikaista, ole kärsivällinen."
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1410
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "Aseta hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1668
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1704
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
+#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
 msgid "Could not connect for transfer."
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa."
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1946
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2046
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimellä..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2080
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
 msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
@@ -10141,15 +10156,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "TOC-portti"
 
@@ -10314,9 +10329,8 @@
 msgstr "Epäkelpo käyttäjänimi."
 
 #: src/protocols/yahoo/yahoo.c:1825
-#, fuzzy
 msgid "Normal authencation failed!"
-msgstr "Todennus epäonnistui"
+msgstr "Tavallinen tunnistautumismenetelmä epäonnistui!"
 
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
@@ -10324,7 +10338,7 @@
 "is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
 "attempt to log in using Web Messenger authencation, will which result in "
 "reduced functionality and features."
-msgstr ""
+msgstr "Tavallinen tunnistautumismenetelmä on epäonnistunut. Tämä tarkoittaa joko sitä että salasanasi on väärin, tai Yahoo!:n tunnistautumismenetelmä on muuttunut. Gaim yrittää nyt kirjautua käyttäen Web Messenger-tunnistautumista josta seuraa vähentynyt toiminnallisuus ja ominaisuudet."
 
 #: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
@@ -10338,7 +10352,7 @@
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Tuntematon viesti numero &d. Kirjautumalla Yahoo! verkkosivuille saattaa "
+"Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
 #: src/protocols/yahoo/yahoo.c:1894
@@ -10347,79 +10361,72 @@
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: src/protocols/yahoo/yahoo.c:1896
+#: src/protocols/yahoo/yahoo.c:1897
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
+#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:3014
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
-#: src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3016
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3018
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2634
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2736
 msgid "Join in Chat"
 msgstr "Liity chattiin"
 
-#: src/protocols/yahoo/yahoo.c:2698
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2759
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään chatissä?"
 
-#: src/protocols/yahoo/yahoo.c:2769
+#: src/protocols/yahoo/yahoo.c:2812
 msgid "Activate ID..."
 msgstr "Aktivoi ID..."
 
-#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2816
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
@@ -10434,52 +10441,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokollaliitännäinen"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "Japan Pager host"
 msgstr "Isäntä (Japani)"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Pager port"
 msgstr "Portti"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Japan File transfer host"
 msgstr "Tiedostosiirtopalvelin (Japani)"
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Chat Room List Url"
 msgstr "Chathuonelista Url"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "YCHT Host"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3340
-#, fuzzy
+msgstr "YCHT Isäntä"
+
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "YCHT Port"
-msgstr "Portti"
+msgstr "YCHT portti"
 
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
@@ -10495,14 +10501,12 @@
 msgstr "<b>IP-osoite:</b> %s<br>"
 
 #: src/protocols/yahoo/yahoo_profile.c:749
-#, fuzzy
 msgid "Yahoo! Japan Profile"
-msgstr "Yahoo Japan"
+msgstr "Yahoo! Japan profiili"
 
 #: src/protocols/yahoo/yahoo_profile.c:750
-#, fuzzy
 msgid "Yahoo! Profile"
-msgstr "Profiili"
+msgstr "Yahoo! Profiili"
 
 #: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
@@ -10567,46 +10571,46 @@
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
-msgstr ""
+msgstr "Ei voitu hakea käyttäjän profiilia. Tämä on todennäköisesti väliaikainen palvelimen ongelma. Ole hyvä ja yritä myöhemmin uudestaan."
 
 #: src/protocols/yahoo/yahoo_profile.c:1155
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
-msgstr ""
+msgstr "Ei voitu hakea käyttäjän profiilia. Tämä todennäköisesti tarkoittaa sitä että käyttäjää ei ole; kuitenkin Yahoo! joskus epäonnistuu löytämään käyttäjän profiilin. Jos olet varma että käyttäjä on olemassa, yritä myöhemmin uudelleen."
 
 #: src/protocols/yahoo/yahoo_profile.c:1163
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:193
 #, 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:205
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "Chattiin liittyminen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "Ehkä huone on täynnä?"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan chat-huoneeseen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole chatissä?"
 
@@ -10634,120 +10638,106 @@
 msgid "User Rooms"
 msgstr "Käyttäjän Huoneet"
 
-#: src/protocols/zephyr/zephyr.c:589
+#: src/protocols/yahoo/ycht.c:401
+msgid "Connection problem with the YCHT server."
+msgstr "Yhteysvirhe YCHT palvelimen kanssa"
+
+#: src/protocols/zephyr/zephyr.c:598
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Ei voida lähettää chattiin %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:624
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:628
+#: src/protocols/zephyr/zephyr.c:637
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
 # TODO
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:642
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
 # Context unclear.
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: src/protocols/zephyr/zephyr.c:1011
-msgid "Already logged in with Zephyr"
-msgstr "Zephyriin jo kirjauduttu"
-
-#: src/protocols/zephyr/zephyr.c:1011
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr ""
-"Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin yhtä "
-"tiliä."
-
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1401
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1412
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1678
-#, fuzzy
+msgstr "Yritys tilata %s,%s,%s epäonnistui"
+
+#: src/protocols/zephyr/zephyr.c:1681
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "whois &lt;nimi&gt;: Hae tietoja käyttäjästä."
-
-#: src/protocols/zephyr/zephyr.c:1683
-#, fuzzy
+msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
+
+#: src/protocols/zephyr/zephyr.c:1686
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "whois &lt;nimi&gt;: Hae tietoja käyttäjästä."
-
-#: src/protocols/zephyr/zephyr.c:1688
-#, fuzzy
+msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
+
+#: src/protocols/zephyr/zephyr.c:1691
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
-
-#: src/protocols/zephyr/zephyr.c:1693
-#, fuzzy
+msgstr "instance &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
+
+#: src/protocols/zephyr/zephyr.c:1696
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
-
-#: src/protocols/zephyr/zephyr.c:1699
+msgstr "inst &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
+
+#: src/protocols/zephyr/zephyr.c:1702
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1704
+msgstr "sub &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Liity uuteen chattiin"
+
+#: src/protocols/zephyr/zephyr.c:1707
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1710
+msgstr "zi &lt;ilmentymä&gt;: Lähetä viesti &lt;viesti,<i>ilmentymä</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1713
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1716
+msgstr "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,<i>ilmentymä</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1719
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1722
+msgstr "zcir &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;<i>luokka</i>,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1725
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1727
+msgstr "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1730
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1802
-#, fuzzy
+msgstr "zc &lt;luokka&gt;: Lähetä viesti &lt;<i>luokka</i>,YKSITYINEN,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1806
 msgid "Resubscribe"
-msgstr "Poista listalta"
-
-#: src/protocols/zephyr/zephyr.c:1805
-#, fuzzy
+msgstr "Uudelleentilaa"
+
+#: src/protocols/zephyr/zephyr.c:1809
 msgid "Retrieve subscriptions from server"
-msgstr "Kelvoton vastaus palvelimelta"
+msgstr "Hae tilaukset palvelimelta"
 
 #. *< api_version
 #. *< type
@@ -10760,20 +10750,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
-#: src/protocols/zephyr/zephyr.c:1906
+#: src/protocols/zephyr/zephyr.c:1910
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 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:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Exposure"
 msgstr "Altistus"
 
@@ -10802,7 +10792,7 @@
 "Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle. "
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:171
 msgid "Custom"
 msgstr "Oma"
 
@@ -10817,63 +10807,63 @@
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:528
+#: src/server.c:534
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: src/server.c:938
+#: src/server.c:945
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d viesti)"
 msgstr[1] "(%d viestiä)"
 
-#: src/server.c:952
+#: src/server.c:959
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:1180 src/server.c:1189
+#: src/server.c:1188 src/server.c:1197
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/server.c:1201
+#: src/server.c:1209
 #, c-format
 msgid "%s signed on"
 msgstr "%s kirjautui sisään"
 
-#: src/server.c:1216
+#: src/server.c:1224
 #, c-format
 msgid "%s came back"
 msgstr "%s palasi"
 
-#: src/server.c:1218
+#: src/server.c:1226
 #, c-format
 msgid "%s went away"
 msgstr "%s on poissa"
 
-#: src/server.c:1232
+#: src/server.c:1240
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: src/server.c:1243
+#: src/server.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: src/server.c:1253 src/server.c:1260
+#: src/server.c:1261 src/server.c:1268
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/server.c:1273
+#: src/server.c:1281
 #, c-format
 msgid "%s signed off"
 msgstr "%s on kirjautui ulos"
 
-#: src/server.c:1335
+#: src/server.c:1343
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10882,11 +10872,11 @@
 "Tiliä %s on juuri varoittanut %s.\n"
 "Uusi varoitustasosi on %d%%"
 
-#: src/server.c:1338
+#: src/server.c:1346
 msgid "an anonymous person"
 msgstr "nimetön käyttäjä"
 
-#: src/server.c:1448
+#: src/server.c:1456
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10895,12 +10885,12 @@
 "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 "%s"
 
-#: src/server.c:1452
+#: src/server.c:1460
 #, 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:1458
+#: src/server.c:1466
 msgid "Accept chat invitation?"
 msgstr "Hyväksy kutsu?"
 
@@ -10937,11 +10927,10 @@
 msgstr "Tuntematon."
 
 #: src/util.c:2392
-#, fuzzy
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "Kuvake"
-msgstr[1] "Kuvake"
+msgstr[0] "sekunti"
+msgstr[1] "sekuntia"
 
 #: src/util.c:2406
 msgid "day"
@@ -10977,6 +10966,34 @@
 msgid "Notification"
 msgstr "Ilmoitus"
 
+#~ msgid "sorry, i ran out for a while. bbl"
+#~ msgstr "Hetkisen poissa."
+
+#~ msgid "boring default"
+#~ msgstr "Tylsä perusviesti"
+
+#~ msgid "help:  List available commands."
+#~ msgstr "help: Listaa saatavillaolevat komennot."
+
+#~ msgid "_Ignore formatting on incoming messages"
+#~ msgstr "_Sivuuta muotoilut tulevissa viesteissä"
+
+#~ msgid "_Send auto-response"
+#~ msgstr "_Lähetä automaattinen vastaus"
+
+#~ msgid "_Only send auto-response when idle"
+#~ msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
+
+#~ msgid "Already logged in with Zephyr"
+#~ msgstr "Zephyriin jo kirjauduttu"
+
+#~ msgid ""
+#~ "Because Zephyr uses your system username, you are unable to have multiple "
+#~ "accounts on it when logged in as the same user."
+#~ msgstr ""
+#~ "Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin "
+#~ "yhtä tiliä."
+
 #~ msgid "Invalid Groupname"
 #~ msgstr "Epäkelpo ryhmänimi"
 
@@ -11319,9 +11336,6 @@
 #~ msgid "<b>Screen Name:</b>"
 #~ msgstr "<b>Näyttönimi:</b>"
 
-#~ msgid "Sign on"
-#~ msgstr "Kirjaudu"
-
 #~ msgid "Unable to send password"
 #~ msgstr "Ei kyetty lähettämään salasanaa"