diff po/fi.po @ 8460:03b9ce930f0d

[gaim-migrate @ 9190] undo the changes makedist produces committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 16 Mar 2004 20:48:21 +0000
parents 3afd1761da09
children fb48b9472ea5
line wrap: on
line diff
--- a/po/fi.po	Tue Mar 16 20:35:22 2004 +0000
+++ b/po/fi.po	Tue Mar 16 20:48:21 2004 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gaim 0.76\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-16 15:37-0500\n"
+"POT-Creation-Date: 2004-03-09 14:47-0500\n"
 "PO-Revision-Date: 2004-03-10 05:42+0200\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
@@ -137,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1819
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -153,12 +153,12 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1576 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1568 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:58
-#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2939
-#: src/protocols/oscar/oscar.c:4748 src/protocols/oscar/oscar.c:5792
-#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:4706 src/protocols/oscar/oscar.c:5750
+#: src/protocols/oscar/oscar.c:6368
 msgid "Away"
 msgstr "Poissa"
 
@@ -178,11 +178,11 @@
 msgstr "Tiedostosiirtot"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1998 src/main.c:288
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2556 src/main.c:294
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -390,15 +390,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
-#: src/gtkblist.c:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
+#: src/gtkblist.c:2874 src/gtkprefs.c:843 src/gtkprefs.c:1596
 #: src/protocols/jabber/jabber.c:916
 msgid "None"
 msgstr "Ei mitään"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1973
+#: src/gtkroomlist.c:560 src/protocols/jabber/jabber.c:590
+#: src/protocols/msn/msn.c:1363 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "Nimi"
 
@@ -413,13 +413,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6680
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6638
 msgid "Search"
 msgstr "Etsi"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
-#: src/gtkblist.c:4225
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3892
+#: src/gtkblist.c:4220
 msgid "Group:"
 msgstr "Ryhmä:"
 
@@ -459,7 +459,7 @@
 msgstr "_Assosioi tuttava"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3722
+#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3717
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
 msgid "Buddies"
 msgstr "Tuttavat"
@@ -524,7 +524,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
-#: src/protocols/oscar/oscar.c:3174
+#: src/protocols/oscar/oscar.c:3132
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
@@ -1094,7 +1094,7 @@
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:846
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
@@ -1146,8 +1146,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
-#: src/gtkprefs.c:2480
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2915
+#: src/gtkprefs.c:2472
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1166,8 +1166,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
-#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:884
+#: src/gtkprefs.c:2473 src/protocols/msn/msn.c:1693
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1450,22 +1450,22 @@
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
 #: src/account.c:336 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
-#: src/gtkblist.c:2278 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
+#: src/gtkblist.c:2273 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
 #: src/protocols/jabber/xdata.c:337 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/oscar/oscar.c:2549
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:6470
-#: src/protocols/oscar/oscar.c:6566 src/protocols/oscar/oscar.c:6615
-#: src/protocols/oscar/oscar.c:6697 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2508 src/request.h:1237
+#: src/protocols/msn/msn.c:215 src/protocols/oscar/oscar.c:2507
+#: src/protocols/oscar/oscar.c:2588 src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:6524 src/protocols/oscar/oscar.c:6573
+#: src/protocols/oscar/oscar.c:6655 src/protocols/yahoo/yahoo.c:2494
+#: src/protocols/yahoo/yahoo.c:2502 src/request.h:1237
 msgid "OK"
 msgstr "OK"
 
 #: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:306
 #: src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352 src/dialogs.c:473
 #: src/dialogs.c:529 src/dialogs.c:837 src/dialogs.c:858 src/dialogs.c:875
-#: src/dialogs.c:894 src/gtkaccount.c:1673 src/gtkaccount.c:2164
-#: src/gtkblist.c:2279 src/gtkblist.c:4264 src/gtkconn.c:168
+#: src/dialogs.c:894 src/gtkaccount.c:1672 src/gtkaccount.c:2163
+#: src/gtkblist.c:2274 src/gtkblist.c:4259 src/gtkconn.c:168
 #: src/gtkimhtmltoolbar.c:366 src/gtkprivacy.c:561 src/gtkprivacy.c:574
 #: src/gtkprivacy.c:599 src/gtkprivacy.c:610 src/gtkrequest.c:226
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
@@ -1473,13 +1473,13 @@
 #: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:338
 #: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
 #: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
-#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2513
-#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2586
-#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:6289
-#: src/protocols/oscar/oscar.c:6471 src/protocols/oscar/oscar.c:6567
-#: src/protocols/oscar/oscar.c:6616 src/protocols/oscar/oscar.c:6681
-#: src/protocols/oscar/oscar.c:6698 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2501 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2471
+#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:2544
+#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:6247
+#: src/protocols/oscar/oscar.c:6429 src/protocols/oscar/oscar.c:6525
+#: src/protocols/oscar/oscar.c:6574 src/protocols/oscar/oscar.c:6639
+#: src/protocols/oscar/oscar.c:6656 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2503
 #: src/request.h:1237 src/request.h:1247
 msgid "Cancel"
 msgstr "Peruuta"
@@ -1515,7 +1515,7 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/blist.c:579 src/gtkprefs.c:2483
+#: src/blist.c:579 src/gtkprefs.c:2475
 msgid "Chats"
 msgstr "Chatit"
 
@@ -1573,68 +1573,68 @@
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:296
+#: src/conversation.c:283
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:304
+#: src/conversation.c:291
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1968
+#: src/conversation.c:1955
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1971
+#: src/conversation.c:1958
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:2063
+#: src/conversation.c:2050
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: src/conversation.c:2066
+#: src/conversation.c:2053
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2111
+#: src/conversation.c:2098
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2184
+#: src/conversation.c:2171
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2173
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2466
+#: src/conversation.c:2453
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
 # XXX
-#: src/conversation.c:2468 src/gtkprefs.c:1380
+#: src/conversation.c:2455 src/gtkprefs.c:1372
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2457
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2459
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -1919,23 +1919,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Hetkisen poissa."
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:375 src/gaimrc.c:1453
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2881
+#: src/gaimrc.c:1262 src/gtkblist.c:2876
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2882
+#: src/gaimrc.c:1264 src/gtkblist.c:2877
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2883
+#: src/gaimrc.c:1266 src/gtkblist.c:2878
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: src/gaimrc.c:1549
+#: src/gaimrc.c:1551
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei voitu avata asetustiedostoa %s."
@@ -1960,7 +1960,7 @@
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:404 src/gtkblist.c:3869
+#: src/gtkaccount.c:404 src/gtkblist.c:3864
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
@@ -1968,7 +1968,7 @@
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
+#: src/gtkaccount.c:482 src/gtkblist.c:3878 src/gtkblist.c:4206
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2031,7 +2031,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:807 src/gtkprefs.c:1181
+#: src/gtkaccount.c:807 src/gtkprefs.c:1173
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -2047,15 +2047,15 @@
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:876 src/gtkprefs.c:1175
+#: src/gtkaccount.c:876 src/gtkprefs.c:1167
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:885 src/gtkprefs.c:1205
+#: src/gtkaccount.c:885 src/gtkprefs.c:1197
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:889 src/gtkprefs.c:1223
+#: src/gtkaccount.c:889 src/gtkprefs.c:1215
 msgid "_Port:"
 msgstr "_Portti:"
 
@@ -2063,62 +2063,62 @@
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:902 src/gtkprefs.c:1260
+#: src/gtkaccount.c:902 src/gtkprefs.c:1252
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: src/gtkaccount.c:1260
+#: src/gtkaccount.c:1259
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/gtkaccount.c:1262
+#: src/gtkaccount.c:1261
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1286
+#: src/gtkaccount.c:1285
 msgid "Show more options"
 msgstr "Näytä enemmän valintoja"
 
-#: src/gtkaccount.c:1287
+#: src/gtkaccount.c:1286
 msgid "Show fewer options"
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1313 src/protocols/jabber/jabber.c:658
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: src/gtkaccount.c:1668
+#: src/gtkaccount.c:1667
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/gtkaccount.c:1672 src/gtkrequest.c:229
+#: src/gtkaccount.c:1671 src/gtkrequest.c:229
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:1786
+#: src/gtkaccount.c:1785
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:1809 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4746
-#: src/protocols/oscar/oscar.c:6409 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/zephyr/zephyr.c:1176 src/protocols/zephyr/zephyr.c:1186
+#: src/gtkaccount.c:1808 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:2903 src/protocols/oscar/oscar.c:4704
+#: src/protocols/oscar/oscar.c:6367 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/zephyr/zephyr.c:1013 src/protocols/zephyr/zephyr.c:1023
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:1827
+#: src/gtkaccount.c:1826
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2139
+#: src/gtkaccount.c:2138
 #, 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:2153
