# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1073447031 0
# Node ID bb2f37bfc9270ed7c119c2c8d2106005f67cc65a
# Parent  1468f543779b649270defd6282bfaee9d8ba80f6
[gaim-migrate @ 8712]
update

committer: Tailor Script <tailor@pidgin.im>

diff -r 1468f543779b -r bb2f37bfc927 po/fi.po
--- a/po/fi.po	Wed Jan 07 03:40:13 2004 +0000
+++ b/po/fi.po	Wed Jan 07 03:43:51 2004 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: gaim 0.75\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-19 09:35+0200\n"
-"PO-Revision-Date: 2003-12-19 09:38+0200\n"
+"POT-Creation-Date: 2004-01-07 05:23+0200\n"
+"PO-Revision-Date: 2004-01-07 05:26+0200\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -137,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -153,12 +153,12 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2532 src/gtkpounce.c:411
-#: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
-#: src/protocols/oscar/oscar.c:6163
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2552 src/gtkpounce.c:411
+#: src/gtkprefs.c:1457 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:965 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5545
+#: src/protocols/oscar/oscar.c:6146
 msgid "Away"
 msgstr "Poissa"
 
@@ -178,11 +178,11 @@
 msgstr "Tiedostosiirtot"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2333 src/main.c:329
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -805,7 +805,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:793
+#: plugins/statenotify.c:30 src/gtkpounce.c:799
 #, c-format
 msgid "%s has gone away."
 msgstr "%s on poissa."
@@ -925,7 +925,7 @@
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
@@ -977,8 +977,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2366
-#: src/gtkprefs.c:2266
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2386
+#: src/gtkprefs.c:2256
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -997,8 +997,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:882
-#: src/gtkprefs.c:2267
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
+#: src/gtkprefs.c:2257
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1015,11 +1015,15 @@
 msgstr "Spesifiset asetukset Windows Gaimille."
 
 #: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
-msgstr "Tietoja Gaimista v%s"
-
-#: src/about.c:89
+msgid "About Gaim"
+msgstr "Gaim:ista"
+
+#: src/about.c:72
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/about.c:92
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1030,297 +1034,294 @@
 "protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:aa ja on lisensoitu "
 "GPL:n mukaisesti.<BR><BR>"
 
-#: src/about.c:99
+#: src/about.c:102
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"3\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
 # NOTE source: 0.59.8
-#: src/about.c:104
+#: src/about.c:107
 msgid "Active Developers"
 msgstr "Aktiiviset kehittäjät"
 
 # NOTE source: 0.59.8
-#: src/about.c:105
+#: src/about.c:108
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: src/about.c:107
+#: src/about.c:110
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: src/about.c:110
+#: src/about.c:113
 msgid "developer & webmaster"
 msgstr "Kehittäjä & verkkosivujen ylläpitäjä"
 
-#: src/about.c:111
+#: src/about.c:114
 msgid "win32 port"
 msgstr "win32 käännös"
 
 # NOTE source: 0.59.8 (plural -> singular)
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:117 src/about.c:118 src/about.c:119
 msgid "developer"
 msgstr "kehittäjä"
 
-#: src/about.c:117
+#: src/about.c:120
 msgid "support"
 msgstr "tuki"
 
-#: src/about.c:124
+#: src/about.c:127
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:138
+#: src/about.c:141
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:139
+#: src/about.c:142
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:140
+#: src/about.c:143
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:143
+#: src/about.c:146
 msgid "former maintainer"
 msgstr "entinen ylläpitäjä"
 
-#: src/about.c:144
+#: src/about.c:147
 msgid "former Jabber developer"
 msgstr "entinen Jabber-ylläpitäjä"
 
-#: src/about.c:145
+#: src/about.c:148
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:148
+#: src/about.c:151
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:156
+#: src/about.c:159
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
 # NOTE source: netscape
-#: src/about.c:157 src/about.c:190
+#: src/about.c:160 src/about.c:193
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:158 src/about.c:191
+#: src/about.c:161 src/about.c:194
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/about.c:159
+#: src/about.c:162
 msgid "Danish"
 msgstr "Tanska"
 
-#: src/about.c:160
+#: src/about.c:163
 msgid "British English"
 msgstr "Brittienglanti"
 
-#: src/about.c:161 src/about.c:192
+#: src/about.c:164 src/about.c:195
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:162 src/about.c:193
+#: src/about.c:165 src/about.c:196
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:163 src/about.c:194
+#: src/about.c:166 src/about.c:197
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:167 src/about.c:198
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:165
+#: src/about.c:168
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:166
+#: src/about.c:169
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:167 src/about.c:197
+#: src/about.c:170 src/about.c:200
 msgid "Italian"
 msgstr "Italia"
 
 # NOTE source: netscape
-#: src/about.c:168 src/about.c:199
+#: src/about.c:171 src/about.c:202
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:169
+#: src/about.c:172
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
 # NOTE source: netscape
-#: src/about.c:170
+#: src/about.c:173
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:171 src/about.c:200
+#: src/about.c:174 src/about.c:203
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:172
+#: src/about.c:175
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:173
+#: src/about.c:176
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:174
+#: src/about.c:177
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:175 src/about.c:201
+#: src/about.c:178 src/about.c:204
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:176
+#: src/about.c:179
 msgid "Serbian"
 msgstr "Serbia"
 
-#: src/about.c:177 src/about.c:203
+#: src/about.c:180 src/about.c:206
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: src/about.c:178
+#: src/about.c:181
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: src/about.c:178
+#: src/about.c:181
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi-työryhmä"
 
 # XXX source: netscape + google
-#: src/about.c:179
+#: src/about.c:182
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:180
+#: src/about.c:183
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
-#: src/about.c:187
+#: src/about.c:190
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Amharic"
 msgstr "Amhara"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: src/about.c:196
+#: src/about.c:199
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/about.c:198
+#: src/about.c:201
 msgid "Japanese"
 msgstr "Japani"
 
 # NOTE source: netscape
-#: src/about.c:202
+#: src/about.c:205
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:204
+#: src/about.c:207
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
-msgid "Close"
-msgstr "Sulje"
-
-#: src/account.c:275 src/protocols/jabber/jabber.c:978
+#: src/account.c:272 src/protocols/jabber/jabber.c:1017
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: src/account.c:283
+#: src/account.c:280
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: src/account.c:308
+#: src/account.c:305
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: src/account.c:314
+#: src/account.c:311
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: src/account.c:320
+#: src/account.c:317
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/account.c:325
+#: src/account.c:322
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: src/account.c:333
+#: src/account.c:330
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
-#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
-#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
-#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2406
-#: src/request.h:852
+#: src/account.c:333 src/connection.c:193 src/dialogs.c:1488
+#: src/dialogs.c:1505 src/dialogs.c:1524 src/gtkblist.c:1742
+#: src/gtkrequest.c:190 src/protocols/jabber/jabber.c:1062
+#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:6196
+#: src/protocols/oscar/oscar.c:6292 src/protocols/oscar/oscar.c:6341
+#: src/protocols/oscar/oscar.c:6423 src/protocols/yahoo/yahoo.c:2398
+#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1018
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
-#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
-#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
-#: src/gtkblist.c:3681 src/gtkconn.c:149 src/gtkprivacy.c:568
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
-#: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
-#: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
-#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
-#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
-#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
-#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2399
-#: src/protocols/yahoo/yahoo.c:2407 src/request.h:852 src/request.h:862
+#: src/account.c:334 src/account.c:368 src/connection.c:194 src/dialogs.c:351
+#: src/dialogs.c:363 src/dialogs.c:376 src/dialogs.c:397 src/dialogs.c:1322
+#: src/dialogs.c:1489 src/dialogs.c:1506 src/dialogs.c:1525
+#: src/gtkaccount.c:1612 src/gtkaccount.c:2081 src/gtkblist.c:1743
+#: src/gtkblist.c:3701 src/gtkconn.c:167 src/gtkprivacy.c:569
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:607 src/gtkprivacy.c:618
+#: src/gtkrequest.c:191 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:1063 src/protocols/jabber/xdata.c:335
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2417
+#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6024
+#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6293
+#: src/protocols/oscar/oscar.c:6342 src/protocols/oscar/oscar.c:6407
+#: src/protocols/oscar/oscar.c:6424 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
+#: src/request.h:1018 src/request.h:1028
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/account.c:363
+#: src/account.c:360
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
 # src/menus.c:280
-#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
+#: src/account.c:367 src/dialogs.c:1310 src/gtkrequest.c:197
 #: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Tallenna"
@@ -1345,16 +1346,16 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/blist.c:566 src/gtkprefs.c:2269
+#: src/blist.c:576 src/gtkprefs.c:2259
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
-#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3148
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
+#: src/blist.c:671 src/blist.c:858 src/blist.c:2077 src/gtkblist.c:3168
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/blist.c:1148
+#: src/blist.c:1158
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1365,30 +1366,30 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1157
+#: src/blist.c:1167
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
-#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
+#: src/protocols/jabber/auth.c:135 src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/blist.c:1530
+#: src/blist.c:1544
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmänimi"
 
-#: src/blist.c:2180
+#: src/blist.c:2194
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "Virhe jäsenneltäessä tuttavalistaa. Sitä ei ole ladattu."
 
 # XXX probably better than forming yet another new compound?
-#: src/blist.c:2182
+#: src/blist.c:2196
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
-#: src/buddy_chat.c:212 src/gtkblist.c:3571
+#: src/buddy_chat.c:212 src/gtkblist.c:3591
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1400,7 +1401,7 @@
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/buddy_chat.c:225 src/gtkblist.c:924
+#: src/buddy_chat.c:225 src/gtkblist.c:926
 msgid "_Join"
 msgstr "_Liity"
 
@@ -1410,7 +1411,7 @@
 "join.\n"
 msgstr "Anna tiedot chatistä johon haluat liittyä.\n"
 
-#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
+#: src/buddy_chat.c:253 src/dialogs.c:587 src/dialogs.c:662
 #: src/gtkpounce.c:358
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
@@ -1435,75 +1436,75 @@
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:327
+#: src/conversation.c:297
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:335
+#: src/conversation.c:305
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1916
+#: src/conversation.c:1898
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1919
+#: src/conversation.c:1901
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:2004
+#: src/conversation.c:1986
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2046
+#: src/conversation.c:2028
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2048
+#: src/conversation.c:2030
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2121
+#: src/conversation.c:2103
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2105
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2405
+#: src/conversation.c:2387
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
 # XXX
-#: src/conversation.c:2407
+#: src/conversation.c:2389
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2409
+#: src/conversation.c:2391
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2411
+#: src/conversation.c:2393
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: src/dialogs.c:201
+#: src/dialogs.c:200
 msgid "Warn User"
 msgstr "Varoita käyttäjää"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:203
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: src/dialogs.c:220
+#: src/dialogs.c:219
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1514,25 +1515,25 @@
 "Tämä nostaa %s:n varoitustasoa ja hän tulee saamaan kovemman "
 "taajuusrajoituksen.\n"
 
-#: src/dialogs.c:229
+#: src/dialogs.c:228
 msgid "Warn _anonymously?"
 msgstr "Varoitako _nimettömänä?"
 
-#: src/dialogs.c:236
+#: src/dialogs.c:235
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Nimettömät varoitukset ovat vähemmän ankaria.</b>"
 
-#: src/dialogs.c:349
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa '%s':n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:351 src/dialogs.c:352
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:359
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1541,11 +1542,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä '%s' tuttavalistaltasi.  Haluatko "
 "jatkaa?"
 