+#: src/gtkaccount.c:2152
 msgid ""
 "\n"
 "\n"
@@ -2128,22 +2128,22 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2157
+#: src/gtkaccount.c:2156
 msgid "Information"
 msgstr "Tiedot"
 
-#: src/gtkaccount.c:2161
+#: src/gtkaccount.c:2160
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
 #. Add button
-#: src/gtkaccount.c:2163 src/gtkblist.c:4263 src/gtkconv.c:1072
-#: src/gtkconv.c:3289 src/gtkconv.c:3380 src/gtkrequest.c:230
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2787
+#: src/gtkaccount.c:2162 src/gtkblist.c:4258 src/gtkconv.c:1093
+#: src/gtkconv.c:3295 src/gtkconv.c:3386 src/gtkrequest.c:230
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2745
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:803 src/gtkblist.c:4151
+#: src/gtkblist.c:803 src/gtkblist.c:4146
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2161,73 +2161,73 @@
 "join.\n"
 msgstr "Anna tiedot chatistä johon haluat liittyä.\n"
 
-#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:364
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: src/gtkblist.c:1088 src/gtkblist.c:3070
+#: src/gtkblist.c:1083 src/gtkblist.c:3065
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: src/gtkblist.c:1091 src/gtkblist.c:3061
+#: src/gtkblist.c:1086 src/gtkblist.c:3056
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:1088
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:1095
+#: src/gtkblist.c:1090
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
+#: src/gtkblist.c:1110 src/gtkblist.c:1182 src/gtkblist.c:1195
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
+#: src/gtkblist.c:1112 src/gtkblist.c:1184 src/gtkblist.c:1200
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1157
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1159
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:1161
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:1168
+#: src/gtkblist.c:1163
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1177 src/gtkroomlist.c:261 src/gtkroomlist.c:416
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Liity"
 
 # XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:1184
+#: src/gtkblist.c:1179
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:1202 src/gtkblist.c:1228
+#: src/gtkblist.c:1197 src/gtkblist.c:1223
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1228
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1884 src/gtkconv.c:3864
+#: src/gtkblist.c:1879 src/gtkconv.c:3851
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2235,126 +2235,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:2225
+#: src/gtkblist.c:2220
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:2226
+#: src/gtkblist.c:2221
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:2227
+#: src/gtkblist.c:2222
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:2228
+#: src/gtkblist.c:2223
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:2230
+#: src/gtkblist.c:2225
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2231
+#: src/gtkblist.c:2226
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2232
+#: src/gtkblist.c:2227
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:2233
+#: src/gtkblist.c:2228
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:2234
+#: src/gtkblist.c:2229
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:2236
+#: src/gtkblist.c:2231
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:2232
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:2240
+#: src/gtkblist.c:2235
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:2236
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:2242
+#: src/gtkblist.c:2237
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:2243
+#: src/gtkblist.c:2238
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Työkalut/P_rotokollatoiminnot"
 
-#: src/gtkblist.c:2245
+#: src/gtkblist.c:2240
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:2246
+#: src/gtkblist.c:2241
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirtot..."
 
-#: src/gtkblist.c:2247
+#: src/gtkblist.c:2242
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Chat-huone_lista"
 
-#: src/gtkblist.c:2248
+#: src/gtkblist.c:2243
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: src/gtkblist.c:2249
+#: src/gtkblist.c:2244
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:2252
+#: src/gtkblist.c:2247
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:2256
+#: src/gtkblist.c:2251
 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:2257
+#: src/gtkblist.c:2252
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:2258
+#: src/gtkblist.c:2253
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:2259
+#: src/gtkblist.c:2254
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:2270
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:2270
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:2276
+#: src/gtkblist.c:2271
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2299
 #, c-format
 msgid ""
 "\n"
@@ -2363,16 +2363,16 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5772
+#: src/gtkblist.c:2363 src/protocols/oscar/oscar.c:5730
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2378
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:2394
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2380,7 +2380,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:2400
+#: src/gtkblist.c:2395
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2388,7 +2388,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:2401
+#: src/gtkblist.c:2396
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2396,7 +2396,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2402
+#: src/gtkblist.c:2397
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2404,7 +2404,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:2403
+#: src/gtkblist.c:2398
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2412,7 +2412,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> "
 
-#: src/gtkblist.c:2404
+#: src/gtkblist.c:2399
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2420,7 +2420,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:2405
+#: src/gtkblist.c:2400
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2428,7 +2428,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2402
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2436,7 +2436,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:2403
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2444,7 +2444,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:2404
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2452,78 +2452,78 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2674
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2676
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2686
+#: src/gtkblist.c:2681
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2689
+#: src/gtkblist.c:2684
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
-#: src/gtkblist.c:2947
+#: src/gtkblist.c:2942
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:2950
+#: src/gtkblist.c:2945
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:2953
+#: src/gtkblist.c:2948
 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:3041
+#: src/gtkblist.c:3036
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/_Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:3043
+#: src/gtkblist.c:3038
 msgid "/Buddies/Show Empty Groups"
 msgstr "/_Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:3067
+#: src/gtkblist.c:3062
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3071
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3074
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:3079
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:3087
+#: src/gtkblist.c:3082
 msgid "_Away"
 msgstr "_Poissa"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:3092
+#: src/gtkblist.c:3087
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
+#: src/gtkblist.c:3819 src/protocols/yahoo/yahoo.c:2421
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3847
+#: src/gtkblist.c:3842
 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. "
@@ -2534,15 +2534,15 @@
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3907 src/gtkblist.c:4191
+#: src/gtkblist.c:3902 src/gtkblist.c:4186
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:4158
+#: src/gtkblist.c:4153
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:4181
+#: src/gtkblist.c:4176
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2550,15 +2550,15 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:4260
+#: src/gtkblist.c:4255
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:4261
+#: src/gtkblist.c:4256
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4780
+#: src/gtkblist.c:4775
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
@@ -2618,313 +2618,313 @@
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: src/gtkconv.c:470
+#: src/gtkconv.c:491
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:498
+#: src/gtkconv.c:519
 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:519
+#: src/gtkconv.c:540
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:539
+#: src/gtkconv.c:560
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:632
+#: src/gtkconv.c:653
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:658
+#: src/gtkconv.c:679
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1030
+#: src/gtkconv.c:1051
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1059
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1040 src/gtkprefs.c:784
+#: src/gtkconv.c:1061 src/gtkprefs.c:776
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1049 src/gtkconv.c:3303
+#: src/gtkconv.c:1070 src/gtkconv.c:3309
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1058
+#: src/gtkconv.c:1079
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
 #. Remove button
-#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
+#: src/gtkconv.c:1091 src/gtkconv.c:3302 src/gtkconv.c:3393
 #: src/gtkrequest.c:231
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gtkconv.c:2162
+#: src/gtkconv.c:2176
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:2167
+#: src/gtkconv.c:2181
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:2173
+#: src/gtkconv.c:2187
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2542
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2550
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2647
+#: src/gtkconv.c:2653
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:3067
+#: src/gtkconv.c:3073
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 #. Conversation menu
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:3090
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3086
+#: src/gtkconv.c:3092
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3091
+#: src/gtkconv.c:3097
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3099
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3094
+#: src/gtkconv.c:3100
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3105
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3101
+#: src/gtkconv.c:3107
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3103
+#: src/gtkconv.c:3109
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3111
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3116
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3118
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3114
+#: src/gtkconv.c:3120
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:3122
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3121
+#: src/gtkconv.c:3127
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3129
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3134
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:3138
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3139
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3140
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3141
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3183
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3182
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Keskustelu/Lisää tuttavailmoitin..."
-
 #: src/gtkconv.c:3188
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Keskustelu/Lisää tuttavailmoitin..."
+
+#: src/gtkconv.c:3194
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3198
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3196
+#: src/gtkconv.c:3202
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3202
+#: src/gtkconv.c:3208
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3206
+#: src/gtkconv.c:3212
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3210
+#: src/gtkconv.c:3216
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3214
-msgid "/Conversation/Remove..."
-msgstr "/Keskustelu/Poista..."
-
 #: src/gtkconv.c:3220
+msgid "/Conversation/Remove..."
+msgstr "/Keskustelu/Poista..."
+
+#: src/gtkconv.c:3226
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3224
-msgid "/Conversation/Insert Image..."
-msgstr "/Keskustelu/Liitä kuva..."
-
 #: src/gtkconv.c:3230
+msgid "/Conversation/Insert Image..."
+msgstr "/Keskustelu/Liitä kuva..."
+
+#: src/gtkconv.c:3236
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3233
+#: src/gtkconv.c:3239
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3236
+#: src/gtkconv.c:3242
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
+#: src/gtkconv.c:3265 src/gtkconv.c:3267 src/gtkconv.c:3365 src/gtkconv.c:3367
 msgid "Send"
 msgstr "Lähetä"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3275
+#: src/gtkconv.c:3281
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3278
+#: src/gtkconv.c:3284
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
 #. Block button
-#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
+#: src/gtkconv.c:3288 src/gtkprivacy.c:598 src/gtkprivacy.c:609
 msgid "Block"
 msgstr "Estä"
 
-#: src/gtkconv.c:3285
+#: src/gtkconv.c:3291
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
-#: src/gtkconv.c:3292
+#: src/gtkconv.c:3298
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3299
+#: src/gtkconv.c:3305
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
-#: src/gtkconv.c:3306 src/gtkconv.c:3628
+#: src/gtkconv.c:3312 src/gtkconv.c:3633
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Invite
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3379
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3382
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3389
 msgid "Add the chat to your buddy list"
 msgstr "Lisää chat tuttavalistalle"
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3396
 msgid "Remove the chat from your buddy list"
 msgstr "Poista chat tuttavalistalta"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3495
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3555
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3610
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3622
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4155
+#: src/gtkconv.c:4142
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4655 src/gtkconv.c:4687 src/gtkconv.c:4808 src/gtkconv.c:4875
 #, 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:5404 src/gtkconv.c:5407
+#: src/gtkconv.c:5391 src/gtkconv.c:5394
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
@@ -3065,19 +3065,19 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: src/gtkimhtml.c:829
+#: src/gtkimhtml.c:797
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:841
+#: src/gtkimhtml.c:809
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:851
+#: src/gtkimhtml.c:819
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:2262
+#: src/gtkimhtml.c:2208
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3085,18 +3085,18 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:2270
+#: src/gtkimhtml.c:2216
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:2279
+#: src/gtkimhtml.c:2225
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:2302
+#: src/gtkimhtml.c:2248
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -3134,53 +3134,53 @@
 msgstr "Liitä kuva"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:592
+#: src/gtkimhtmltoolbar.c:595
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/gtkimhtmltoolbar.c:722
+#: src/gtkimhtmltoolbar.c:671
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkimhtmltoolbar.c:733
+#: src/gtkimhtmltoolbar.c:682
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkimhtmltoolbar.c:744
+#: src/gtkimhtmltoolbar.c:693
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:760
+#: src/gtkimhtmltoolbar.c:709
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:772
+#: src/gtkimhtmltoolbar.c:721
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkimhtmltoolbar.c:789
+#: src/gtkimhtmltoolbar.c:738
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkimhtmltoolbar.c:801
+#: src/gtkimhtmltoolbar.c:750
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkimhtmltoolbar.c:813
+#: src/gtkimhtmltoolbar.c:762
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkimhtmltoolbar.c:828
+#: src/gtkimhtmltoolbar.c:777
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkimhtmltoolbar.c:838
+#: src/gtkimhtmltoolbar.c:787
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:849
+#: src/gtkimhtmltoolbar.c:798
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
@@ -3419,7 +3419,7 @@
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:604 src/gtkprefs.c:2018 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:604 src/gtkprefs.c:2010 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:683
 msgid "Description"
 msgstr "Kuvaus"
@@ -3440,399 +3440,392 @@
 msgid "_Underline"
 msgstr "_Alleviivaa"
 
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:686
+#: src/gtkprefs.c:678
 msgid "_Strikethrough"
 msgstr "_Yliviivaa"
 
-#: src/gtkprefs.c:689
+#: src/gtkprefs.c:681
 msgid "Face"
 msgstr "Kirjasin tyyppi"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:684
 msgid "Use custo_m face"
 msgstr "Valitse _kirjasin"
 
-#: src/gtkprefs.c:709
+#: src/gtkprefs.c:701
 msgid "Use custom si_ze"
 msgstr "Valitse k_oko"
 
-#: src/gtkprefs.c:721
+#: src/gtkprefs.c:713
 msgid "Color"
 msgstr "Väri"
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:717
 msgid "_Text color"
 msgstr "_Tekstin väri"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:736
 msgid "Bac_kground color"
 msgstr "T_austaväri"
 
-#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
+#: src/gtkprefs.c:764 src/gtkprefs.c:996 src/gtkprefs.c:1044
 msgid "Display"
 msgstr "Näyttö"
 
+#: src/gtkprefs.c:765
+msgid "Show graphical _smileys"
+msgstr "Näytä graafiset _hymiöt"
+
+#: src/gtkprefs.c:767
+msgid "Show _timestamp on messages"
+msgstr "Näytä _aikaleimat viesteissä"
+
+#: src/gtkprefs.c:769
+msgid "Show _URLs as links"
+msgstr "Näytä _URL:t linkkeinä"
+
 #: src/gtkprefs.c:773
-msgid "Show graphical _smileys"
-msgstr "Näytä graafiset _hymiöt"
-
-#: src/gtkprefs.c:775
-msgid "Show _timestamp on messages"
-msgstr "Näytä _aikaleimat viesteissä"
+msgid "_Highlight misspelled words"
+msgstr "_Korosta väärinkirjoitetut sanat"
 
 #: src/gtkprefs.c:777
-msgid "Show _URLs as links"
-msgstr "Näytä _URL:t linkkeinä"
-
-#: src/gtkprefs.c:781
-msgid "_Highlight misspelled words"
-msgstr "_Korosta väärinkirjoitetut sanat"
-
-#: src/gtkprefs.c:785
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:779
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:781
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:794
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:795
 msgid "Enter _sends message"
 msgstr "\"Enter\" _lähettää viestin"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:797
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" lähettää viestin"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:800
 msgid "Window Closing"
 msgstr "Ikkunan sulkeminen"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:801
 msgid "_Escape closes window"
 msgstr "\"_Escape\" sulkee ikkunan"
 
-#: src/gtkprefs.c:812
+#: src/gtkprefs.c:804
 msgid "Insertions"
 msgstr "Lisäykset"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:805
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "\"Control-{B/I/U}\" lisää _HTML-tageja"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:807
 msgid "Control-(number) _inserts smileys"
 msgstr "\"Control-(numero)\" _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:823
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:832
 msgid "_Sorting:"
 msgstr "_Järjestys:"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:837
 msgid "Buddy List Toolbar"
 msgstr "Tuttavalistan työkalurivi"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
+#: src/gtkprefs.c:838 src/gtkprefs.c:969 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
+#: src/gtkprefs.c:840 src/gtkprefs.c:971 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
+#: src/gtkprefs.c:841 src/gtkprefs.c:972 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
+#: src/gtkprefs.c:842 src/gtkprefs.c:973 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
+#: src/gtkprefs.c:847 src/gtkprefs.c:984 src/gtkprefs.c:1035
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:850
 msgid "Group Display"
 msgstr "Ryhmien näyttö"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "Näytä _määrät ryhmissä"
 
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "Tuttavien näyttö"
 
-#: src/gtkprefs.c:863 src/gtkprefs.c:999
+#: src/gtkprefs.c:855 src/gtkprefs.c:991
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "Näytä _varoitustasot"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:859
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:861
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:863
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:888
 msgid "_Placement:"
 msgstr "_Sijoitus:"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:895
 msgid "Send _URLs as Links"
 msgstr "Lähetä _URL:t linkkeinä"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:898
 msgid "Show _Formatting Toolbar"
 msgstr "Näytä _muotoilu-työkalurivi"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:901
 msgid "Show a_liases in tabs/titles"
 msgstr "Näytä a_liakset välilehdissä/otsikoissa"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:904
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:906
 msgid "_Tab Placement:"
 msgstr "_Välilehtien sijoitus:"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:908
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:909
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:910
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:911
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
 # NOTE difference from above from 0.59.8/0.60
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:920
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:930
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:941
 msgid "Show status _icons on tabs"
 msgstr "Näytä tila-ikoni välilehdissä"
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1027
+#: src/gtkprefs.c:968 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "Ikkuna"
 
-#: src/gtkprefs.c:986 src/gtkprefs.c:1037
+#: src/gtkprefs.c:978 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "Uuden ikkunan _leveys:"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1039
+#: src/gtkprefs.c:980 src/gtkprefs.c:1031
 msgid "New window _height:"
 msgstr "Uuden ikkunan _korkeus:"
 