-#: src/dialogs.c:363 src/dialogs.c:364
+#: src/dialogs.c:361 src/dialogs.c:362
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: src/dialogs.c:373
+#: src/dialogs.c:371
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1553,12 +1554,12 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä '%s' tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:376 src/dialogs.c:377
+#: src/dialogs.c:374 src/dialogs.c:375
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
 # TODO Untranslated
-#: src/dialogs.c:394
+#: src/dialogs.c:392
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1568,125 +1569,125 @@
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
 # NOTE source: 0.59.8/0.60
-#: src/dialogs.c:397 src/dialogs.c:398
+#: src/dialogs.c:395 src/dialogs.c:396
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:543
+#: src/dialogs.c:541
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/dialogs.c:561
+#: src/dialogs.c:559
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Syötä sen henkilön näyttönimi, jolle haluat lähettää pikaviestin.\n"
 
-#: src/dialogs.c:573 src/dialogs.c:648
+#: src/dialogs.c:571 src/dialogs.c:646
 msgid "_Screenname:"
 msgstr "_Näyttönimi:"
 
-#: src/dialogs.c:618
+#: src/dialogs.c:616
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: src/dialogs.c:636
+#: src/dialogs.c:634
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Syötä sen henkilön näyttönimi, jonka tiedot haluat nähdä.\n"
 
-#: src/dialogs.c:757
+#: src/dialogs.c:740
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: src/dialogs.c:759
+#: src/dialogs.c:742
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/dialogs.c:782
+#: src/dialogs.c:767
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr ""
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. Kuvaus on valinnainen.\n"
 
-#: src/dialogs.c:795
+#: src/dialogs.c:780
 msgid "_URL:"
 msgstr "_URL:"
 
-#: src/dialogs.c:808
+#: src/dialogs.c:793
 msgid "_Description:"
 msgstr "_Kuvaus:"
 
-#: src/dialogs.c:937 src/dialogs.c:954
+#: src/dialogs.c:924 src/dialogs.c:941
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: src/dialogs.c:989 src/dialogs.c:1006
+#: src/dialogs.c:976 src/dialogs.c:993
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: src/dialogs.c:1091 src/dialogs.c:1117
+#: src/dialogs.c:1078 src/dialogs.c:1104
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1168
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviestiä tyhjällä otsikolla"
 
-#: src/dialogs.c:1185
+#: src/dialogs.c:1170
 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:1195
+#: src/dialogs.c:1180
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:1260 src/dialogs.c:1268
+#: src/dialogs.c:1242
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:1278
+#: src/dialogs.c:1263
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:1326
+#: src/dialogs.c:1314
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
-#: src/dialogs.c:1330
+#: src/dialogs.c:1318
 msgid "Use"
 msgstr "Käytä"
 
 #. show everything
-#: src/dialogs.c:1471
+#: src/dialogs.c:1467
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:1489
+#: src/dialogs.c:1485
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1486
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: src/dialogs.c:1506
+#: src/dialogs.c:1502
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-#: src/dialogs.c:1507
+#: src/dialogs.c:1503
 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:1524
+#: src/dialogs.c:1520
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: src/dialogs.c:1526
+#: src/dialogs.c:1522
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
@@ -1802,15 +1803,15 @@
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2328
+#: src/gaimrc.c:1259 src/gtkblist.c:2348
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2329
+#: src/gaimrc.c:1261 src/gtkblist.c:2349
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2330
+#: src/gaimrc.c:1263 src/gtkblist.c:2350
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
@@ -1819,7 +1820,7 @@
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
 
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:285
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1830,178 +1831,178 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3080
+#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:369
+#: src/gtkaccount.c:367
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:384
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:391
+#: src/gtkaccount.c:389
 msgid "Screenname:"
 msgstr "Näyttönimi:"
 
-#: src/gtkaccount.c:464 src/main.c:307
+#: src/gtkaccount.c:462 src/main.c:308
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3308 src/gtkblist.c:3630
+#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:471
 msgid "Remember password"
 msgstr "Muista salasana"
 
 # XXX could be wrong
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:525
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:538
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:547
 msgid "Buddy icon file:"
 msgstr "Tuttavakuvaketiedosto:"
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:556
 msgid "_Browse"
 msgstr "_Selaa"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:562
 msgid "_Reset"
 msgstr "_Nollaa"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:624
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:739
 msgid "Use Global Proxy Settings"
 msgstr "Käytä globaalia proxy-asetusta"
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:746
 msgid "No Proxy"
 msgstr "Ei välityspalvelinta"
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:753
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:760
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:767
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1103
+#: src/gtkaccount.c:774 src/gtkprefs.c:1091
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:807
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:811
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:827
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1097
+#: src/gtkaccount.c:843 src/gtkprefs.c:1085
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:860 src/gtkprefs.c:1127
+#: src/gtkaccount.c:852 src/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:864 src/gtkprefs.c:1144
+#: src/gtkaccount.c:856 src/gtkprefs.c:1132
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:864
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:877 src/gtkprefs.c:1179
+#: src/gtkaccount.c:869 src/gtkprefs.c:1167
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: src/gtkaccount.c:1218
+#: src/gtkaccount.c:1208
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/gtkaccount.c:1220
+#: src/gtkaccount.c:1210
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1234
 msgid "Show more options"
 msgstr "Näytä enemmän valintoja"
 
-#: src/gtkaccount.c:1245
+#: src/gtkaccount.c:1235
 msgid "Show fewer options"
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:650
+#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: src/gtkaccount.c:1617
+#: src/gtkaccount.c:1607
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/gtkaccount.c:1621 src/gtkrequest.c:199
+#: src/gtkaccount.c:1611 src/gtkrequest.c:194
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:1735
+#: src/gtkaccount.c:1725
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2193
+#: src/gtkaccount.c:1748 src/protocols/jabber/jabber.c:963
+#: src/protocols/oscar/oscar.c:2848 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6145 src/protocols/yahoo/yahoo.c:2193
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:1776
+#: src/gtkaccount.c:1766
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2066
+#: src/gtkaccount.c:2056
 #, 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:2080
+#: src/gtkaccount.c:2070
 msgid ""
 "\n"
 "\n"
@@ -2011,77 +2012,77 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2084
+#: src/gtkaccount.c:2074
 msgid "Information"
 msgstr "Tiedot"
 
-#: src/gtkaccount.c:2088
+#: src/gtkaccount.c:2078
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: src/gtkaccount.c:2090 src/gtkblist.c:3680 src/gtkconv.c:1272
-#: src/gtkconv.c:3197 src/gtkconv.c:4402 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
+#. Add button
+#: src/gtkaccount.c:2080 src/gtkblist.c:3700 src/gtkconv.c:1256
+#: src/gtkconv.c:3239 src/gtkconv.c:3330 src/gtkrequest.c:195
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2690
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:813
+#: src/gtkblist.c:815
 msgid "_Get Info"
 msgstr "_Hae tiedot"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:818
 msgid "_IM"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:818
+#: src/gtkblist.c:820
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:820
+#: src/gtkblist.c:822
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:425
-#: src/gtkconn.c:461
+#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:905
+#: src/gtkblist.c:907
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:907
+#: src/gtkblist.c:909
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:909
+#: src/gtkblist.c:911
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:911
+#: src/gtkblist.c:913
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 # XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:926
+#: src/gtkblist.c:928
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:950 src/gtkblist.c:985
+#: src/gtkblist.c:952 src/gtkblist.c:987
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:990
+#: src/gtkblist.c:992
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1389 src/gtkconv.c:3918
+#: src/gtkblist.c:1391 src/gtkconv.c:4006
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2089,122 +2090,122 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:1680
+#: src/gtkblist.c:1690
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:1681
+#: src/gtkblist.c:1691
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:1682
+#: src/gtkblist.c:1692
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:1683
+#: src/gtkblist.c:1693
 msgid "/Buddies/Get _User Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:1685
+#: src/gtkblist.c:1695
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:1686
+#: src/gtkblist.c:1696
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:1687
+#: src/gtkblist.c:1697
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1688
+#: src/gtkblist.c:1698
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:1689
+#: src/gtkblist.c:1699
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:1701
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:1702
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:1705
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1706
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1707
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:1708
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Työkalut/P_rotokollatoiminnot"
 
-#: src/gtkblist.c:1700
+#: src/gtkblist.c:1710
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:1701
+#: src/gtkblist.c:1711
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirtot..."
 
-#: src/gtkblist.c:1702
+#: src/gtkblist.c:1712
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: src/gtkblist.c:1703
+#: src/gtkblist.c:1713
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:1716
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:1720
 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:1709
+#: src/gtkblist.c:1721
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:1722
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:1723
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:1727
+#: src/gtkblist.c:1739
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:1727
+#: src/gtkblist.c:1739
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:1728
+#: src/gtkblist.c:1740
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:1756
+#: src/gtkblist.c:1768
 #, c-format
 msgid ""
 "\n"
@@ -2213,16 +2214,16 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:1819 src/protocols/oscar/oscar.c:5542
+#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:1831
+#: src/gtkblist.c:1847
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1846
+#: src/gtkblist.c:1863
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2230,7 +2231,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:1847
+#: src/gtkblist.c:1864
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2238,7 +2239,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:1848
+#: src/gtkblist.c:1865
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2246,7 +2247,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1849
+#: src/gtkblist.c:1866
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2254,7 +2255,15 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:1850
+#: src/gtkblist.c:1867
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Kirjautuneena sisään:</b> "
+
+#: src/gtkblist.c:1868
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2262,7 +2271,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:1851
+#: src/gtkblist.c:1869
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2270,7 +2279,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:1853
+#: src/gtkblist.c:1871
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2278,7 +2287,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:1854
+#: src/gtkblist.c:1872
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2286,7 +2295,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:1855
+#: src/gtkblist.c:1873
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2294,86 +2303,86 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2123
+#: src/gtkblist.c:2143
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2125
+#: src/gtkblist.c:2145
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2130
+#: src/gtkblist.c:2150
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2133
+#: src/gtkblist.c:2153
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
-#: src/gtkblist.c:2326 src/gtkprefs.c:841 src/gtkprefs.c:1497
+#: src/gtkblist.c:2346 src/gtkprefs.c:834 src/gtkprefs.c:1485
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/gtkblist.c:2393
+#: src/gtkblist.c:2413
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:2396
+#: src/gtkblist.c:2416
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:2419
 msgid "/Tools/Protocol Actions"
 msgstr "/Työkalut/Protokollatoiminnot"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2506
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/_Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/_Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2506 src/gtkconv.c:1231
+#: src/gtkblist.c:2526 src/gtkconv.c:1215
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2532
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:2515 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2535 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2541
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:2524 src/protocols/oscar/oscar.c:3089
+#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
 msgid "Chat"
 msgstr "Ryhmäkeskustelu"
 
-#: src/gtkblist.c:2529
+#: src/gtkblist.c:2549
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:2537
+#: src/gtkblist.c:2557
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3250 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3273
+#: src/gtkblist.c:3293
 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. "
@@ -2383,24 +2392,24 @@
 "myös valita aliaksen (tai lempinimen) tuttavalle. Alias näytetään "
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
-#: src/gtkblist.c:3295 src/main.c:289
+#: src/gtkblist.c:3315 src/main.c:290
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: src/gtkblist.c:3321 src/gtkblist.c:3643
+#: src/gtkblist.c:3341 src/gtkblist.c:3663
 msgid "Group:"
 msgstr "Ryhmä:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3330 src/gtkblist.c:3611
+#: src/gtkblist.c:3350 src/gtkblist.c:3631
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:3578
+#: src/gtkblist.c:3598
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:3601
+#: src/gtkblist.c:3621
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2408,42 +2417,42 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:3677
+#: src/gtkblist.c:3697
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:3678
+#: src/gtkblist.c:3698
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4195
+#: src/gtkblist.c:4215
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
 # NOTE source: netscape
-#: src/gtkconn.c:58 src/gtkconn.c:243 src/gtkconn.c:254
+#: src/gtkconn.c:77 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "Valmis."
 
 # NOTE: This shows when the user is (i.e., you are) signing on
-#: src/gtkconn.c:138
+#: src/gtkconn.c:156
 msgid "Signon: "
 msgstr "Kirjaudutaan sisään: "
 
 # NOTE: This shows when the user is (i.e., you are) signing on
-#: src/gtkconn.c:196
+#: src/gtkconn.c:202
 msgid "Signon"
 msgstr "Kirjaudutaan sisään"
 
-#: src/gtkconn.c:209
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Peruuta kaikki"
 
-#: src/gtkconn.c:426 src/gtkconn.c:461 src/gtkconn.c:527
+#: src/gtkconn.c:358 src/gtkconn.c:585
 msgid "_Reconnect"
 msgstr "_Uudelleenyhdistä"
 
-#: src/gtkconn.c:491
+#: src/gtkconn.c:549
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2456,19 +2465,19 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:493
+#: src/gtkconn.c:551
 msgid "Reason Unknown."
 msgstr "Tuntematon syy."
 
-#: src/gtkconn.c:532
+#: src/gtkconn.c:590
 msgid "Reconnect _All"
 msgstr "Uudelleenyhdistä _kaikki"
 
-#: src/gtkconn.c:555
+#: src/gtkconn.c:612
 msgid "Account"
 msgstr "Tili"
 
-#: src/gtkconn.c:563
+#: src/gtkconn.c:620
 msgid "Time"
 msgstr "Aika"
 
@@ -2480,354 +2489,367 @@
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: src/gtkconv.c:243
+#: src/gtkconv.c:244
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkconv.c:313
+#: src/gtkconv.c:300
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: src/gtkconv.c:620
+#: src/gtkconv.c:629
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
-#: src/gtkconv.c:648
+#: src/gtkconv.c:657
 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:669
+#: src/gtkconv.c:678
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:689
+#: src/gtkconv.c:698
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:775
+#: src/gtkconv.c:788
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:793
+#: src/gtkconv.c:810
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1239
+#: src/gtkconv.c:1223
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1241 src/gtkprefs.c:774
+#: src/gtkconv.c:1225 src/gtkprefs.c:767
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1250 src/gtkconv.c:3220
+#: src/gtkconv.c:1234 src/gtkconv.c:3253
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1259
+#: src/gtkconv.c:1243
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/gtkconv.c:1270 src/gtkconv.c:3203 src/gtkconv.c:4387
-#: src/gtkrequest.c:201
+#. Remove button
+#: src/gtkconv.c:1254 src/gtkconv.c:3246 src/gtkconv.c:3337
+#: src/gtkrequest.c:196
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gtkconv.c:2453
+#: src/gtkconv.c:2489
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2461
+#: src/gtkconv.c:2497
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2564
+#: src/gtkconv.c:2600
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:2985
+#: src/gtkconv.c:3018
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 #. Conversation menu
-#: src/gtkconv.c:3002
+#: src/gtkconv.c:3035
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:3037
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3009
+#: src/gtkconv.c:3042
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3010
+#: src/gtkconv.c:3043
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3044
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3016
+#: src/gtkconv.c:3049
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3018
+#: src/gtkconv.c:3051
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3020
+#: src/gtkconv.c:3053
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3022
+#: src/gtkconv.c:3055
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3027
+#: src/gtkconv.c:3060
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3029
+#: src/gtkconv.c:3062
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3031
+#: src/gtkconv.c:3064
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:3066
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3038
+#: src/gtkconv.c:3071
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3040
+#: src/gtkconv.c:3073
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3045
+#: src/gtkconv.c:3078
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3049
+#: src/gtkconv.c:3082
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3083
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3051
+#: src/gtkconv.c:3084
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3052
+#: src/gtkconv.c:3085
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3094
+#: src/gtkconv.c:3127
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3132
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3138
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3142
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3113
+#: src/gtkconv.c:3146
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3152
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3156
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3160
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3131
+#: src/gtkconv.c:3164
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3170
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3141
+#: src/gtkconv.c:3174
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Liitä kuva..."
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3180
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3183
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3186
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3177 src/gtkconv.c:3179 src/gtkconv.c:3277 src/gtkconv.c:3279
-#: src/gtkconv.c:6014
+#: src/gtkconv.c:3209 src/gtkconv.c:3211 src/gtkconv.c:3309 src/gtkconv.c:3311
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/gtkconv.c:3200 src/gtkconv.c:4405
-msgid "Add the user to your buddy list"
-msgstr "Lisää käyttäjä tuttavalistalle"
-
-#: src/gtkconv.c:3206 src/gtkconv.c:4390
-msgid "Remove the user from your buddy list"
-msgstr "Poista käyttäjä tuttavalistalta"
-
+#. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3213
+#: src/gtkconv.c:3225
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3217
+#: src/gtkconv.c:3228
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
-#: src/gtkconv.c:3224 src/gtkconv.c:3663
+#. Block button
+#: src/gtkconv.c:3232 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+msgid "Block"
+msgstr "Estä"
+
+#: src/gtkconv.c:3235
+msgid "Block the user"
+msgstr "Estä käyttäjä"
+
+#: src/gtkconv.c:3242
+msgid "Add the user to your buddy list"
+msgstr "Lisää käyttäjä tuttavalistalle"
+
+#: src/gtkconv.c:3249
+msgid "Remove the user from your buddy list"
+msgstr "Poista käyttäjä tuttavalistalta"
+
+#: src/gtkconv.c:3256 src/gtkconv.c:3754
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
-#. Block button
-#: src/gtkconv.c:3227 src/gtkprivacy.c:605 src/gtkprivacy.c:616
-msgid "Block"
-msgstr "Estä"
-
-#: src/gtkconv.c:3231
-msgid "Block the user"
-msgstr "Estä käyttäjä"
-
 #. Invite
-#: src/gtkconv.c:3289 src/gtkconv.c:6017
+#: src/gtkconv.c:3323
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3292
+#: src/gtkconv.c:3326
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3331
+#: src/gtkconv.c:3333
+msgid "Add the chat to your buddy list"
+msgstr "Lisää chat tuttavalistalle"
+
+#: src/gtkconv.c:3340
+msgid "Remove the chat from your buddy list"
+msgstr "Poista chat tuttavalistalta"
+
+#: src/gtkconv.c:3396
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3407
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkconv.c:3353
+#: src/gtkconv.c:3418
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkconv.c:3369
+#: src/gtkconv.c:3434
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
+#: src/gtkconv.c:3446
+msgid "Normal font size"
+msgstr "Normaali kirjasin koko"
+
 # XXX might be wrong
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3458
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkconv.c:3411
+#: src/gtkconv.c:3475
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3487
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkconv.c:3435
+#: src/gtkconv.c:3499
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3514
+msgid "Insert link"
+msgstr "Lisää linkki"
+
+#: src/gtkconv.c:3525
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkconv.c:3461
-msgid "Insert link"
-msgstr "Lisää linkki"
-
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3536
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: src/gtkconv.c:3532
+#: src/gtkconv.c:3621
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3678
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3640
+#: src/gtkconv.c:3731
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3743
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4203
+#: src/gtkconv.c:4291
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:4790 src/gtkconv.c:4822 src/gtkconv.c:4943 src/gtkconv.c:5010
+#: src/gtkconv.c:4815 src/gtkconv.c:4847 src/gtkconv.c:4968 src/gtkconv.c:5035
 #, 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:5344
+#: src/gtkconv.c:5367
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:5349
+#: src/gtkconv.c:5372
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:5355
+#: src/gtkconv.c:5378
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:5751 src/gtkconv.c:5754
+#: src/gtkconv.c:5774 src/gtkconv.c:5777
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
@@ -2956,19 +2978,19 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: src/gtkimhtml.c:691
+#: src/gtkimhtml.c:614
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:703
+#: src/gtkimhtml.c:626
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:713
+#: src/gtkimhtml.c:636
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:1849
+#: src/gtkimhtml.c:1754
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2976,18 +2998,18 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:1857
+#: src/gtkimhtml.c:1762
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:1866
+#: src/gtkimhtml.c:1771
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:1889
+#: src/gtkimhtml.c:1794
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -3035,21 +3057,21 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
+#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
 msgid "Unable to open URL"
 msgstr "Ei kyetty avaamaan URL:ää"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:431
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
 
-#: src/gtknotify.c:446
+#: src/gtknotify.c:448
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "Selain \"%s\" ei kelpaa."
 
-#: src/gtknotify.c:453
+#: src/gtknotify.c:455
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "Virhe ajettaessa komentoa: %s"
@@ -3088,7 +3110,7 @@
 msgstr "Ilmoitetaan kun"
 
 # AA Not a great translation but this will do for now. Word 'kirjautua' has problem because this string is used in two places and other place needs a bit diffrent form for this word.
-#: src/gtkpounce.c:407 src/main.c:335
+#: src/gtkpounce.c:407 src/main.c:336
 msgid "Sign on"
 msgstr "Loggaa sisään"
 
@@ -3101,7 +3123,7 @@
 msgid "Return from away"
 msgstr "Palaa oltuaan poissa"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
+#: src/gtkpounce.c:415 src/gtkprefs.c:1482 src/protocols/msn/state.c:30
 #: src/protocols/yahoo/yahoo.c:2189
 msgid "Idle"
 msgstr "Jouten"
@@ -3147,7 +3169,7 @@
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2083
+#: src/gtkpounce.c:468 src/gtkprefs.c:2072
 msgid "Test"
 msgstr "Kokeilu"
 
@@ -3160,54 +3182,54 @@
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/gtkpounce.c:786
+#: src/gtkpounce.c:792
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s alkoi kirjoittaa"
 
-#: src/gtkpounce.c:787
+#: src/gtkpounce.c:793
 #, c-format
 msgid "%s has signed on"
 msgstr "%s on kirjautunut sisään"
 
-#: src/gtkpounce.c:788
+#: src/gtkpounce.c:794
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s on palannut oltuaan jouten"
 
-#: src/gtkpounce.c:789
+#: src/gtkpounce.c:795
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s on palannut oltuaan poissa"
 
-#: src/gtkpounce.c:790
+#: src/gtkpounce.c:796
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s on lopettanut kirjoittamisen sinulle"
 
-#: src/gtkpounce.c:791
+#: src/gtkpounce.c:797
 #, c-format
 msgid "%s has signed off"
 msgstr "%s on kirjautunut ulos"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:798
 #, c-format
 msgid "%s has become idle"
 msgstr "%s on jouten"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:800
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:365
 msgid "Interface Options"
 msgstr "Rajapintavalinnat"
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:367
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Näytä palvelimelle tallennettu lempinimi jos aliasta ei ole asetettu"
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:553
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3215,361 +3237,365 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:588
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:738
+#: src/gtkprefs.c:595 src/gtkprefs.c:1794 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:748
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:662
 msgid "Style"
 msgstr "Tyyli"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:663
 msgid "_Bold"
 msgstr "_Lihavoi"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:665
 msgid "_Italics"
 msgstr "_Kursivoi"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:667
 msgid "_Underline"
 msgstr "_Alleviivaa"
 