-#: src/gtkprefs.c:990 src/gtkprefs.c:1041
+#: src/gtkprefs.c:982 src/gtkprefs.c:1033
 msgid "_Entry field height:"
 msgstr "Kirjoitu_salueen korkeus:"
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:986
 msgid "Hide window on _send"
 msgstr "Piilota ikkuna _lähetettäessä"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:990
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:993
 msgid "Enable buddy icon a_nimation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:997
 msgid "Show _logins in window"
 msgstr "Näytä _sisäänkirjautumiset ikkunassa"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "Kirjoitusilmoitus"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1038
 msgid "Tab Completion"
 msgstr "\"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:1039
 msgid "_Tab-complete nicks"
 msgstr "\"_Tab\"-täydennys lempinimille"
 
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:1041
 msgid "_Old-style tab completion"
 msgstr "_Vanhantyylinen \"Tab\"-täydennys"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1045
 msgid "_Show people joining in window"
 msgstr "_Näytä ihmisten saapuminen ikkunassa"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1047
 msgid "_Show people leaving in window"
 msgstr "_Näytä ihmisten poistuminen ikkunassa"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1049
 msgid "Co_lorize screen names"
 msgstr "_Väritä näyttönimet"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1070
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: src/gtkprefs.c:1080
+#: src/gtkprefs.c:1072
 msgid "_Autodetect IP Address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: src/gtkprefs.c:1089
+#: src/gtkprefs.c:1081
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1105
 msgid "Ports"
 msgstr "Portit"
 
-#: src/gtkprefs.c:1116
+#: src/gtkprefs.c:1108
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1111
 msgid "_Start Port:"
 msgstr "_Ensimmäinen portti:"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1118
 msgid "_End Port:"
 msgstr "Viimeinen _portti:"
 
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1166
 msgid "Proxy Type"
 msgstr "Välityspalvelimen tyyppi"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1169
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1176
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1242
+#: src/gtkprefs.c:1234
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1298
+#: src/gtkprefs.c:1290
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1291
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1292
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1293
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1294
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1297
 msgid "Gnome Default"
 msgstr "Gnome oletus"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1306
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1357
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1361
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1368
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: src/gtkprefs.c:1378
+#: src/gtkprefs.c:1370
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1371
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1373
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1387
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3841,56 +3834,56 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1420
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1423
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1426
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1428
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1483
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1492
+#: src/gtkprefs.c:1484
 msgid "_No sounds when you log in"
 msgstr "_Ei ääniä kun kirjaudut sisään"
 
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1486
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1490
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1491
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1493
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1495
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1502
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1512
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3899,74 +3892,74 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1569
 msgid "_Sending messages removes away status"
 msgstr "Viestien _lähettäminen poistaa poissaolotilan"
 
-#: src/gtkprefs.c:1579
+#: src/gtkprefs.c:1571
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1574
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1577
 msgid "Seconds before _resending:"
 msgstr "Sekunteja ennen _uudelleenlähetystä:"
 
-#: src/gtkprefs.c:1588
+#: src/gtkprefs.c:1580
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1582
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
 # XXX
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1584
 msgid "Send auto-response in _active conversations"
 msgstr "Lähetä automaattista vastausta _aktiivisissa keskusteluissa"
 
-#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2291
+#: src/gtkprefs.c:1593 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2285
 msgid "Idle"
 msgstr "Jouten"
 
-#: src/gtkprefs.c:1602
+#: src/gtkprefs.c:1594
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1605
+#: src/gtkprefs.c:1597
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1600
 msgid "X usage"
 msgstr "X:n käyttö"
 
+#: src/gtkprefs.c:1602
+msgid "Windows usage"
+msgstr "Windows:n käyttö"
+
 #: src/gtkprefs.c:1610
-msgid "Windows usage"
-msgstr "Windows:n käyttö"
-
-#: src/gtkprefs.c:1618
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1611
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
+#: src/gtkprefs.c:1615
+msgid "_Minutes before setting away:"
+msgstr "_Minuutteja ennen asetusta:"
+
 #: src/gtkprefs.c:1623
-msgid "_Minutes before setting away:"
-msgstr "_Minuutteja ennen asetusta:"
-
-#: src/gtkprefs.c:1631
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1778
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3981,7 +3974,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1791
+#: src/gtkprefs.c:1783
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3996,111 +3989,111 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:1974
+#: src/gtkprefs.c:1966
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:1988
+#: src/gtkprefs.c:1980
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: src/gtkprefs.c:2036
+#: src/gtkprefs.c:2028
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:2163
+#: src/gtkprefs.c:2155
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2262
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2269
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2288
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2292
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2296
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/gtkprefs.c:2439
+#: src/gtkprefs.c:2431
 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:2475
+#: src/gtkprefs.c:2467
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/gtkprefs.c:2476
+#: src/gtkprefs.c:2468
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2477
+#: src/gtkprefs.c:2469
 msgid "Fonts"
 msgstr "Kirjasimet"
 
 # XXX
-#: src/gtkprefs.c:2478
+#: src/gtkprefs.c:2470
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2479
+#: src/gtkprefs.c:2471
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2474
 msgid "IMs"
 msgstr "Pikaviestit"
 
-#: src/gtkprefs.c:2484
+#: src/gtkprefs.c:2476
 msgid "Network"
 msgstr "Verkko"
 
-#: src/gtkprefs.c:2485
+#: src/gtkprefs.c:2477
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2480
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2490
+#: src/gtkprefs.c:2482
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2483
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/gtkprefs.c:2492
+#: src/gtkprefs.c:2484
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:2493
+#: src/gtkprefs.c:2485
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2486
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2496
+#: src/gtkprefs.c:2488
 msgid "Protocols"
 msgstr "Protokollat"
 
-#: src/gtkprefs.c:2512
+#: src/gtkprefs.c:2504
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -4189,11 +4182,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:223 src/protocols/gg/gg.c:660 src/request.h:1228
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:224 src/protocols/gg/gg.c:660 src/request.h:1228
 msgid "No"
 msgstr "Ei"
 
@@ -4218,7 +4211,7 @@
 msgstr "Huonelista"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:409
 msgid "_Get List"
 msgstr "_Hae lista"
 
@@ -4360,7 +4353,7 @@
 msgstr "Kirjaudu"
 
 #. full help text
-#: src/main.c:524
+#: src/main.c:519
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4394,7 +4387,7 @@
 "   -h, --help           näytä tämä viesti ja poistu\n"
 
 #. short message
-#: src/main.c:539
+#: src/main.c:534
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita '%s -h' saadaksesi lisää tietoja.\n"
@@ -4423,8 +4416,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
 #: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2594
-#: src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2588
+#: src/protocols/yahoo/yahoo.c:2697
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -4437,11 +4430,11 @@
 msgstr "Poissa vain ystäville"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2943
-#: src/protocols/oscar/oscar.c:4668 src/protocols/oscar/oscar.c:4739
-#: src/protocols/oscar/oscar.c:4763 src/protocols/oscar/oscar.c:6415
-#: src/protocols/oscar/oscar.c:6419 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2901
+#: src/protocols/oscar/oscar.c:4626 src/protocols/oscar/oscar.c:4697
+#: src/protocols/oscar/oscar.c:4721 src/protocols/oscar/oscar.c:6373
+#: src/protocols/oscar/oscar.c:6377 src/protocols/yahoo/yahoo.c:2283
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:2707
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4498,108 +4491,108 @@
 msgstr "Ei kyetty lukemaan pistoketta"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:496
 #: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1954 src/protocols/yahoo/yahoo.c:1985
-#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo.c:1948 src/protocols/yahoo/yahoo.c:1979
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:415
 msgid "Reading data"
 msgstr "Luetaan tietoja"
 