+#: src/gtkprefs.c:669
+msgid "_Strikethrough"
+msgstr "_Yliviivaa"
+
+#: src/gtkprefs.c:672
+msgid "Face"
+msgstr "Kirjasin tyyppi"
+
 #: src/gtkprefs.c:675
-msgid "_Strikethrough"
-msgstr "_Yliviivaa"
-
-#: src/gtkprefs.c:678
-msgid "Face"
-msgstr "Kirjasin tyyppi"
-
-#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "Valitse _kirjasin"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:692
 msgid "Use custom si_ze"
 msgstr "Valitse k_oko"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:704
 msgid "Color"
 msgstr "Väri"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:708
 msgid "_Text color"
 msgstr "_Tekstin väri"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:727
 msgid "Bac_kground color"
 msgstr "T_austaväri"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
+#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:756
 msgid "Show graphical _smileys"
 msgstr "Näytä graafiset _hymiöt"
 
-#: src/gtkprefs.c:765
+#: src/gtkprefs.c:758
 msgid "Show _timestamp on messages"
 msgstr "Näytä _aikaleimat viesteissä"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:760
 msgid "Show _URLs as links"
 msgstr "Näytä _URL:t linkkeinä"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:764
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:768
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:770
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:772
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
+#: src/gtkprefs.c:785
+msgid "Send Message"
+msgstr "Lähetä viesti"
+
+#: src/gtkprefs.c:786
+msgid "Enter _sends message"
+msgstr "\"Enter\" _lähettää viestin"
+
+#: src/gtkprefs.c:788
+msgid "C_ontrol-Enter sends message"
+msgstr "\"C_ontrol-Enter\" lähettää viestin"
+
+#: src/gtkprefs.c:791
+msgid "Window Closing"
+msgstr "Ikkunan sulkeminen"
+
 #: src/gtkprefs.c:792
-msgid "Send Message"
-msgstr "Lähetä viesti"
-
-#: src/gtkprefs.c:793
-msgid "Enter _sends message"
-msgstr "\"Enter\" _lähettää viestin"
+msgid "_Escape closes window"
+msgstr "\"_Escape\" sulkee ikkunan"
 
 #: src/gtkprefs.c:795
-msgid "C_ontrol-Enter sends message"
-msgstr "\"C_ontrol-Enter\" lähettää viestin"
+msgid "Insertions"
+msgstr "Lisäykset"
+
+#: src/gtkprefs.c:796
+msgid "Control-{B/I/U} inserts _HTML tags"
+msgstr "\"Control-{B/I/U}\" lisää _HTML-tageja"
 
 #: src/gtkprefs.c:798
-msgid "Window Closing"
-msgstr "Ikkunan sulkeminen"
-
-#: src/gtkprefs.c:799
-msgid "_Escape closes window"
-msgstr "\"_Escape\" sulkee ikkunan"
-
-#: src/gtkprefs.c:802
-msgid "Insertions"
-msgstr "Lisäykset"
-
-#: src/gtkprefs.c:803
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "\"Control-{B/I/U}\" lisää _HTML-tageja"
-
-#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "\"Control-(numero)\" _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:814
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:823
 msgid "Sorting:"
 msgstr "Lajittelu:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:828
 msgid "Buddy List Toolbar"
 msgstr "Tuttavalistan työkalurivi"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:836 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:982 src/gtkprefs.c:1038
+#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
+#: src/gtkprefs.c:841
+msgid "Group Display"
+msgstr "Ryhmien näyttö"
+
+#: src/gtkprefs.c:842
+msgid "Show _numbers in groups"
+msgstr "Näytä _määrät ryhmissä"
+
+#: src/gtkprefs.c:845
+msgid "Buddy Display"
+msgstr "Tuttavien näyttö"
+
+#: src/gtkprefs.c:846 src/gtkprefs.c:982
+msgid "Show buddy _icons"
+msgstr "Näytä tuttavien _kuvakkeet"
+
 #: src/gtkprefs.c:848
-msgid "Group Display"
-msgstr "Ryhmien näyttö"
-
-#: src/gtkprefs.c:849
-msgid "Show _numbers in groups"
-msgstr "Näytä _määrät ryhmissä"
-
-#: src/gtkprefs.c:852
-msgid "Buddy Display"
-msgstr "Tuttavien näyttö"
-
-#: src/gtkprefs.c:853 src/gtkprefs.c:989
-msgid "Show buddy _icons"
-msgstr "Näytä tuttavien _kuvakkeet"
-
-#: src/gtkprefs.c:855
 msgid "Show _warning levels"
 msgstr "Näytä _varoitustasot"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:850
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:852
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:861
+#: src/gtkprefs.c:854
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:879
 msgid "_Placement:"
 msgstr "_Sijoitus:"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:886
 msgid "Send _URLs as Links"
 msgstr "Lähetä _URL:t linkkeinä"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:889
 msgid "Show Formatting Toolbar"
 msgstr "Näytä muotoilu-työkalurivi"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:892
+msgid "Show a_liases in tabs/titles"
+msgstr "Näytä a_liakset välilehdissä/otsikoissa"
+
+#: src/gtkprefs.c:895
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:897
 msgid "_Tab Placement:"
 msgstr "_Välilehtien sijoitus:"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:899
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:900
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/gtkprefs.c:905
+#: src/gtkprefs.c:901
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:902
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:908
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
 # NOTE difference from above from 0.59.8/0.60
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:911
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:921
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:936
+#: src/gtkprefs.c:932
 msgid "Show status _icons on tabs"
 msgstr "Näytä tila-ikoni välilehdissä"
 
-#: src/gtkprefs.c:963 src/gtkprefs.c:1019
+#: src/gtkprefs.c:959 src/gtkprefs.c:1010
 msgid "Window"
 msgstr "Ikkuna"
 
-#: src/gtkprefs.c:973 src/gtkprefs.c:1029
+#: src/gtkprefs.c:969 src/gtkprefs.c:1020
 msgid "New window _width:"
 msgstr "Uuden ikkunan _leveys:"
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1032
+#: src/gtkprefs.c:971 src/gtkprefs.c:1022
 msgid "New window _height:"
 msgstr "Uuden ikkunan _korkeus:"
 
-#: src/gtkprefs.c:979 src/gtkprefs.c:1035
+#: src/gtkprefs.c:973 src/gtkprefs.c:1024
 msgid "_Entry field height:"
 msgstr "Kirjoitu_salueen korkeus:"
 
-#: src/gtkprefs.c:984
+#: src/gtkprefs.c:977
 msgid "Hide window on _send"
 msgstr "Piilota ikkuna _lähetettäessä"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:981
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:984
 msgid "Enable buddy icon a_nimation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:988
 msgid "Show _logins in window"
 msgstr "Näytä _sisäänkirjautumiset ikkunassa"
 
-#: src/gtkprefs.c:997
-msgid "Show a_liases in tabs/titles"
-msgstr "Näytä a_liakset välilehdissä/otsikoissa"
-
-#: src/gtkprefs.c:1000
+#: src/gtkprefs.c:991
 msgid "Typing Notification"
 msgstr "Kirjoitusilmoitus"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:992
 msgid "Notify buddies that you are _typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:1029
 msgid "Tab Completion"
 msgstr "\"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1030
 msgid "_Tab-complete nicks"
 msgstr "\"_Tab\"-täydennys lempinimille"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1032
 msgid "_Old-style tab completion"
 msgstr "_Vanhantyylinen \"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1036
 msgid "_Show people joining in window"
 msgstr "_Näytä ihmisten saapuminen ikkunassa"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1038
 msgid "_Show people leaving in window"
 msgstr "_Näytä ihmisten poistuminen ikkunassa"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1040
 msgid "Co_lorize screennames"
 msgstr "Väritä näyttönimet"
 
-#: src/gtkprefs.c:1096
+#: src/gtkprefs.c:1084
 msgid "Proxy Type"
 msgstr "Välityspalvelimen tyyppi"
 
-#: src/gtkprefs.c:1099
+#: src/gtkprefs.c:1087
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1106
+#: src/gtkprefs.c:1094
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1150
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1204
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1205
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1206
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1219
+#: src/gtkprefs.c:1207
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1208
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1229
+#: src/gtkprefs.c:1209
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1218
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1270
+#: src/gtkprefs.c:1259
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1263
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1284
+#: src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3578,64 +3604,64 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1294
 msgid "Browser Options"
 msgstr "Selaimen valinnat"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1295
 msgid "Open new _window by default"
 msgstr "Avaa uusi _ikkuna oletuksena"
 
-#: src/gtkprefs.c:1322
+#: src/gtkprefs.c:1311
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1314
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1317
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1374
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1375
 msgid "_No sounds when you log in"
 msgstr "_Ei ääniä kun kirjaudut sisään"
 
-#: src/gtkprefs.c:1389
+#: src/gtkprefs.c:1377
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1381
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1382
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1384
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1386
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1405
+#: src/gtkprefs.c:1393
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1403
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3644,69 +3670,69 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1458
 msgid "_Sending messages removes away status"
 msgstr "Viestien _lähettäminen poistaa poissaolotilan"
 
-#: src/gtkprefs.c:1472
+#: src/gtkprefs.c:1460
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1475
+#: src/gtkprefs.c:1463
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1466
 msgid "Seconds before _resending:"
 msgstr "Sekunteja ennen _uudelleenlähetystä:"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1469
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1471
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
 # XXX
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1473
 msgid "Send auto-response in _active conversations"
 msgstr "Lähetä automaattista vastausta _aktiivisissa keskusteluissa"
 
-#: src/gtkprefs.c:1495
+#: src/gtkprefs.c:1483
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1486
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1489
 msgid "X usage"
 msgstr "X:n käyttö"
 
+#: src/gtkprefs.c:1491
+msgid "Windows usage"
+msgstr "Windows:n käyttö"
+
+#: src/gtkprefs.c:1499
+msgid "Auto-away"
+msgstr "Automaattinen poissaoloasetus"
+
+#: src/gtkprefs.c:1500
+msgid "Set away _when idle"
+msgstr "Aseta poissaolevaksi _kun jouten"
+
 #: src/gtkprefs.c:1503
-msgid "Windows usage"
-msgstr "Windows:n käyttö"
-
-#: src/gtkprefs.c:1511
-msgid "Auto-away"
-msgstr "Automaattinen poissaoloasetus"
-
-#: src/gtkprefs.c:1512
-msgid "Set away _when idle"
-msgstr "Aseta poissaolevaksi _kun jouten"
-
-#: src/gtkprefs.c:1514
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1521
+#: src/gtkprefs.c:1509
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1583
+#: src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3721,7 +3747,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1588
+#: src/gtkprefs.c:1576
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3736,100 +3762,100 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1758
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
+#: src/gtkprefs.c:1765 src/protocols/jabber/jabber.c:618
 #: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1812
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:1950
+#: src/gtkprefs.c:1939
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:2057
+#: src/gtkprefs.c:2046
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:2064
+#: src/gtkprefs.c:2053
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:2087
+#: src/gtkprefs.c:2076
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:2091
+#: src/gtkprefs.c:2080
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/gtkprefs.c:2225
+#: src/gtkprefs.c:2215
 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:2261
+#: src/gtkprefs.c:2251
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2252
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2253
 msgid "Fonts"
 msgstr "Kirjasimet"
 
 # XXX
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2254
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2255
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2258
 msgid "IMs"
 msgstr "Pikaviestit"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2260
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2273
+#: src/gtkprefs.c:2263
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2265
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2266
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2267
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:2278
+#: src/gtkprefs.c:2268
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2279
+#: src/gtkprefs.c:2269
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2282
+#: src/gtkprefs.c:2272
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -3853,64 +3879,64 @@
 msgid "Block the users below"
 msgstr "Estä allaolevat käyttäjät"
 
-#: src/gtkprivacy.c:368
+#: src/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
 # XXX
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: src/gtkprivacy.c:563
-msgid "Type a user you permit to contact you."
-msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
-
 #: src/gtkprivacy.c:564
+msgid "Type a user you permit to contact you."
+msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
+
+#: src/gtkprivacy.c:565
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
 msgid "Permit"
 msgstr "Salli"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:573
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:575
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:604
 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:610
+#: src/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -3918,19 +3944,23 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gtkrequest.c:194 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
 msgid "No"
 msgstr "Ei"
 
 # XXX dia uses "Sovella"
-#: src/gtkrequest.c:197
+#: src/gtkrequest.c:192
 msgid "Apply"
 msgstr "Toteuta"
 
+#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+msgid "Close"
+msgstr "Sulje"
+
 #: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
@@ -3953,23 +3983,23 @@
 
 #: src/gtksound.c:66
 msgid "Person enters chat"
-msgstr "Joku saapuu ryhmäkeskusteluun"
+msgstr "Joku saapuu chattiin"
 
 #: src/gtksound.c:67
 msgid "Person leaves chat"
-msgstr "Joku poistuu ryhmäkeskustelusta"
+msgstr "Joku poistuu chatistä"
 
 #: src/gtksound.c:68
 msgid "You talk in chat"
-msgstr "Sinä puhut ryhmäkeskustelussa"
+msgstr "Sinä puhut chatissä"
 
 #: src/gtksound.c:69
 msgid "Others talk in chat"
-msgstr "Muut puhuvat ryhmäkeskustelussa"
+msgstr "Muut puhuvat chatissä"
 
 #: src/gtksound.c:72
 msgid "Someone says your name in chat"
-msgstr "Joku sanoo nimesi ryhmäkeskustelussa"
+msgstr "Joku sanoo nimesi chatissä"
 
 #: src/gtksound.c:156
 #, c-format
@@ -3992,11 +4022,11 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: src/gtkutils.c:294
+#: src/gtkutils.c:298
 msgid "Can't save icon file to disk."
 msgstr "Ikonitiedostoa ei voida tallentaa levylle."
 
-#: src/gtkutils.c:329
+#: src/gtkutils.c:333
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
@@ -4004,58 +4034,58 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: src/log.c:407
+#: src/log.c:408
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:487
+#: src/log.c:488
 #, c-format
 msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr ""
 "<font color=\"#16569E\">(%s) <b>%s <AUTOMAATTIVASTAUS>:</b></font> %s<br/>\n"
 
-#: src/log.c:489
+#: src/log.c:490
 #, c-format
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr ""
 "<font color=\"#A82F2F\">(%s) <b>%s <AUTOMAATTIVASTAUS>:</b></font> %s<br/>\n"
 
-#: src/log.c:533 src/log.c:668
+#: src/log.c:534 src/log.c:669
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: src/log.c:543 src/log.c:678
+#: src/log.c:544 src/log.c:679
 #, 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:547
+#: src/log.c:548
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:621
+#: src/log.c:622
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: src/log.c:682
+#: src/log.c:683
 msgid "Plain text"
 msgstr "Teksti"
 
-#: src/main.c:148
+#: src/main.c:149
 msgid "Please enter your login."
 msgstr "Anna sisäänkirjautumistietosi."
 
 # XXX
-#: src/main.c:231
+#: src/main.c:232
 msgid "<New User>"
 msgstr "<Uusi käyttäjä>"
 
-#: src/main.c:273
+#: src/main.c:274
 msgid "Login"
 msgstr "Sisäänkirjautuminen"
 
-#: src/main.c:549
+#: src/main.c:553
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4089,12 +4119,12 @@
 "   -h, --help           näytä tämä viesti ja poistu\n"
 
 #. short message
-#: src/main.c:564
+#: src/main.c:568
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita '%s -h' saadaksesi lisää tietoja.\n"
 
-#: src/plugin.c:260
+#: src/plugin.c:267
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4102,11 +4132,11 @@
 msgstr ""
 "Vaadittu liitännäinen %s puuttuu. Ole hyvä ja asenna se ja yritä uudelleen."
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:272 src/plugin.c:300
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ei kyennyt lataamaan liitännäistäsi."
 
-#: src/plugin.c:289
+#: src/plugin.c:296
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu plugin %s ei latautunut."
@@ -4131,10 +4161,10 @@
 msgid "Away for friends only"
 msgstr "Poissa vain ystäville"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:968
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2846
 #: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/oscar/oscar.c:6151 src/protocols/yahoo/yahoo.c:2187
 #: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
 msgid "Invisible"
 msgstr "Näkymätön"
@@ -4155,7 +4185,9 @@
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
+#: src/protocols/jabber/auth.c:158 src/protocols/jabber/auth.c:317
+#: src/protocols/jabber/auth.c:417 src/protocols/jabber/auth.c:429
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
@@ -4190,7 +4222,11 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1853 src/protocols/yahoo/yahoo.c:1884
+#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo_filexfer.c:70
 #: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
@@ -4258,17 +4294,19 @@
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
-msgid "First name"
+#. First Name
+#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:633
+#: src/protocols/oscar/oscar.c:3967 src/protocols/trepia/trepia.c:267
+msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:638
 #: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
 #: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "Kutsumanimi"
@@ -4283,7 +4321,7 @@
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:648
 #: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
@@ -4294,10 +4332,10 @@
 #. show it to the user
 #: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
 #: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2784
-#: src/protocols/yahoo/yahoo.c:2806 src/protocols/yahoo/yahoo.c:2829
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/oscar/oscar.c:2888 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2785
+#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
+#: src/protocols/yahoo/yahoo.c:2988 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -4400,7 +4438,7 @@
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1080
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
@@ -4440,7 +4478,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
@@ -4453,16 +4491,16 @@
 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:187
-#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
+#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
+#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2618
 #: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "Salli"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
-#: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:189
+#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
+#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2620
 #: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "Kiellä"
@@ -4506,12 +4544,12 @@
 "<B>Tuetut IRC-komennot:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459
+#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -4540,7 +4578,7 @@
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -4570,32 +4608,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:533
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:535
+#: src/protocols/irc/irc.c:534
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:552 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1213 src/protocols/napster/napster.c:636
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/protocols/irc/irc.c:555 src/protocols/jabber/jabber.c:1155
-#: src/protocols/msn/msn.c:1662 src/protocols/napster/napster.c:642
-#: src/protocols/trepia/trepia.c:1345
+#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1228
+#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
+#: src/protocols/trepia/trepia.c:1344
 msgid "Port"
 msgstr "Portti"
 
-#: src/protocols/irc/irc.c:558
+#: src/protocols/irc/irc.c:557
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:561 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:572
+#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:608
 msgid "Username"
 msgstr "Käyttäjänimi"
 
@@ -4620,7 +4658,7 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
 msgid "Realname"
 msgstr "Oikea nimi"
 
@@ -4770,147 +4808,143 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:392
-msgid "Disconnected"
-msgstr "Yhteys katkennut"
+#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
+#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+msgid "Disconnected."
+msgstr "Yhteys katkennut."
 
 #: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr "Palvelin vaatiin SSL:n sisäänkirjautumista varten"
 
-#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:153
-#: src/protocols/jabber/auth.c:312 src/protocols/jabber/auth.c:412
-#: src/protocols/jabber/auth.c:424
-msgid "Invalid response from server"
-msgstr "Kelvoton vastaus palvelimelta"
-
-#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
+#: src/protocols/jabber/auth.c:106 src/protocols/jabber/auth.c:181
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:458
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/jabber.c:462
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/auth.c:333
+#: src/protocols/jabber/auth.c:338
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
 # XXX
-#: src/protocols/jabber/auth.c:427
+#: src/protocols/jabber/auth.c:432
 msgid "Bad Protocol"
 msgstr "Epäkelpo protokolla"
 
-#: src/protocols/jabber/auth.c:430
+#: src/protocols/jabber/auth.c:435
 msgid "Encryption Required"
 msgstr "Vaatii salauksen"
 
 # XXX edit of similar string
-#: src/protocols/jabber/auth.c:433
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: src/protocols/jabber/auth.c:436
+#: src/protocols/jabber/auth.c:441
 msgid "Invalid Mechanism"
 msgstr "Epäkelpo mekanismi"
 
-#: src/protocols/jabber/auth.c:438
+#: src/protocols/jabber/auth.c:443
 msgid "Invalid Realm"
 msgstr "Epäkelpo \"Realm\""
 
-#: src/protocols/jabber/auth.c:441
+#: src/protocols/jabber/auth.c:446
 msgid "Mechanism Too Weak"
 msgstr "Mekanismi liian heikko"
 
-#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
-#: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5570
+#: src/protocols/jabber/auth.c:449 src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:903 src/protocols/jabber/jabber.c:953
+#: src/protocols/oscar/oscar.c:5553
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: src/protocols/jabber/auth.c:447
+#: src/protocols/jabber/auth.c:452
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: src/protocols/jabber/auth.c:449
+#: src/protocols/jabber/auth.c:454
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:597
+#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:610
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:614
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2883
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:628 src/protocols/yahoo/yahoo.c:2884
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:668
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:649
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:661
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:622
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:658
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:670
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
 msgid "Country"
 msgstr "Maa"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:681
-#: src/protocols/jabber/buddy.c:688
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2879
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
 msgid "Email"
 msgstr "Sähköposti"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:735
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
 #: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "Syntymäpäivä"
@@ -4927,208 +4961,238 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: src/protocols/jabber/buddy.c:546
+#: src/protocols/jabber/buddy.c:551
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:556 src/protocols/jabber/buddy.c:563
-#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:901
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:940
+#: src/protocols/jabber/jabber.c:953
 msgid "Status"
 msgstr "Tila"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1143
+#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1216
 msgid "Resource"
 msgstr "Lähde"
 
-#: src/protocols/jabber/buddy.c:618
+#: src/protocols/jabber/buddy.c:624
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:643
 #: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "Osoite"
 
-#: src/protocols/jabber/buddy.c:645
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "Postilokero"
 
 # TODO Untranslated
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Valokuva"
 
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:765
+#: src/protocols/jabber/buddy.c:775
 msgid "Jabber Profile"
 msgstr "Jabber-profiili"
 
-#: src/protocols/jabber/buddy.c:905
+#: src/protocols/jabber/buddy.c:915
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: src/protocols/jabber/buddy.c:908
+#: src/protocols/jabber/buddy.c:918
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
-#: src/protocols/jabber/buddy.c:916
+#: src/protocols/jabber/buddy.c:926
 msgid "Cancel Presence Notification"
 msgstr "Peruuta paikallaoloilmoitus"
 
-#: src/protocols/jabber/buddy.c:924
+#: src/protocols/jabber/buddy.c:934
 msgid "(Re-)Request authorization"
 msgstr "Pyydetään lupaa uudelleen"
 