+#: src/protocols/gg/gg.c:418
+msgid "Balancer handshake"
+msgstr "Tasapainottajan kättely"
+
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "Tasapainottajan kättely"
-
-#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "Luetaan palvelinavainta"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:424
 msgid "Exchanging key hash"
 msgstr "Vaihdetaan avaimen hash-arvoa"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Kriittinen virhe GG-kirjastossa\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Palvelinta ei kyetty pingaamaan"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Lähetä viestinä"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Etsitään GG-palvelinta"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Etsitään GG-palvelinta"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Epäkelpo Gadu-Gadu-UIN ilmoitettu"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Yrität lähettää viestiä epäkelvolle Gadu-Gadu-UIN:lle!"
 
 # src/message.c:76
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Ei kyetty noutamaan hakutuloksia"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-hakukone"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:4064
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:605
+#: src/protocols/oscar/oscar.c:4069 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:610
+#: src/protocols/oscar/oscar.c:4072 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4108
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4066
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
-#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4176
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:620
+#: src/protocols/oscar/oscar.c:4118 src/protocols/oscar/oscar.c:4134
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Kunta"
@@ -4607,52 +4600,52 @@
 # XXX need to check for gradation problems
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1303
-#: src/protocols/msn/msn.c:1547 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2985 src/protocols/oscar/oscar.c:3311
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2887
-#: src/protocols/yahoo/yahoo.c:2909 src/protocols/yahoo/yahoo.c:2932
-#: src/protocols/yahoo/yahoo.c:3090 src/protocols/zephyr/zephyr.c:536
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1299
+#: src/protocols/msn/msn.c:1543 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2943 src/protocols/oscar/oscar.c:3269
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2881
+#: src/protocols/yahoo/yahoo.c:2903 src/protocols/yahoo/yahoo.c:2926
+#: src/protocols/yahoo/yahoo.c:3084 src/protocols/zephyr/zephyr.c:392
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu-palvelimelle ei ole tallennettu tuttavalistaa."
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Tuttavalista siirretty onnistuneesti Gadu-Gadu-palvelimelle"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Ei voitu siirtää tuttavalistaa Gadu-Gadu-palvelimelle"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Tuttavalista onnistuneesti poistettu Gadu-Gadu-palvelimelta"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ei voitu poistaa tuttavalistaa Gadu-Gadu-palvelimelta"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Salasanaa ei voitu muuttaa"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Virhe kommunikoitaessa Gadu-Gadu palvelimen kanssa."
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4660,11 +4653,11 @@
 "Gaim ei voinut toteuttaa pyyntöäsi koska tapahtui virhe kommunikoitaessa "
 "Gadu-Gadu HTTP-palvelimen kanssa. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Ei voitu tuoda Gadu-Gadu:n tuttavalistaa."
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4672,26 +4665,26 @@
 "Gaim ei saanut yhteyttä Gadu-Gadu tuttavalistapalvelimeen. Yritä myöhemmin "
 "uudelleen."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Tuttavalistan tallentaminen palvelimelle ei onnistunut"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim epäonnistui saamaan yhteyttä tuttavalistapalvelimelle. Yritä uudelleen "
 "myöhemmin."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu tuttavalistan poistaminen ei onnistu"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Hakemistoon ei yhteyttä"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4699,11 +4692,11 @@
 "Gaim ei voinut suorittaa hakua, koska hakemistopalvelimeen ei saatu "
 "yhteyttä. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Ei kyetty muuttamaan Gadu-Gadu -salasanaa"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4711,32 +4704,32 @@
 "Gaim ei voinut vaihtaa salasanaa koska yhteyttä Gadu-Gadu -palvelimelle ei "
 "voitu muodostaa. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1063
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Käyttäjäprofiiliin ei pääsyä."
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4755,7 +4748,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
@@ -4770,15 +4763,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:224
 #: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
-#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2715
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2673
+#: src/protocols/oscar/oscar.c:5332
 msgid "Authorize"
 msgstr "Salli"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:225
 #: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
-#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2717
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2675
+#: src/protocols/oscar/oscar.c:5333
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -4830,7 +4823,9 @@
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/irc/dcc_send.c:272 src/protocols/oscar/oscar.c:901
+#: src/protocols/oscar/oscar.c:914 src/protocols/oscar/oscar.c:919
+#: src/protocols/yahoo/yahoo_filexfer.c:199
 #: src/protocols/yahoo/yahoo_filexfer.c:208
 #: src/protocols/yahoo/yahoo_filexfer.c:217
 msgid "File Transfer Aborted"
@@ -4862,8 +4857,8 @@
 msgstr "Näytä MOTD"
 
 #: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:6515
-#: src/protocols/yahoo/yahoo.c:2452
+#: src/protocols/oscar/oscar.c:3147 src/protocols/oscar/oscar.c:6473
+#: src/protocols/yahoo/yahoo.c:2446
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
@@ -4924,7 +4919,7 @@
 msgstr "Palvelin"
 
 #: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
-#: src/protocols/msn/msn.c:1680 src/protocols/napster/napster.c:642
+#: src/protocols/msn/msn.c:1676 src/protocols/napster/napster.c:642
 #: src/protocols/trepia/trepia.c:1350
 msgid "Port"
 msgstr "Portti"
@@ -4959,7 +4954,7 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2984
 msgid "Realname"
 msgstr "Oikea nimi"
 
@@ -5109,7 +5104,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
+#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:580
 #: 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."
@@ -5133,9 +5128,7 @@
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
-msgstr ""
-"Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
-"yli. Sallitaanko tämä ja jatketaan?"
+msgstr "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden yli. Sallitaanko tämä ja jatketaan?"
 
 #: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
@@ -5158,7 +5151,7 @@
 msgstr "Etunimi"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
+#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2980
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
@@ -5199,7 +5192,7 @@
 msgstr "Puhelin"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2976
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -5220,7 +5213,7 @@
 msgstr "Asema"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4140
+#: src/protocols/oscar/oscar.c:4098
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -5254,7 +5247,7 @@
 msgstr "Muut etunimet"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4115 src/protocols/oscar/oscar.c:4131
 msgid "Address"
 msgstr "Osoite"
 
@@ -5389,17 +5382,17 @@
 #: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
 #: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
 #: src/protocols/msn/msn.c:161 src/protocols/msn/msn.c:261
-#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:721
-#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:776
-#: src/protocols/msn/msn.c:784 src/protocols/msn/msn.c:817
-#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:839
-#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:863
-#: src/protocols/msn/msn.c:873 src/protocols/msn/msn.c:895
-#: src/protocols/msn/msn.c:945 src/protocols/msn/msn.c:983
-#: src/protocols/msn/msn.c:1085 src/protocols/msn/msn.c:1118
-#: src/protocols/msn/msn.c:1139 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1185
-#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1278
+#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:742 src/protocols/msn/msn.c:774
+#: src/protocols/msn/msn.c:782 src/protocols/msn/msn.c:815
+#: src/protocols/msn/msn.c:823 src/protocols/msn/msn.c:837
+#: src/protocols/msn/msn.c:846 src/protocols/msn/msn.c:861
+#: src/protocols/msn/msn.c:871 src/protocols/msn/msn.c:893
+#: src/protocols/msn/msn.c:943 src/protocols/msn/msn.c:981
+#: src/protocols/msn/msn.c:1081 src/protocols/msn/msn.c:1114
+#: src/protocols/msn/msn.c:1135 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1157 src/protocols/msn/msn.c:1181
+#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1274
 #: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
 #: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
 #: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
@@ -5464,8 +5457,8 @@
 msgstr "Sähköposti"
 
 #. State
-#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4163
-#: src/protocols/oscar/oscar.c:4179 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4121
+#: src/protocols/oscar/oscar.c:4137 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Lääni"
@@ -5488,8 +5481,8 @@
 
 #: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
 #: src/protocols/msn/msn.c:487 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:750 src/protocols/trepia/trepia.c:1115
-#: src/protocols/yahoo/yahoo.c:2173
+#: src/protocols/oscar/oscar.c:740 src/protocols/trepia/trepia.c:1115
+#: src/protocols/yahoo/yahoo.c:2167
 msgid "Connecting"
 msgstr "Yhdistetään"
 
@@ -5507,7 +5500,7 @@
 
 #: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1161
 #: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1235
-#: src/protocols/oscar/oscar.c:5800
+#: src/protocols/oscar/oscar.c:5758
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
@@ -5551,8 +5544,8 @@
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:108
 #: src/protocols/jabber/presence.c:65 src/protocols/jabber/presence.c:119
-#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:4751
-#: src/protocols/oscar/oscar.c:6411
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:4709
+#: src/protocols/oscar/oscar.c:6369
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
@@ -5895,8 +5888,7 @@
 #: src/protocols/jabber/si.c:579
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostosiirtoja"
+msgstr "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostosiirtoja"
 
 #: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
 msgid "File Send Failed"
@@ -6142,7 +6134,7 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
+#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1125
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
@@ -6224,42 +6216,42 @@
 msgid "Page"
 msgstr "Lähetä"
 
-#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
+#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2397
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:640
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:638
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:642
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2271
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:2704
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:640
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2265
+#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:2698
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:644
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2273
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:642
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2267
+#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:2699
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:646
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2281
-#: src/protocols/yahoo/yahoo.c:2606 src/protocols/yahoo/yahoo.c:2709
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:644
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2703
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:648
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:646
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2604 src/protocols/yahoo/yahoo.c:2705
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
-#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:648
+#: src/protocols/zephyr/zephyr.c:1010 src/protocols/zephyr/zephyr.c:1025
 msgid "Hidden"
 msgstr "Piilotettu"
 