-#: src/protocols/jabber/buddy.c:930
+#: src/protocols/jabber/buddy.c:940
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:938
+#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
 msgid "_Room:"
 msgstr "_Huone:"
 
-#: src/protocols/jabber/chat.c:44
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: src/protocols/jabber/chat.c:50
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_chat-alias:"
 
-#: src/protocols/jabber/chat.c:158
+#: src/protocols/jabber/chat.c:161
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ei ole kelvollinen keskusteluhuoneen nimi."
 
-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:162
 msgid "Invalid Room Name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:167
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ei ole kelvollinen palvelinnimi."
 
-#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
+#: src/protocols/jabber/chat.c:168 src/protocols/jabber/chat.c:169
 msgid "Invalid Server Name"
 msgstr "Palvelimen nimi ei kelpaa"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:173
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ei ole kelvollinen chat-nimi (room handle)"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:174 src/protocols/jabber/chat.c:175
 msgid "Invalid Room Handle"
-msgstr "Chat-nimi(room handle) ei kelpaa"
-
-#: src/protocols/jabber/jabber.c:71
+msgstr "Chat-alias ei kelpaa"
+
+#: src/protocols/jabber/chat.c:336 src/protocols/jabber/chat.c:489
+#: src/protocols/jabber/message.c:299
+#, c-format
+msgid " (Code %s)"
+msgstr " (Koodi %s)"
+
+#: src/protocols/jabber/chat.c:339
+msgid "Configuration error"
+msgstr "Konfigurointivirhe."
+
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
+msgid "Unable to configure"
+msgstr "Ei voida konfiguroida."
+
+#: src/protocols/jabber/chat.c:364
+msgid "Room Configuration Error"
+msgstr "Huoneen konfigurointivirhe"
+
+#: src/protocols/jabber/chat.c:365
+msgid "This room is not capable of being configured"
+msgstr "Tätä huonetta ei voida konfiguroida"
+
+#: src/protocols/jabber/chat.c:492
+msgid "Registration error"
+msgstr "Rekisteröintivirhe"
+
+#: src/protocols/jabber/chat.c:573
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr "Kutsumanimeä ei voi muuttaa ei-MUC chat-huoneissa"
+
+#: src/protocols/jabber/jabber.c:72
 msgid "Error initializing session"
-msgstr "Virhe session alustamisessa"
-
-#: src/protocols/jabber/jabber.c:122
+msgstr "Virhe session alustuksessa"
+
+#: src/protocols/jabber/jabber.c:123
 msgid "Bad Format"
 msgstr "Väärä formaatti"
 
-#: src/protocols/jabber/jabber.c:124
+#: src/protocols/jabber/jabber.c:125
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: src/protocols/jabber/jabber.c:127
+#: src/protocols/jabber/jabber.c:128
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:129
+#: src/protocols/jabber/jabber.c:130
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: src/protocols/jabber/jabber.c:131
+#: src/protocols/jabber/jabber.c:132
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: src/protocols/jabber/jabber.c:133
+#: src/protocols/jabber/jabber.c:134
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: src/protocols/jabber/jabber.c:135
+#: src/protocols/jabber/jabber.c:136
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: src/protocols/jabber/jabber.c:137
+#: src/protocols/jabber/jabber.c:138
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: src/protocols/jabber/jabber.c:139
+#: src/protocols/jabber/jabber.c:140
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: src/protocols/jabber/jabber.c:141
+#: src/protocols/jabber/jabber.c:142
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:143
+#: src/protocols/jabber/jabber.c:144
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: src/protocols/jabber/jabber.c:145
+#: src/protocols/jabber/jabber.c:146
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: src/protocols/jabber/jabber.c:149
+#: src/protocols/jabber/jabber.c:150
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: src/protocols/jabber/jabber.c:151
+#: src/protocols/jabber/jabber.c:152
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/jabber/jabber.c:153
+#: src/protocols/jabber/jabber.c:154
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: src/protocols/jabber/jabber.c:155
+#: src/protocols/jabber/jabber.c:156
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: src/protocols/jabber/jabber.c:157
+#: src/protocols/jabber/jabber.c:158
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: src/protocols/jabber/jabber.c:159
+#: src/protocols/jabber/jabber.c:160
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: src/protocols/jabber/jabber.c:161
+#: src/protocols/jabber/jabber.c:162
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: src/protocols/jabber/jabber.c:163
+#: src/protocols/jabber/jabber.c:164
 msgid "Unsupported Encoding"
 msgstr "Koodausta ei tuettu"
 
-#: src/protocols/jabber/jabber.c:165
+#: src/protocols/jabber/jabber.c:166
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(Stanza type) ei tuettu"
 
-#: src/protocols/jabber/jabber.c:167
+#: src/protocols/jabber/jabber.c:168
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: src/protocols/jabber/jabber.c:169
+#: src/protocols/jabber/jabber.c:170
 msgid "XML Not Well Formed"
 msgstr "Huonostimuotoiltua XML:ää"
 
-#: src/protocols/jabber/jabber.c:171
+#: src/protocols/jabber/jabber.c:172
 msgid "Stream Error"
 msgstr "Datavirta(stream) -virhe"
 
-#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:234
+#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
 #: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
@@ -5143,7 +5207,7 @@
 #: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
 #: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
+#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
 #: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
 #: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
 #: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
@@ -5151,157 +5215,151 @@
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: src/protocols/jabber/jabber.c:272 src/protocols/jabber/jabber.c:292
+#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: src/protocols/jabber/jabber.c:346
+#: src/protocols/jabber/jabber.c:349
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: src/protocols/jabber/jabber.c:383 src/protocols/jabber/jabber.c:681
+#: src/protocols/jabber/jabber.c:387 src/protocols/jabber/jabber.c:717
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:411 src/protocols/jabber/jabber.c:708
+#: src/protocols/jabber/jabber.c:415 src/protocols/jabber/jabber.c:744
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:718
+#: src/protocols/jabber/jabber.c:425 src/protocols/jabber/jabber.c:754
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Socketin luonti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:446
+#: src/protocols/jabber/jabber.c:450
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
+#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:461
+#: src/protocols/jabber/jabber.c:465
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "%s@%s:n rekisteröinti epäonnistui: %s"
 
-#: src/protocols/jabber/jabber.c:463 src/protocols/jabber/jabber.c:464
+#: src/protocols/jabber/jabber.c:467 src/protocols/jabber/jabber.c:468
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:562 src/protocols/jabber/jabber.c:563
+#: src/protocols/jabber/jabber.c:580 src/protocols/jabber/jabber.c:581
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: src/protocols/jabber/jabber.c:576 src/protocols/jabber/jabber.c:1011
+#: src/protocols/jabber/jabber.c:612 src/protocols/jabber/jabber.c:1050
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocols/jabber/jabber.c:587
+#: src/protocols/jabber/jabber.c:623
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
-#: src/protocols/trepia/trepia.c:267
-msgid "First Name"
-msgstr "Etunimi"
-
 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/jabber/jabber.c:653 src/protocols/oscar/oscar.c:4019
 #: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:627
+#: src/protocols/jabber/jabber.c:663
 msgid "Phone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/jabber.c:673
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/protocols/jabber/jabber.c:645
+#: src/protocols/jabber/jabber.c:681
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: src/protocols/jabber/jabber.c:648 src/protocols/jabber/jabber.c:649
+#: src/protocols/jabber/jabber.c:684 src/protocols/jabber/jabber.c:685
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
+#: src/protocols/jabber/jabber.c:803 src/protocols/msn/dispatch.c:212
 #: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
+#: src/protocols/oscar/oscar.c:693 src/protocols/trepia/trepia.c:1110
 #: src/protocols/yahoo/yahoo.c:2073
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/protocols/jabber/jabber.c:771
+#: src/protocols/jabber/jabber.c:807
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:777
+#: src/protocols/jabber/jabber.c:813
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:823
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
-#: src/protocols/jabber/presence.c:296
+#: src/protocols/jabber/jabber.c:948 src/protocols/jabber/jabber.c:1001
+#: src/protocols/jabber/presence.c:293
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/jabber/jabber.c:925 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jutil.c:101
 #: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jutil.c:104
 #: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
-#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
+#: src/protocols/jabber/jabber.c:967 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6147
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: src/protocols/jabber/jabber.c:944
+#: src/protocols/jabber/jabber.c:983
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:984
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: src/protocols/jabber/jabber.c:955
+#: src/protocols/jabber/jabber.c:994
 #, c-format
 msgid "Error changing password: %s"
 msgstr "Salasanan vaihdossa tapahtui virhe: %s"
 
-#: src/protocols/jabber/jabber.c:959
+#: src/protocols/jabber/jabber.c:998
 msgid "Unknown error occurred changing password"
 msgstr "Tuntematon virhe vaihdettaessa salasanaa"
 
-#: src/protocols/jabber/jabber.c:1016
+#: src/protocols/jabber/jabber.c:1055
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
 # XXX minor editing of existing string
-#: src/protocols/jabber/jabber.c:1021 src/protocols/jabber/jabber.c:1022
+#: src/protocols/jabber/jabber.c:1060 src/protocols/jabber/jabber.c:1061
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasanaa"
 
-#: src/protocols/jabber/jabber.c:1022
+#: src/protocols/jabber/jabber.c:1061
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1073 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
@@ -5316,19 +5374,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1219
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1224
 msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1232
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5337,40 +5395,65 @@
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: src/protocols/jabber/message.c:226
+#: src/protocols/jabber/message.c:187
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s vaihtoi aiheeksi: %s"
+
+#: src/protocols/jabber/message.c:189
+#, c-format
+msgid "The topic is: %s"
+msgstr "Aihe on: %s"
+
+#: src/protocols/jabber/message.c:236
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: src/protocols/jabber/message.c:229
+#: src/protocols/jabber/message.c:239
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: src/protocols/jabber/message.c:288
-#, c-format
-msgid " (Code %s)"
-msgstr " (Koodi %s)"
-
 #: src/protocols/jabber/parser.c:129
 msgid "XML Parse error"
 msgstr "Virhe XML-parsinnassa"
 
-#: src/protocols/jabber/presence.c:177
+#: src/protocols/jabber/presence.c:178
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/presence.c:182
+#: src/protocols/jabber/presence.c:183
 #, 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:286 src/protocols/oscar/oscar.c:2950
+#: src/protocols/jabber/presence.c:244 src/protocols/jabber/presence.c:245
+msgid "Create New Room"
+msgstr "Luo uusi huone"
+
+#: src/protocols/jabber/presence.c:246
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
+"oletusasetuksia?"
+
+#: src/protocols/jabber/presence.c:248
+msgid "Configure Room"
+msgstr "Aseta huoneen asetukset"
+
+#: src/protocols/jabber/presence.c:250
+msgid "Accept Defaults"
+msgstr "Hyväksy oletusasetukset"
+
+#: src/protocols/jabber/presence.c:283 src/protocols/oscar/oscar.c:2947
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/presence.c:292
+#: src/protocols/jabber/presence.c:289
 msgid "Unable to join chat"
-msgstr "Ei voitu liittyä ryhmäkeskusteluun"
+msgstr "Ei voitu liittyä chattiin"
 
 #: src/protocols/jabber/si.c:233
 #, c-format