@@ -6303,7 +6295,7 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:757
+#: src/protocols/msn/msn.c:755
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6313,11 +6305,11 @@
 "s@hotmail.com. Muutoksia sallitut-listaan ei tehty."
 
 # XXX
-#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
+#: src/protocols/msn/msn.c:759 src/protocols/msn/msn.c:799
 msgid "Invalid MSN screen name"
 msgstr "Epäkelpo MSN-näyttönimi"
 
-#: src/protocols/msn/msn.c:797
+#: src/protocols/msn/msn.c:795
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6326,80 +6318,80 @@
 "MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit %"
 "s@hotmail.com. Muutoksia kielletyt-listalle ei tehty."
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2882
 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:1374 src/protocols/oscar/oscar.c:4145
+#: src/protocols/msn/msn.c:1370 src/protocols/oscar/oscar.c:4103
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2998
+#: src/protocols/yahoo/yahoo.c:2992
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
+#: src/protocols/msn/msn.c:1377 src/protocols/oscar/oscar.c:4089
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:3006
+#: src/protocols/yahoo/yahoo.c:3000
 msgid "Gender"
 msgstr "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
+#: src/protocols/msn/msn.c:1385 src/protocols/yahoo/yahoo.c:2996
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1392 src/protocols/yahoo/yahoo.c:2988
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3004
 msgid "Occupation"
 msgstr "Ammatti"
 
 # NOTE actual string used by msn itself, lit. "Self description"
-#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1441
-#: src/protocols/msn/msn.c:1448
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1423
+#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1437
+#: src/protocols/msn/msn.c:1444
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
-#: src/protocols/msn/msn.c:1477
+#: src/protocols/msn/msn.c:1453 src/protocols/msn/msn.c:1466
+#: src/protocols/msn/msn.c:1473
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1482 src/protocols/msn/msn.c:1488
+#: src/protocols/msn/msn.c:1495
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
-#: src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/msn/msn.c:1504 src/protocols/msn/msn.c:1510
+#: src/protocols/yahoo/yahoo.c:3039
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/msn/msn.c:1518 src/protocols/yahoo/yahoo.c:3075
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1529 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
+#: src/protocols/msn/msn.c:1551 src/protocols/yahoo/yahoo.c:3090
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
+#: src/protocols/msn/msn.c:1553 src/protocols/yahoo/yahoo.c:3092
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
@@ -6414,23 +6406,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
+#: src/protocols/msn/msn.c:1651 src/protocols/msn/msn.c:1653
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
+#: src/protocols/msn/msn.c:1671 src/protocols/trepia/trepia.c:1345
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1684
+#: src/protocols/msn/msn.c:1680
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: src/protocols/msn/msn.c:1702
+#: src/protocols/msn/msn.c:1698
 msgid "Display conversation closed notices"
 msgstr "Näytä keskustelu suljettu-viestit"
 
-#: src/protocols/msn/msn.c:1707
+#: src/protocols/msn/msn.c:1703
 msgid "Display timeout notices"
 msgstr "Näytä aikakatkaisuviestit"
 
@@ -6461,7 +6453,7 @@
 msgstr "Noudetaan tuttavalista"
 
 #: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1414
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
@@ -6591,7 +6583,7 @@
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5403
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "_Ryhmä"
@@ -6718,75 +6710,64 @@
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:592 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:609
+#: src/protocols/oscar/oscar.c:608
 msgid "Chat is currently unavailable"
 msgstr "Chat ei ole parhaillaan käytettävissä"
 
-#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:679 src/protocols/oscar/oscar.c:736
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:689
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: src/protocols/oscar/oscar.c:705
-#, fuzzy, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Ei voitu lisätä tuttavaa %s koska näyttönimi on virheellinen. Näyttönimen \n"
-"tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
-"välilyöntejä tai sisältää vain numeroita."
-
-#: src/protocols/oscar/oscar.c:734
+#: src/protocols/oscar/oscar.c:724
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:828 src/protocols/oscar/oscar.c:1218
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:846
+#: src/protocols/oscar/oscar.c:836
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
+#: src/protocols/oscar/oscar.c:902
+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:959 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:915 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: src/protocols/oscar/oscar.c:964
+#: src/protocols/oscar/oscar.c:920
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1035
-msgid "Unable to establish listener socket."
-msgstr "Socketin muodostus epäonnistui."
-
-#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1102 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:1145
+#: src/protocols/oscar/oscar.c:1107
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1149
+#: src/protocols/oscar/oscar.c:1111
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/oscar/oscar.c:1154
+#: src/protocols/oscar/oscar.c:1116
 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."
@@ -6796,21 +6777,21 @@
 "pidempään."
 
 # NOTE source: 0.59.8 (+ "%s")
-#: src/protocols/oscar/oscar.c:1159
+#: src/protocols/oscar/oscar.c:1121
 #, 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:1191
+#: src/protocols/oscar/oscar.c:1153
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:1263
+#: src/protocols/oscar/oscar.c:1225
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
-#: src/protocols/oscar/oscar.c:1417
+#: src/protocols/oscar/oscar.c:1261 src/protocols/oscar/oscar.c:1291
+#: src/protocols/oscar/oscar.c:1379
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6819,29 +6800,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:1302 src/protocols/oscar/oscar.c:1332
+#: src/protocols/oscar/oscar.c:1264 src/protocols/oscar/oscar.c:1294
 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:1420
+#: src/protocols/oscar/oscar.c:1382
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5906
+#: src/protocols/oscar/oscar.c:1964 src/protocols/oscar/oscar.c:5864
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
+#: src/protocols/oscar/oscar.c:2293 src/protocols/oscar/oscar.c:2315
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:2504
+#: src/protocols/oscar/oscar.c:2462
 #, 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:2507
+#: src/protocols/oscar/oscar.c:2465
 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 "
@@ -6852,23 +6833,23 @@
 "yksityisyysriskinä."
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:2470 src/protocols/oscar/oscar.c:6246
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:2539
+#: src/protocols/oscar/oscar.c:2497
 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:2547
+#: src/protocols/oscar/oscar.c:2505
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:2548
+#: src/protocols/oscar/oscar.c:2506
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2535
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6877,23 +6858,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:2582 src/protocols/oscar/oscar.c:2584
+#: src/protocols/oscar/oscar.c:2540 src/protocols/oscar/oscar.c:2542
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2705
-#: src/protocols/oscar/oscar.c:2725 src/protocols/oscar/oscar.c:3081
-#: src/protocols/oscar/oscar.c:3141 src/protocols/oscar/oscar.c:5366
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:2578 src/protocols/oscar/oscar.c:2580
+#: src/protocols/oscar/oscar.c:2587 src/protocols/oscar/oscar.c:2663
+#: src/protocols/oscar/oscar.c:2683 src/protocols/oscar/oscar.c:3039
+#: src/protocols/oscar/oscar.c:3099 src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5370
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2586
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6902,11 +6883,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:2671 src/protocols/oscar/oscar.c:5330
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2683
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6917,17 +6898,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2726
+#: src/protocols/oscar/oscar.c:2684
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2733
+#: src/protocols/oscar/oscar.c:2691
 #, 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:2741
+#: src/protocols/oscar/oscar.c:2699
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6940,7 +6921,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:2707
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6953,7 +6934,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2715
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6966,36 +6947,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2778
+#: src/protocols/oscar/oscar.c:2736
 #, 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:2784
+#: src/protocols/oscar/oscar.c:2742
 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:2788
+#: src/protocols/oscar/oscar.c:2746
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:2870
+#: src/protocols/oscar/oscar.c:2828
 #, 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:2879
+#: src/protocols/oscar/oscar.c:2837
 #, 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:2888
+#: src/protocols/oscar/oscar.c:2846
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7005,7 +6986,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:2897
+#: src/protocols/oscar/oscar.c:2855
 #, 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."
@@ -7013,14 +6994,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:2906
+#: src/protocols/oscar/oscar.c:2864
 #, 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:2915
+#: src/protocols/oscar/oscar.c:2873
 #, 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."
@@ -7028,175 +7009,175 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:2889 src/protocols/oscar/oscar.c:4718
+#: src/protocols/oscar/oscar.c:6372
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:2893 src/protocols/oscar/oscar.c:4712
+#: src/protocols/oscar/oscar.c:6370
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4715
+#: src/protocols/oscar/oscar.c:6371
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:2941
+#: src/protocols/oscar/oscar.c:2899
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2942
 #, 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:3043
+#: src/protocols/oscar/oscar.c:3001
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:3044
+#: src/protocols/oscar/oscar.c:3002
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:3037
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3096
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3135
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3138
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3141
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6523
+#: src/protocols/oscar/oscar.c:3144 src/protocols/oscar/oscar.c:6481
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3151
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:3196
+#: src/protocols/oscar/oscar.c:3154
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:3199
+#: src/protocols/oscar/oscar.c:3157
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3160
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:3205
+#: src/protocols/oscar/oscar.c:3163
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: src/protocols/oscar/oscar.c:3208
+#: src/protocols/oscar/oscar.c:3166
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3211
+#: src/protocols/oscar/oscar.c:3169
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3172
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:3217
+#: src/protocols/oscar/oscar.c:3175
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3220
+#: src/protocols/oscar/oscar.c:3178
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:3223
+#: src/protocols/oscar/oscar.c:3181
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3226
+#: src/protocols/oscar/oscar.c:3184
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3229
+#: src/protocols/oscar/oscar.c:3187
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: src/protocols/oscar/oscar.c:3232
+#: src/protocols/oscar/oscar.c:3190
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:3236
+#: src/protocols/oscar/oscar.c:3194
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:3239
+#: src/protocols/oscar/oscar.c:3197
 msgid "Live Video"
 msgstr "Video"
 
-#: src/protocols/oscar/oscar.c:3242
+#: src/protocols/oscar/oscar.c:3200
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:3271
+#: src/protocols/oscar/oscar.c:3229
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Käyttäjänimi: <b>%s</b><br>\n"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/oscar/oscar.c:3272
+#: src/protocols/oscar/oscar.c:3230
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Varoitustaso: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3275
+#: src/protocols/oscar/oscar.c:3233
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Kirjautuneena: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3279
+#: src/protocols/oscar/oscar.c:3237
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Rekisteröitynyt: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3242
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Jouten: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3287
+#: src/protocols/oscar/oscar.c:3245
 msgid "Idle: <b>Active</b>"
 msgstr "Jouten: <b>Aktiivinen</b>"
 
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3317
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
-#: src/protocols/oscar/oscar.c:3760
+#: src/protocols/oscar/oscar.c:3718
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:3761
+#: src/protocols/oscar/oscar.c:3719
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7205,119 +7186,119 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:3824
+#: src/protocols/oscar/oscar.c:3782
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 "Yhteytesi on katkennut koska olet kirjautunut sisään toisesta paikasta."
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3784
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3857
+#: src/protocols/oscar/oscar.c:3815
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4075 src/protocols/oscar/oscar.c:4081
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:4128
+#: src/protocols/oscar/oscar.c:4086
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4089 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4089 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4106
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4109
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4113
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
+#: src/protocols/oscar/oscar.c:4124 src/protocols/oscar/oscar.c:4140
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4129
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4145
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4189
+#: src/protocols/oscar/oscar.c:4147
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4192
+#: src/protocols/oscar/oscar.c:4150
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4153
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4156
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4162
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4254
+#: src/protocols/oscar/oscar.c:4212
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4275
+#: src/protocols/oscar/oscar.c:4233
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: src/protocols/oscar/oscar.c:4279
+#: src/protocols/oscar/oscar.c:4237
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/oscar/oscar.c:4254
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:4317
+#: src/protocols/oscar/oscar.c:4275
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: src/protocols/oscar/oscar.c:4319
+#: src/protocols/oscar/oscar.c:4277
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: src/protocols/oscar/oscar.c:4347
+#: src/protocols/oscar/oscar.c:4305
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: src/protocols/oscar/oscar.c:4350
+#: src/protocols/oscar/oscar.c:4308
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7326,7 +7307,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: src/protocols/oscar/oscar.c:4353
+#: src/protocols/oscar/oscar.c:4311
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7335,7 +7316,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi päättyy "
 "välilyöntiin."
 
-#: src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4314
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7344,7 +7325,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4359
+#: src/protocols/oscar/oscar.c:4317
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7353,7 +7334,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4320
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7362,7 +7343,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:4323
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7371,12 +7352,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4326
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: src/protocols/oscar/oscar.c:4378
+#: src/protocols/oscar/oscar.c:4336
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7385,20 +7366,20 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
+#: src/protocols/oscar/oscar.c:4337 src/protocols/oscar/oscar.c:4344
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4342
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4574
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4575
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7408,7 +7389,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4602
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7421,19 +7402,19 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: src/protocols/oscar/oscar.c:4649
+#: src/protocols/oscar/oscar.c:4607
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6418
+#: src/protocols/oscar/oscar.c:4623 src/protocols/oscar/oscar.c:6376
 msgid "Visible"
 msgstr "Näkyvä"
 
-#: src/protocols/oscar/oscar.c:4676
+#: src/protocols/oscar/oscar.c:4634
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:4677
+#: src/protocols/oscar/oscar.c:4635
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7443,7 +7424,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: src/protocols/oscar/oscar.c:4717
+#: src/protocols/oscar/oscar.c:4675
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7457,11 +7438,11 @@
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
 # XXX
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:4680
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: src/protocols/oscar/oscar.c:4815
+#: src/protocols/oscar/oscar.c:4773
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7472,16 +7453,16 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
-#: src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:4774 src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5204
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: src/protocols/oscar/oscar.c:4952
+#: src/protocols/oscar/oscar.c:4910
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:4953
+#: src/protocols/oscar/oscar.c:4911
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -7490,13 +7471,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:5129 src/protocols/oscar/oscar.c:5130
-#: src/protocols/oscar/oscar.c:5135 src/protocols/oscar/oscar.c:5290
-#: src/protocols/oscar/oscar.c:5291 src/protocols/oscar/oscar.c:5296
+#: src/protocols/oscar/oscar.c:5087 src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5093 src/protocols/oscar/oscar.c:5248
+#: src/protocols/oscar/oscar.c:5249 src/protocols/oscar/oscar.c:5254
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5190
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7506,11 +7487,11 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5190 src/protocols/oscar/oscar.c:5203
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5203
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7520,7 +7501,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5285
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7530,11 +7511,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:5333
+#: src/protocols/oscar/oscar.c:5291
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5324
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7544,17 +7525,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5366
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5367
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7565,60 +7546,60 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5371
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5408 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5430
 msgid "Invalid chat name specified."
 msgstr "Virheellinen chat nimi annettu."
 
-#: src/protocols/oscar/oscar.c:5703
+#: src/protocols/oscar/oscar.c:5661
 msgid "<b>Status:</b> "
 msgstr "<b>Tila:</b> "
 
-#: src/protocols/oscar/oscar.c:5715
+#: src/protocols/oscar/oscar.c:5673
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP-osoite:</b> "
 
-#: src/protocols/oscar/oscar.c:5723
+#: src/protocols/oscar/oscar.c:5681
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Kyvyt:</b> "
 
-#: src/protocols/oscar/oscar.c:5732
+#: src/protocols/oscar/oscar.c:5690
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>Tuttavakommentti:</b>"
 
-#: src/protocols/oscar/oscar.c:5741
+#: src/protocols/oscar/oscar.c:5699
 msgid "<b>Available:</b> "
 msgstr "<b>Tavoitettavissa:</b> "
 
-#: src/protocols/oscar/oscar.c:5760
+#: src/protocols/oscar/oscar.c:5718
 msgid "<b>Away Message:</b> "
 msgstr "<b>Poissaoloviesti:</b> "
 
-#: src/protocols/oscar/oscar.c:5768
+#: src/protocols/oscar/oscar.c:5726
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Tila:</b> Ei valtuutettu"
 
-#: src/protocols/oscar/oscar.c:5802 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/oscar/oscar.c:5760 src/protocols/yahoo/yahoo.c:2287
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: src/protocols/oscar/oscar.c:6268
+#: src/protocols/oscar/oscar.c:6226
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
 
-#: src/protocols/oscar/oscar.c:6281
+#: src/protocols/oscar/oscar.c:6239
 #, 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:6284
+#: src/protocols/oscar/oscar.c:6242
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7626,53 +7607,53 @@
 "Koska tämä paljastaa IP-osoitteesi se voidaan ajatella yksityisyysriskinä. "
 "Haluatko jatkaa? "
 
-#: src/protocols/oscar/oscar.c:6468
+#: src/protocols/oscar/oscar.c:6426
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6484
+#: src/protocols/oscar/oscar.c:6442
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6450
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6507
+#: src/protocols/oscar/oscar.c:6465
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6536
+#: src/protocols/oscar/oscar.c:6494
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6557
+#: src/protocols/oscar/oscar.c:6515
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6558
+#: src/protocols/oscar/oscar.c:6516
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: src/protocols/oscar/oscar.c:6564
+#: src/protocols/oscar/oscar.c:6522
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6613
+#: src/protocols/oscar/oscar.c:6571
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6657
+#: src/protocols/oscar/oscar.c:6615
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6660
+#: src/protocols/oscar/oscar.c:6618
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6661
+#: src/protocols/oscar/oscar.c:6619
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7681,68 +7662,68 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6675
+#: src/protocols/oscar/oscar.c:6633
 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:6676