@@ -5403,16 +5486,16 @@
 msgid "Protocol version not supported"
 msgstr "Protokollan versiota ei tuettu"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:785
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
 msgid "Unable to request CVR\n"
 msgstr "Ei kyetty pyytämään CVR:ä\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:794
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
 msgid "Unable to request INF\n"
 msgstr "Ei kyetty pyytämään INF:iä\n"
 
 # XXX
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1911
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
 msgid "Got invalid XFR"
 msgstr "Epäkelpo XFR vastaanotettu"
 
@@ -5420,27 +5503,20 @@
 msgid "Unable to transfer"
 msgstr "Siirto ei onnistunut"
 
-#: src/protocols/msn/dispatch.c:199
+#: src/protocols/msn/dispatch.c:192
 msgid "Unable to parse message."
 msgstr "Viestin käsittely epäonnistui"
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
-#: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1853
-#: src/protocols/yahoo/yahoo.c:1884 src/protocols/yahoo/yahoo.c:1949
-msgid "Unable to connect"
-msgstr "Yhteyden muodostaminen epäonnistui"
-
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
-#: src/protocols/msn/notification.c:2171
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
+#: src/protocols/msn/notification.c:2187
 msgid "Unable to write to server"
 msgstr "Palvelimelle ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2178
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
 msgid "Syncing with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2192
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
 msgid "Error reading from server"
 msgstr "Virhe luettaessa palvelimelta"
 
@@ -5540,7 +5616,7 @@
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:183
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
@@ -5625,7 +5701,7 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1076
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
@@ -5772,11 +5848,15 @@
 
 #: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
-msgstr "Aloita ryhmäkeskustelu"
+msgstr "Aloita chat"
 
 #: src/protocols/msn/msn.c:457
-msgid "SSL support is needed for MSN. Please install it."
-msgstr "MSN vaatii SSL-tuen. Ole hyvä ja asenna se."
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+"MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
+"http://gaim.sf.net/faq-ssl.php."
 
 #: src/protocols/msn/msn.c:745
 #, c-format
@@ -5801,36 +5881,36 @@
 "MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit %"
 "s@hotmail.com. Muutoksia kielletyt-listalle ei tehty."
 
-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2785
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2786
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Virhe haettaessa profiilia</b></body></html>"
 
 #. Age
 #: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2895
+#: src/protocols/yahoo/yahoo.c:2896
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
 #: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/yahoo/yahoo.c:2904
 msgid "Gender"
 msgstr "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2907
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
 msgid "Occupation"
 msgstr "Ammatti"
 
@@ -5855,11 +5935,11 @@
 
 # NOTE actual string used by msn itself
 #: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2942
+#: src/protocols/yahoo/yahoo.c:2943
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2978
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
@@ -5869,12 +5949,12 @@
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2995
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
@@ -5889,11 +5969,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1638 src/protocols/msn/msn.c:1640
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1657 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
@@ -5935,46 +6015,46 @@
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: src/protocols/msn/notification.c:704
+#: src/protocols/msn/notification.c:711
 msgid "Unable to connect to passport server"
 msgstr "Passport-palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
+#: src/protocols/oscar/oscar.c:1361
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: src/protocols/msn/notification.c:736
+#: src/protocols/msn/notification.c:743
 msgid "Unable to send password"
 msgstr "Ei kyetty lähettämään salasanaa"
 
-#: src/protocols/msn/notification.c:772
+#: src/protocols/msn/notification.c:779
 msgid "Protocol not supported"
 msgstr "Protokollaa ei tuettu"
 
-#: src/protocols/msn/notification.c:814
+#: src/protocols/msn/notification.c:821
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Yhteytesi on katkaistu. Olet kirjautunut sisään toisesta paikasta."
 
-#: src/protocols/msn/notification.c:819
+#: src/protocols/msn/notification.c:826
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Yhteytesi on katkaistu. MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: src/protocols/msn/notification.c:945
+#: src/protocols/msn/notification.c:953
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: src/protocols/msn/notification.c:1264 src/protocols/msn/notification.c:1429
+#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä sinut tuttavalistalleen."
 
-#: src/protocols/msn/notification.c:1956
+#: src/protocols/msn/notification.c:1972
 msgid "Unable to transfer to notification server"
 msgstr "Tiedonsiirto ei onnistunut ilmoituspalvelimelle"
 
-#: src/protocols/msn/notification.c:2112
+#: src/protocols/msn/notification.c:2128
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6082,187 +6162,181 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:178
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
+#: src/protocols/oscar/oscar.c:180
+msgid "Rate to host"
+msgstr "Nopeus isäntään"
+
 #: src/protocols/oscar/oscar.c:181
-msgid "Rate to host"
-msgstr "Nopeus isäntään"
-
-#: src/protocols/oscar/oscar.c:182
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:183
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
+#: src/protocols/oscar/oscar.c:184
+msgid "Service not defined"
+msgstr "Palvelua ei määritelty"
+
 #: src/protocols/oscar/oscar.c:185
-msgid "Service not defined"
-msgstr "Palvelua ei määritelty"
-
-#: src/protocols/oscar/oscar.c:186
 msgid "Obsolete SNAC"
 msgstr "Vanhentunut SNAC"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:186
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkoisännässä"
 
+#: src/protocols/oscar/oscar.c:187
+msgid "Not supported by client"
+msgstr "Ei tuettu asiakasohjelmassa"
+
 #: src/protocols/oscar/oscar.c:188
-msgid "Not supported by client"
-msgstr "Ei tuettu asiakasohjelmassa"
-
-#: src/protocols/oscar/oscar.c:189
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:189
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
+#: src/protocols/oscar/oscar.c:190
+msgid "Responses lost"
+msgstr "Vastaukset menetetty"
+
 #: src/protocols/oscar/oscar.c:191
-msgid "Responses lost"
-msgstr "Vastaukset menetetty"
-
-#: src/protocols/oscar/oscar.c:192
 msgid "Request denied"
 msgstr "Pyyntö evätty"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:192
 msgid "Busted SNAC payload"
 msgstr "Rikkoutunut SNAC-data"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:193
 msgid "Insufficient rights"
 msgstr "Liian vähän oikeuksia"
 
+#: src/protocols/oscar/oscar.c:194
+msgid "In local permit/deny"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:195
-msgid "In local permit/deny"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:196
 msgid "Too evil (sender)"
 msgstr "Lähettäjä liian paha(evil)"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:196
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:197
 msgid "User temporarily unavailable"
 msgstr "Käyttäjä ei tilapäisesti saatavilla."
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:198
 msgid "No match"
 msgstr "Ei tuloksia"
 
+#: src/protocols/oscar/oscar.c:199
+msgid "List overflow"
+msgstr "Lista-ylivuoto"
+
 #: src/protocols/oscar/oscar.c:200
-msgid "List overflow"
-msgstr "Lista-ylivuoto"
-
-#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "Pyyntö ei ole yksiselitteinen"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:201
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:202
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:476
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:218
-#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
-#: src/protocols/toc/toc.c:709
-msgid "Disconnected."
-msgstr "Yhteys katkennut."
-
-#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:563
+#: src/protocols/oscar/oscar.c:562
 msgid "Chat is currently unavailable"
-msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
-
-#: src/protocols/oscar/oscar.c:634 src/protocols/oscar/oscar.c:690
+msgstr "Chat ei ole parhaillaan käytettävissä"
+
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:643
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:677
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1167
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:786
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
-#: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
+#: src/protocols/oscar/oscar.c:871 src/protocols/yahoo/yahoo_filexfer.c:204
 #: src/protocols/yahoo/yahoo_filexfer.c:212
 msgid "File Transfer Aborted"
 msgstr "Tiedostosiirto keskeytetty"
 
-#: src/protocols/oscar/oscar.c:855
+#: src/protocols/oscar/oscar.c:854
 msgid "Unable to establish listener socket."
 msgstr "Socketin muodostus epäonnistui."
 
 # XXX minor but not completely trivial editing of fuzzy text
 # NOTE "file descriptor" translation from ATK sanasto
-#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/oscar/oscar.c:867 src/protocols/yahoo/yahoo_filexfer.c:205
 #: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: src/protocols/oscar/oscar.c:873
+#: src/protocols/oscar/oscar.c:872
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1053 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:1058
+#: src/protocols/oscar/oscar.c:1057
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1061
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1066
 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."
@@ -6272,21 +6346,21 @@
 "pidempään."
 
 # NOTE source: 0.59.8 (+ "%s")
-#: src/protocols/oscar/oscar.c:1072
+#: src/protocols/oscar/oscar.c:1071
 #, 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:1104
+#: src/protocols/oscar/oscar.c:1103
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:1174
+#: src/protocols/oscar/oscar.c:1173
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1326
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6295,29 +6369,29 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-protokollaa "
 "kunnes tämä on korjattu. Tarkista päivitykset: %s "
 
-#: src/protocols/oscar/oscar.c:1212 src/protocols/oscar/oscar.c:1242
+#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
 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:1330
+#: src/protocols/oscar/oscar.c:1329
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
+#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2408
 #, 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:2414
+#: src/protocols/oscar/oscar.c:2411
 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 "
@@ -6328,23 +6402,23 @@
 "yksityisyysriskinä."
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
+#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2443
 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:2454
+#: src/protocols/oscar/oscar.c:2451
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2452
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2480
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6353,23 +6427,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2485 src/protocols/oscar/oscar.c:2487
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
-#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:2523 src/protocols/oscar/oscar.c:2525
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5134
 #: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2531
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2608
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6378,11 +6452,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2628
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6393,17 +6467,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2632
+#: src/protocols/oscar/oscar.c:2629
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2639
+#: src/protocols/oscar/oscar.c:2636
 #, 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:2647
+#: src/protocols/oscar/oscar.c:2644
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6416,7 +6490,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2655
+#: src/protocols/oscar/oscar.c:2652
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6429,7 +6503,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2663
+#: src/protocols/oscar/oscar.c:2660
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6442,36 +6516,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2684
+#: src/protocols/oscar/oscar.c:2681
 #, 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:2690
+#: src/protocols/oscar/oscar.c:2687
 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:2694
+#: src/protocols/oscar/oscar.c:2691
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:2776
+#: src/protocols/oscar/oscar.c:2773
 #, 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:2785
+#: src/protocols/oscar/oscar.c:2782
 #, 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:2794
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6481,7 +6555,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:2803
+#: src/protocols/oscar/oscar.c:2800
 #, 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."
@@ -6489,14 +6563,14 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
 # Here too word "hirveä" will not fit.
-#: src/protocols/oscar/oscar.c:2812
+#: src/protocols/oscar/oscar.c:2809
 #, 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:2821
+#: src/protocols/oscar/oscar.c:2818
 #, 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."
@@ -6504,120 +6578,124 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
-#: src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6150
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6148
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
-#: src/protocols/oscar/oscar.c:6166
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6149
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:2847
+#: src/protocols/oscar/oscar.c:2844
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:2890
+#: src/protocols/oscar/oscar.c:2887
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2946
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2985
+#: src/protocols/oscar/oscar.c:2982
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3044
+#: src/protocols/oscar/oscar.c:3041
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3080
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:3086
+#: src/protocols/oscar/oscar.c:3083
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
+#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6241
 #: src/protocols/yahoo/yahoo.c:2350
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3096
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3099
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3102
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3105
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3108
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3111
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3114
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3117
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3120
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
+#: src/protocols/oscar/oscar.c:3123
+msgid "Trillian Encryption"
+msgstr "Trillian-salaus"
+
 #: src/protocols/oscar/oscar.c:3126
-msgid "Trillian Encryption"
-msgstr "Trillian-salaus"
-
-#: src/protocols/oscar/oscar.c:3129
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3129
 msgid "Hiptop"
 msgstr "Hiptop"
 