+#: src/protocols/oscar/oscar.c:6634
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6635
 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:6694
+#: src/protocols/oscar/oscar.c:6652
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:6653
 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:6766
+#: src/protocols/oscar/oscar.c:6724
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:6773
+#: src/protocols/oscar/oscar.c:6731
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6738
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6745
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:6753
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:6806
+#: src/protocols/oscar/oscar.c:6764
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:6812
+#: src/protocols/oscar/oscar.c:6770
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6776
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:6824
+#: src/protocols/oscar/oscar.c:6782
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:6833
+#: src/protocols/oscar/oscar.c:6791
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:6841
+#: src/protocols/oscar/oscar.c:6799
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
@@ -7757,15 +7738,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6920 src/protocols/oscar/oscar.c:6922
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:6939
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:6986
+#: src/protocols/oscar/oscar.c:6944
 msgid "Auth port"
 msgstr "portti"
 
@@ -8081,27 +8062,27 @@
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai "
 "laitteesta."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:741
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:759
 msgid "Buzz!!"
 msgstr "Huomio!!"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:794
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! järjestelmäviesti käyttäjälle %s:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:860
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:863
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -8110,11 +8091,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:866
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: src/protocols/yahoo/yahoo.c:1595
+#: src/protocols/yahoo/yahoo.c:1589
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8126,11 +8107,11 @@
 "päivitykset osoitteesta: %s."
 
 # NOTE edit of "Authentication failed"
-#: src/protocols/yahoo/yahoo.c:1598
+#: src/protocols/yahoo/yahoo.c:1592
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: src/protocols/yahoo/yahoo.c:1671
+#: src/protocols/yahoo/yahoo.c:1665
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8140,101 +8121,101 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1668
 msgid "Ignore buddy?"
 msgstr "Älä välitä?"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1701
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
+#: src/protocols/yahoo/yahoo.c:1704
+msgid "Incorrect password."
+msgstr "Virheellinen salasana."
+
+#: src/protocols/yahoo/yahoo.c:1707
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
+
 #: src/protocols/yahoo/yahoo.c:1710
-msgid "Incorrect password."
-msgstr "Virheellinen salasana."
-
-#: src/protocols/yahoo/yahoo.c:1713
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
-
-#: src/protocols/yahoo/yahoo.c:1716
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Tuntematon virhekoodi %d."
 
-#: src/protocols/yahoo/yahoo.c:1773
+#: src/protocols/yahoo/yahoo.c:1767
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: src/protocols/yahoo/yahoo.c:1775
+#: src/protocols/yahoo/yahoo.c:1769
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:1879 src/protocols/yahoo/yahoo.c:2010
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2148
-#: src/protocols/yahoo/yahoo.c:2191 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2032 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2269 src/protocols/yahoo/yahoo.c:2594
+#: src/protocols/yahoo/yahoo.c:2700
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
-#: src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/yahoo/yahoo.c:2271 src/protocols/yahoo/yahoo.c:2596
+#: src/protocols/yahoo/yahoo.c:2701
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2273 src/protocols/yahoo/yahoo.c:2598
+#: src/protocols/yahoo/yahoo.c:2702
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
-#: src/protocols/yahoo/yahoo.c:2710
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/yahoo/yahoo.c:2704
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2706
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/yahoo/yahoo.c:2345 src/protocols/yahoo/yahoo.c:2377
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2433
 msgid "Join in Chat"
 msgstr "Liity chattiin"
 
-#: src/protocols/yahoo/yahoo.c:2445
+#: src/protocols/yahoo/yahoo.c:2439
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2492
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2500
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään chatissä?"
 
-#: src/protocols/yahoo/yahoo.c:2517
+#: src/protocols/yahoo/yahoo.c:2511
 msgid "Activate ID..."
 msgstr "Aktivoi ID..."
 
-#: src/protocols/yahoo/yahoo.c:2523
+#: src/protocols/yahoo/yahoo.c:2517
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
-#: src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2899
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -8242,7 +8223,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:2906 src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2900 src/protocols/yahoo/yahoo.c:2923
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -8250,44 +8231,44 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi<br>"
 
-#: src/protocols/yahoo/yahoo.c:2928
+#: src/protocols/yahoo/yahoo.c:2922
 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:2976 src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2970 src/protocols/yahoo/yahoo.c:2971
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 # NOTE from msn
-#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:3015 src/protocols/yahoo/yahoo.c:3018
+#: src/protocols/yahoo/yahoo.c:3021
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
+#: src/protocols/yahoo/yahoo.c:3030 src/protocols/yahoo/yahoo.c:3033
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: src/protocols/yahoo/yahoo.c:3053
+#: src/protocols/yahoo/yahoo.c:3047
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: src/protocols/yahoo/yahoo.c:3065
+#: src/protocols/yahoo/yahoo.c:3059
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: src/protocols/yahoo/yahoo.c:3069
+#: src/protocols/yahoo/yahoo.c:3063
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: src/protocols/yahoo/yahoo.c:3071
+#: src/protocols/yahoo/yahoo.c:3065
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: src/protocols/yahoo/yahoo.c:3077
+#: src/protocols/yahoo/yahoo.c:3071
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
@@ -8302,30 +8283,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
+#: src/protocols/yahoo/yahoo.c:3277 src/protocols/yahoo/yahoo.c:3279
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokollaliitännäinen"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3302
+#: src/protocols/yahoo/yahoo.c:3296
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3305
+#: src/protocols/yahoo/yahoo.c:3299
 msgid "Pager port"
 msgstr "Portti"
 
 # NOTE source: gnomeicu
-#: src/protocols/yahoo/yahoo.c:3308
+#: src/protocols/yahoo/yahoo.c:3302
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: src/protocols/yahoo/yahoo.c:3311
+#: src/protocols/yahoo/yahoo.c:3305
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3308
 msgid "Chat Room List Url"
 msgstr "Chathuonelista Url"
 
@@ -8391,37 +8372,37 @@
 msgid "User Rooms"
 msgstr "Käyttäjän Huoneet"
 
-#: src/protocols/zephyr/zephyr.c:525
+#: src/protocols/zephyr/zephyr.c:381
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:527
+#: src/protocols/zephyr/zephyr.c:383
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:529
+#: src/protocols/zephyr/zephyr.c:385
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
 # TODO
-#: src/protocols/zephyr/zephyr.c:533
+#: src/protocols/zephyr/zephyr.c:389
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
 # Context unclear.
-#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
-#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
+#: src/protocols/zephyr/zephyr.c:646 src/protocols/zephyr/zephyr.c:647
+#: src/protocols/zephyr/zephyr.c:835 src/protocols/zephyr/zephyr.c:836
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: src/protocols/zephyr/zephyr.c:820
+#: src/protocols/zephyr/zephyr.c:673
 msgid "Already logged in with Zephyr"
 msgstr "Zephyriin jo kirjauduttu"
 
-#: src/protocols/zephyr/zephyr.c:821
+#: src/protocols/zephyr/zephyr.c:674
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8429,19 +8410,19 @@
 "Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin yhtä "
 "tiliä."
 
-#: src/protocols/zephyr/zephyr.c:1158
+#: src/protocols/zephyr/zephyr.c:995
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1198
+#: src/protocols/zephyr/zephyr.c:1035
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:1203
+#: src/protocols/zephyr/zephyr.c:1040
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:1208
+#: src/protocols/zephyr/zephyr.c:1045
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
@@ -8456,20 +8437,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1195 src/protocols/zephyr/zephyr.c:1197
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
-#: src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1214
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1380
+#: src/protocols/zephyr/zephyr.c:1217
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
 # Dont know really what is the context so translation could be wrong.
-#: src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/zephyr/zephyr.c:1220
 msgid "Exposure"
 msgstr "Altistus"
 
@@ -8587,33 +8568,33 @@
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: src/util.c:1884
+#: src/util.c:1851
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: src/util.c:1887
+#: src/util.c:1854
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
+#: src/util.c:1885 src/util.c:1890 src/util.c:1895 src/util.c:1898
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
+#: src/util.c:1886 src/util.c:1890 src/util.c:1904 src/util.c:1906
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
+#: src/util.c:1886 src/util.c:1895 src/util.c:1904 src/util.c:1909
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:2274
+#: src/util.c:2241
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"