+#: src/protocols/oscar/oscar.c:3132
+msgid "Security Enabled"
+msgstr "Turvatoimet käytössä"
+
 #: src/protocols/oscar/oscar.c:3135
-msgid "Security Enabled"
-msgstr "Turvatoimet käytössä"
+msgid "Video Chat"
+msgstr "Video Chat"
 
 #: src/protocols/oscar/oscar.c:3138
-msgid "Video Chat"
-msgstr "Video Chat"
+msgid "iChat AV"
+msgstr "iChat AV"
 
 #: src/protocols/oscar/oscar.c:3167
 #, c-format
@@ -7021,48 +7099,44 @@
 msgid "<b>Status:</b> "
 msgstr "<b>Tila:</b> "
 
-#: src/protocols/oscar/oscar.c:5473
-msgid "<b>Logged In:</b> "
-msgstr "<b>Kirjautuneena sisään:</b> "
-
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5468
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP-osoite:</b> "
 
-#: src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:5476
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Kyvyt:</b> "
 
-#: src/protocols/oscar/oscar.c:5502
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>Tuttavakommentti:</b>"
 
-#: src/protocols/oscar/oscar.c:5511
+#: src/protocols/oscar/oscar.c:5494
 msgid "<b>Available:</b> "
 msgstr "<b>Tavoitettavissa:</b> "
 
-#: src/protocols/oscar/oscar.c:5529
+#: src/protocols/oscar/oscar.c:5512
 msgid "<b>Away Message:</b> "
 msgstr "<b>Poissaoloviesti:</b> "
 
-#: src/protocols/oscar/oscar.c:5538
+#: src/protocols/oscar/oscar.c:5521
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Tila:</b> Ei valtuutettu"
 
-#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2191
+#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: src/protocols/oscar/oscar.c:6020
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
 
-#: src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6016
 #, 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:6036
+#: src/protocols/oscar/oscar.c:6019
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7070,53 +7144,53 @@
 "Koska tämä paljastaa IP-osoitteesi se voidaan ajatella yksityisyysriskinä. "
 "Haluatko jatkaa? "
 
-#: src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6194
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6227
+#: src/protocols/oscar/oscar.c:6210
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6235
+#: src/protocols/oscar/oscar.c:6218
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6250
+#: src/protocols/oscar/oscar.c:6233
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6279
+#: src/protocols/oscar/oscar.c:6262
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6283
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6301
+#: src/protocols/oscar/oscar.c:6284
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: src/protocols/oscar/oscar.c:6307
+#: src/protocols/oscar/oscar.c:6290
 msgid "New screenname formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6356
+#: src/protocols/oscar/oscar.c:6339
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6400
+#: src/protocols/oscar/oscar.c:6383
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6403
+#: src/protocols/oscar/oscar.c:6386
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6404
+#: src/protocols/oscar/oscar.c:6387
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7125,72 +7199,72 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6418
+#: src/protocols/oscar/oscar.c:6401
 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:6419
+#: src/protocols/oscar/oscar.c:6402
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6403
 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:6423
+#: src/protocols/oscar/oscar.c:6406
 msgid "Search"
 msgstr "Etsi"
 
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6420
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6438
+#: src/protocols/oscar/oscar.c:6421
 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:6509
+#: src/protocols/oscar/oscar.c:6492
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:6516
+#: src/protocols/oscar/oscar.c:6499
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:6523
+#: src/protocols/oscar/oscar.c:6506
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:6530
+#: src/protocols/oscar/oscar.c:6513
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6521
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:6549
+#: src/protocols/oscar/oscar.c:6532
 msgid "Format Screenname..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:6555
+#: src/protocols/oscar/oscar.c:6538
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:6561
+#: src/protocols/oscar/oscar.c:6544
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:6576
+#: src/protocols/oscar/oscar.c:6559
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6567
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
@@ -7205,15 +7279,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
+#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:6724
+#: src/protocols/oscar/oscar.c:6706
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6711
 msgid "Auth port"
 msgstr "portti"
 
@@ -7255,7 +7329,7 @@
 #: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "%s: Ryhmäkeskustelu ei ole käytettävissä."
+msgstr "%s: Chat ei ole käytettävissä."
 
 #: src/protocols/toc/toc.c:531
 #, c-format
@@ -7389,14 +7463,10 @@
 "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
 #: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa."
 
-#: src/protocols/toc/toc.c:1909
-msgid "Could not connect for transfer!"
-msgstr "Yhteyttä siirtoa varten ei voitu muodostaa!"
-
 #: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
@@ -7428,15 +7498,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC-portti"
 
@@ -7521,7 +7591,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1321 src/protocols/trepia/trepia.c:1323
+#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokollaliitännäinen"
 
@@ -7529,7 +7599,9 @@
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
-msgstr "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai laitteesta."
+msgstr ""
+"Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai "
+"laitteesta."
 
 #: src/protocols/yahoo/yahoo.c:730
 msgid "Your Yahoo! message did not get sent."
@@ -7657,7 +7729,7 @@
 
 #: src/protocols/yahoo/yahoo.c:2337
 msgid "Join in Chat"
-msgstr "Liity ryhmäkeskusteluun"
+msgstr "Liity chattiin"
 
 #: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
@@ -7679,7 +7751,7 @@
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
-#: src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/yahoo/yahoo.c:2803
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7687,7 +7759,7 @@
 "<b>Tällä hetkellä profiileja, jotka on merkitty sisältämään aikuisviihdettä, "
 "ei tueta</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2803 src/protocols/yahoo/yahoo.c:2826
+#: src/protocols/yahoo/yahoo.c:2804 src/protocols/yahoo/yahoo.c:2827
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7695,44 +7767,44 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi<br>"
 
-#: src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2826
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Ei-englanninkieliset profiilit eivät ole tuettuja tällä hetkellä.</"
 "b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2873 src/protocols/yahoo/yahoo.c:2874
+#: src/protocols/yahoo/yahoo.c:2874 src/protocols/yahoo/yahoo.c:2875
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 # NOTE from msn
-#: src/protocols/yahoo/yahoo.c:2918 src/protocols/yahoo/yahoo.c:2921
-#: src/protocols/yahoo/yahoo.c:2924
+#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:2925
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: src/protocols/yahoo/yahoo.c:2933 src/protocols/yahoo/yahoo.c:2936
+#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: src/protocols/yahoo/yahoo.c:2950
+#: src/protocols/yahoo/yahoo.c:2951
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2969
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
@@ -7781,7 +7853,7 @@
 
 #: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
-msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
+msgstr "Chattiin liittyminen epäonnistui"
 
 #: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
@@ -7793,7 +7865,7 @@
 
 #: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
-msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
+msgstr "Ehkä he eivät ole chatissä?"
 
 #: src/protocols/zephyr/zephyr.c:344
 #, c-format
@@ -7858,26 +7930,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
 #. Forbidden
-#: src/proxy.c:1002
+#: src/proxy.c:1014
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "Pääsy evätty: proxy-palvelin estää portin 80 tunneloinnin."
 
-#: src/proxy.c:1004
+#: src/proxy.c:1016
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy-yhteysvirhe %d"
 
 # XXX relatively minor editing
-#: src/proxy.c:1721
+#: src/proxy.c:1736
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välityspalvelinvalinnat"
 
-#: src/proxy.c:1721
+#: src/proxy.c:1736
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7892,7 +7964,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1028
 msgid "Accept"
 msgstr "Hyväksy"
 
@@ -7911,17 +7983,17 @@
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:1142 src/server.c:1152
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/server.c:1169 src/server.c:1177
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/server.c:1224
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7930,25 +8002,25 @@
 "Tiliä %s on juuri varoittanut %s.\n"
 "Uusi varoitustasosi on %d%%"
 
-#: src/server.c:1227
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "nimetön käyttäjä"
 
-#: src/server.c:1330
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
-"Käyttäjä '%s' kutsuu %s:n ryhmäkeskusteluun '%s'\n"
+"Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 "%s"
 
-#: src/server.c:1334
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "Käyttäjä '%s' kutsuu %s:n ryhmäkeskusteluun '%s'\n"
-
-#: src/server.c:1340
+msgstr "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
+
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "Hyväksy kutsu?"
 
@@ -7968,33 +8040,33 @@
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
-#: src/util.c:1893
+#: src/util.c:1892
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: src/util.c:1896
+#: src/util.c:1895
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
+#: src/util.c:1926 src/util.c:1931 src/util.c:1936 src/util.c:1939
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
+#: src/util.c:1927 src/util.c:1931 src/util.c:1945 src/util.c:1947
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
+#: src/util.c:1927 src/util.c:1936 src/util.c:1945 src/util.c:1950
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:2283
+#: src/util.c:2282
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
@@ -8010,6 +8082,27 @@
 msgid "Notification"
 msgstr "Ilmoitus"
 
+#~ msgid "First name"
+#~ msgstr "Etunimi"
+
+#~ msgid "Disconnected"
+#~ msgstr "Yhteys katkennut"
+
+#~ msgid "Invalid response from server"
+#~ msgstr "Kelvoton vastaus palvelimelta"
+
+#~ msgid "Unable to connect"
+#~ msgstr "Yhteyden muodostaminen epäonnistui"
+
+#~ msgid "Could not connect for transfer!"
+#~ msgstr "Yhteyttä siirtoa varten ei voitu muodostaa!"
+
+#~ msgid "About Gaim v%s"
+#~ msgstr "Tietoja Gaimista v%s"
+
+#~ msgid "SSL support is needed for MSN. Please install it."
+#~ msgstr "MSN vaatii SSL-tuen. Ole hyvä ja asenna se."
+
 #~ msgid "Gnome Stock Ticker Properties"
 #~ msgstr "Gnomen osakekurssisovelman asetukset"
 
@@ -8039,9 +8132,6 @@
 #~ msgid "Gaim - Away!"
 #~ msgstr "Gaim - Poissa!"
 
-#~ msgid "Join Chat As:"
-#~ msgstr "Liity ryhmäkeskusteluun nimellä:"
-
 #~ msgid "New Message"
 #~ msgstr "Uusi viesti"
 
@@ -8150,9 +8240,6 @@
 #~ msgid "/Conversation/Search..."
 #~ msgstr "/Keskustelu/Etsi..."
 
-#~ msgid "Normal font size"
-#~ msgstr "Normaali kirjasin koko"
-
 #~ msgid "Hide download details"
 #~ msgstr "Piilota yksityiskohdat"
 
@@ -8512,9 +8599,6 @@
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim Ryhmäkeskustelu"
 
-#~ msgid "Chat Rooms"
-#~ msgstr "Keskusteluhuoneet"
-
 #~ msgid "Refresh"
 #~ msgstr "Päivitä"
 
@@ -8632,9 +8716,6 @@
 #~ msgid "_Preferences..."
 #~ msgstr "Asetukset"
 
-#~ msgid "About Gaim"
-#~ msgstr "Gaim:ista"
-
 #~ msgid "Add a new Buddy"
 #~ msgstr "Lisää uusi tuttava"
 
@@ -8993,9 +9074,6 @@
 #~ msgid "Load a plugin from a file"
 #~ msgstr "Lataa liitännäinen tiedostosta"
 
-#~ msgid "Configure"
-#~ msgstr "Muuta asetuksia"
-
 #~ msgid "Configure settings of the selected plugin"
 #~ msgstr "Muuta asetuksia valitulle liitännäiselle"