diff po/fi.po @ 9544:8c4d99bea74d

[gaim-migrate @ 10372] make distcheck runs so much faster after this committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 16 Jul 2004 04:36:25 +0000
parents e537f33dc064
children ce26d84eed8f
line wrap: on
line diff
--- a/po/fi.po	Fri Jul 16 04:06:51 2004 +0000
+++ b/po/fi.po	Fri Jul 16 04:36:25 2004 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gaim 0.79\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-21 00:02-0400\n"
+"POT-Creation-Date: 2004-07-16 00:15-0400\n"
 "PO-Revision-Date: 2004-06-22 18:18+0300\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
@@ -148,7 +148,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -164,13 +164,13 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -179,7 +179,7 @@
 # src/menus.c:327
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
 msgid "Back"
 msgstr "Palaa"
 
@@ -189,15 +189,15 @@
 msgstr "Vaimenna äänet"
 
 # NOTE source: gnomeicu
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Tiedostosiirtot"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -250,18 +250,23 @@
 "kirjautumisikkunan välillä. Myöskin mahdollistaa ICQ-tyylisen viestien "
 "varastoinnin kunnes ne näytetään painamalla ikonia."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "Keskustelujen määrän mukaan"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Keskustelun asettelu"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Keskustelujen määrä per ikkuna"
 
+#: plugins/extplacement.c:107
+#, fuzzy
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -269,23 +274,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Keskustelun lisä-asettelu valinnat."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr "Rajoita joko keskustelujen määrää ikkunaa kohti tai käytä eri ikkunaa pikaviesteille ja chateille"
+#: plugins/extplacement.c:130
+#, fuzzy
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Rajoita joko keskustelujen määrää ikkunaa kohti tai käytä eri ikkunaa "
+"pikaviesteille ja chateille"
 
 #. *< api_version
 #. *< type
@@ -447,61 +455,61 @@
 "Liikuta ylös ja sitten vasemmalle vaihtaaksesi edelliseen keskusteluun.\n"
 "Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Paikallinen osoitekirja"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Ei mitään"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nimi"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Pikaviestitys"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
 msgid "Search"
 msgstr "Etsi"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "Ryhmä:"
 
 # XXX
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "Uusi henkilö"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Valitse tuttava"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -510,40 +518,40 @@
 "henkilö."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Näytä käyttäjän yksityiskohdat"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Piilota piilota käyttäjän yksityiskohdat"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "_Assosioi tuttava"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Evolution -integrointiasetukset"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit joihin tuttavat lisätään automaattisesti."
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Tili"
 
@@ -554,7 +562,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Evolution integrointi"
 
@@ -562,46 +570,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Mahdollistaa integroinnin Ximian Evolution:in kanssa."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Syötä henkilön tiedot alle."
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Syötä tuttavan näyttönimi ja käyttäjätilityyppi alle."
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Käyttäjätilityyppi:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Näyttönimi:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Valinnaiset lisätiedot:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Sukunimi:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
@@ -832,17 +840,17 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-plugineja."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Raakasyöttö"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Mahdollistaa raakamuotoisen syötteen antamisen tekstipohjaisille "
 "protokollille (Jabber, MSN, IRC, TOC)"
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -912,7 +920,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Signaalitesti"
 
@@ -920,7 +928,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
 
@@ -1140,34 +1148,34 @@
 
 # NOTE source: gimp
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Peitto:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "Pikaviesti-keskusteluikkunat"
 
 # NOTE source: gimp + google
 # XXX
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
 # NOTE source: gimp + google
 # XXX
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "_Tuttavalistaikkunan läpinäkyvyys"
 
@@ -1180,19 +1188,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1218,8 +1226,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1238,8 +1246,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1269,7 +1277,11 @@
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr "Gaim on modulaarinen pikaviestinasiakassovellus, joka kykenee käyttämään AIM-, ICQ-, Yahoo!-, MSN-, IRC-, SILC, Novell GroupWise, Jabber-, Napster-, Zephyr- ja Gadu-Gadu-protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:aa ja on lisensoitu GPL:n mukaisesti.<BR><BR>"
+msgstr ""
+"Gaim on modulaarinen pikaviestinasiakassovellus, joka kykenee käyttämään "
+"AIM-, ICQ-, Yahoo!-, MSN-, IRC-, SILC, Novell GroupWise, Jabber-, Napster-, "
+"Zephyr- ja Gadu-Gadu-protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:"
+"aa ja on lisensoitu GPL:n mukaisesti.<BR><BR>"
 
 #: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -1312,275 +1324,280 @@
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:152
-msgid "former maintainer"
-msgstr "entinen ylläpitäjä"
-
 #: src/about.c:153
+msgid "former maintainer"
+msgstr "entinen ylläpitäjä"
+
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "entinen Jabber-ylläpitäjä"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri sekä määrätty kuljettaja [laiska pummi]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
+#: src/about.c:167 src/about.c:206
+msgid "Bulgarian"
+msgstr "Bulgaria"
+
 # NOTE source: netscape
-#: src/about.c:166 src/about.c:204
+#: src/about.c:168 src/about.c:207
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:167 src/about.c:205
+#: src/about.c:169 src/about.c:208
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/about.c:168
+#: src/about.c:170
 msgid "Danish"
 msgstr "Tanska"
 
-#: src/about.c:169
+#: src/about.c:171
 msgid "British English"
 msgstr "Brittienglanti"
 
-#: src/about.c:170
+#: src/about.c:172
 msgid "Canadian English"
 msgstr "Kanadan Englanti"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:173 src/about.c:209
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:174 src/about.c:210
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:175 src/about.c:211
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:176 src/about.c:212
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:175
+#: src/about.c:177
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/about.c:176
+#: src/about.c:178
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:177
+#: src/about.c:179
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:180 src/about.c:213
 msgid "Italian"
 msgstr "Italia"
 
+#: src/about.c:181 src/about.c:214
+msgid "Japanese"
+msgstr "Japani"
+
+#: src/about.c:182
+msgid "Lithuanian"
+msgstr ""
+
 # NOTE source: netscape
-#: src/about.c:179 src/about.c:212
+#: src/about.c:183 src/about.c:215
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:180
+#: src/about.c:184
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
-#: src/about.c:181
+#: src/about.c:185
 msgid "Macedonian"
 msgstr "Makedonia"
 
 # NOTE source: netscape
-#: src/about.c:182
+#: src/about.c:186
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:183 src/about.c:213
+#: src/about.c:187 src/about.c:216
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:184
+#: src/about.c:188
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:185
+#: src/about.c:189
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:186
+#: src/about.c:190
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:191 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:188
+#: src/about.c:192
 msgid "Serbian"
 msgstr "Serbia"
 
 # NOTE source: netscape
-#: src/about.c:189
+#: src/about.c:193
 msgid "Slovenian"
 msgstr "Sloveeni"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:194 src/about.c:220
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: src/about.c:191
+#: src/about.c:195
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
+#: src/about.c:195
+#, fuzzy
+msgid "and the Gnome-Vi Team"
 msgstr "Gnome Vi-työryhmä"
 
 # XXX source: netscape + google
-#: src/about.c:193
+#: src/about.c:196
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:194
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Amhara"
 
-#: src/about.c:203
-msgid "Bulgarian"
-msgstr "Bulgaria"
-
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Japani"
-
 # NOTE source: netscape
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
+#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
-#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
+#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
+#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
+#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
+#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
 # src/menus.c:280
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Tallenna"
@@ -1603,8 +1620,8 @@
 msgstr "Poista poissaoloviesti"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Poista"
 
@@ -1635,16 +1652,12 @@
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Epäkelpo ryhmänimi"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1653,7 +1666,7 @@
 "on siirretty tiedostoon blist.xml~."
 
 # XXX probably better than forming yet another new compound?
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
@@ -1676,72 +1689,72 @@
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
 # XXX
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -1898,8 +1911,8 @@
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
@@ -1921,22 +1934,51 @@
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Tiedostoa ei ole."
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Ei voida lähettää tiedostoa jonka koko on 0 tavua."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s on lähettämässä sinulle %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Tiedosto on ladattavissa:\n"
+"Etäkone: %s\n"
+"Portti: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s ei löydy.\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Tiedostonsiirto %s:lle keskeytetty.\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Tiedostonsiirto %s:lta keskeytetty.\n"
@@ -2029,23 +2071,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Hetkisen poissa."
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2984
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2985
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2986
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2057,166 +2099,166 @@
 "<b>Kuvan koko:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:552 src/gtkblist.c:3983
+#: src/gtkaccount.c:636 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:634
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Muista salasana"
 
 # XXX could be wrong
 #. Build the user options frame.
-#: src/gtkaccount.c:690
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: src/gtkaccount.c:703
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "Tuttavakuvake:"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:937 src/gtkaccount.c:984
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Käytä globaalia proxy-asetusta"
 
 #. No Proxy
-#: src/gtkaccount.c:943 src/gtkaccount.c:991
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "Ei välityspalvelinta"
 
 #. HTTP
-#: src/gtkaccount.c:949 src/gtkaccount.c:998
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:955 src/gtkaccount.c:1005
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:961 src/gtkaccount.c:1012
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: src/gtkaccount.c:1058
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: src/gtkaccount.c:1062
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: src/gtkaccount.c:1078
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: src/gtkaccount.c:1117
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: src/gtkaccount.c:1494
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1520
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Näytä enemmän valintoja"
 
-#: src/gtkaccount.c:1521
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: src/gtkaccount.c:1913
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/gtkaccount.c:1917 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2384
+#: src/gtkaccount.c:2473
 #, 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:2398
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2226,99 +2268,104 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2402
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Tiedot"
 
-#: src/gtkaccount.c:2406
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
 #. Add button
-#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Anna tiedot chatistä johon haluat liittyä.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3177
+#: src/gtkblist.c:1133 src/gtkblist.c:3212
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3168
+#: src/gtkblist.c:1136 src/gtkblist.c:3203
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+#, fuzzy
+msgid "_Send File"
+msgstr "Lähetä tiedosto"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Liity"
 
 # XXX from gstt but conjugated, & should this be a verb?
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2326,134 +2373,134 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:2303
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/Työkalut/_Käyttäjätilitoiminnot"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Työkalut/_Liitännäistoiminnot"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirtot..."
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Chat-huone_lista"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2367
 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:2318
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2462,7 +2509,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2470,12 +2517,12 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2462
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2483,7 +2530,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:2463
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2491,7 +2538,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2499,7 +2546,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2507,7 +2554,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2515,7 +2562,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> "
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2523,7 +2570,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2531,7 +2578,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2539,7 +2586,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2547,7 +2594,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2555,97 +2602,97 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2781
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2899
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity Chattiin..."
 
-#: src/gtkblist.c:2902
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Chat-lista"
 
-#: src/gtkblist.c:2905
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3085
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:3053
+#: src/gtkblist.c:3088
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3091
 msgid "/Tools/Account Actions"
 msgstr "/Työkalut/Käyttäjätilitoiminnot"
 
-#: src/gtkblist.c:3059
+#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Työkalut/Liitännäistoiminnot"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3148
+#: src/gtkblist.c:3183
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3185
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3209
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3218
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:3221
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3191
+#: src/gtkblist.c:3226
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:3229
 msgid "_Away"
 msgstr "_Poissa"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:3199
+#: src/gtkblist.c:3234
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3996
 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. "
@@ -2656,11 +2703,11 @@
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:4264
+#: src/gtkblist.c:4299
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2668,11 +2715,11 @@
 "Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4330
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2680,15 +2727,15 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:4374
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4941 src/gtkblist.c:5038
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
@@ -2740,29 +2787,16 @@
 msgid "Time"
 msgstr "Aika"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "Tiedosto on jo olemassa"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "Haluatko ylikirjoittaa sen?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "Minä käyttää Gaim versiota v%s."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "Tuetut debug valinnat ovat: versio"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2770,561 +2804,566 @@
 "Kirjoita \"/help &alt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
-msgstr "Ei sellaista komentoa. Jos et halunnut kirjoittaa komentoa, voit ottaa komennot pois käytöstä Työkalut->Asetukset->Keskustelut->Käytä \"kauttaviiva\"-komentoja."
-
-#: src/gtkconv.c:476
+msgstr ""
+"Ei sellaista komentoa. Jos et halunnut kirjoittaa komentoa, voit ottaa "
+"komennot pois käytöstä Työkalut->Asetukset->Keskustelut->Käytä \"kauttaviiva"
+"\"-komentoja."
+
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
-msgstr "Syntaksivirhe: Kirjoitit komennolle väärän määrän argumentteja. Jos sinun ei ollut tarkoitus kirjoittaa komentoa, voit ottaa komennot pois käytöstä Työkalut->Asetukset->Keskustelut->Käytä \"kauttaviiva\"-komentoja."
-
-#: src/gtkconv.c:483
+msgstr ""
+"Syntaksivirhe: Kirjoitit komennolle väärän määrän argumentteja. Jos sinun ei "
+"ollut tarkoitus kirjoittaa komentoa, voit ottaa komennot pois käytöstä "
+"Työkalut->Asetukset->Keskustelut->Käytä \"kauttaviiva\"-komentoja."
+
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "Tämä komento toimii vain chatissä, ei pikaviesteissä."
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "Tämä komento toimii vain pikaviesteissä, ei chatissä."
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle protokollalle."
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 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:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+#, fuzzy
+msgid "Unable to open file."
+msgstr "Ei kyetty lukemaan tiedostoa %s."
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Tallenna keskustelu"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6798
+msgid "Send File"
+msgstr "Lähetä tiedosto"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+#, fuzzy
+msgid "Unable to save icon file to disk."
+msgstr "Ikonitiedostoa ei voida tallentaa levylle."
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Tallenna kuvake"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "Tallenna keskustelu"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/Keskustelu/Tyhjennä"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+#, fuzzy
+msgid "/Conversation/Se_nd File..."
+msgstr "/Keskustelu/Lähetä Tiedosto..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/Valinnat/Näytä _aikaleima"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Keskustelu/Lähetä Tiedosto..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Liitä kuva..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Lähetä"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Estä"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+#, fuzzy
+msgid "Send a file to the user"
+msgstr "Lähetä mobiiliviestinä"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4039
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Lisää chat tuttavalistalle"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Poista chat tuttavalistalta"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4016
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4028
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4627
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
 #, 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:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5901 src/gtkconv.c:5904
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6276
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai chattiin."
-
-#: src/gtkconv.c:6135
+msgstr ""
+"me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai chattiin."
+
+#: src/gtkconv.c:6279
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
-
-#: src/gtkconv.c:6139
+msgstr ""
+"debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
+
+#: src/gtkconv.c:6283
 msgid "help:  List available commands."
 msgstr "help: Listaa saatavillaolevat komennot."
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6287
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Tallenna Debug-loki"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Testausikkuna"
 
 # NOTE source: kde-fi.org
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Tauko"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Aikaleimat"
 
 # NOTE source (kt): galeon
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Valmis"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "Ohjelmaa tämän tiedostotyypin avaamiseen ei ole asetettu."
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "Virhe tapahtui avattaessa tiedostoa."
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "Valmiina"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "Valmiina"
+msgid "Filename"
+msgstr "Tiedostonimi"
 
 #: src/gtkft.c:503
-msgid "Filename"
-msgstr "Tiedostonimi"
+msgid "Size"
+msgstr "Koko"
 
 #: src/gtkft.c:510
-msgid "Size"
-msgstr "Koko"
-
-#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Tila:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Aikaa kulunut:"
 
 # NOTE: source: gnomeicu
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "Pidä tiedonsiirtoikkuna _auki"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Näytä tiedostosiirron yksityiskohdat"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Piilota tiedostosiirron yksityiskohdat"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "Tiedostoa ei ole."
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "Ei voida lähettää tiedostoa jonka koko on 0 tavua."
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "Tiedosto on jo olemassa."
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "Avaa..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s on lähettämässä sinulle %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Tiedosto on ladattavissa:\n"
-"Etäkone: %s\n"
-"Portti: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "_Liimaa tekstinä"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3332,18 +3371,18 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -3387,76 +3426,76 @@
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Keskustelut:"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
@@ -3507,7 +3546,7 @@
 msgstr "Selainkomento \"%s\" ei kelpaa."
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Ei kyetty avaamaan URL:ää"
 
@@ -3516,175 +3555,175 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
 # XXX probably partitive?
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 # XXX
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Ilmoitetaan kun"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "_Kirjautuu sisään"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "Kirjautuu _ulos"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "_Poissa"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "Palaa oltuaan _poissa"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "_Jouten"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Palaa oltuaan _jouten"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "T_uttava alkaa kirjoittaa"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Tuttava lope_ttaa kirjoittamisen"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "_Avaa pikaviesti-ikkuna"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "_Ponnahdus-ilmoitus"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "_Selaa"
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "_Selaa"
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "_Säilytä tämä ilmoitin aktivoinnin jälkeen"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Rajapintavalinnat"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Näytä palvelimelle tallennettu lempinimi jos aliasta ei ole asetettu"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3692,52 +3731,52 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "Näytä _aikaleimat viesteissä"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "_Sivuuta muotoilut tulevissa viesteissä"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Lähetä oletusmuotoilu lähetettävien viestien mukana"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3745,269 +3784,273 @@
 "Tältä ulosmenevä viesti näyttää kun käytät protokollaa joka tukee "
 "muotoiluja. :)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "_Tyhjennä muotoilu"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "\"Enter\" _lähettää viestin"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" lähettää viestin"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "Ikkunan sulkeminen"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "\"_Escape\" sulkee ikkunan"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "Lisäykset"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} muuttaa tekstimuotoiluja"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(numero) _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "_Järjestys:"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Tuttavien näyttö"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "Näytä _varoitustasot"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "Käytä \"kauttaviiva\"-komentoja"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Näytä _muotoilu-työkalurivi"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Näytä _a_liakset välilehdissä/otsikoissa"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavaikonin a_nimaatio"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "_Nosta pikaviesti-ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "Nosta _chat-ikkuna tapahtumahetkinä"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "Käytä _monivärisiä näyttönimiä chatissä"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "_Välilehtien sijoitus:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "Uusi keskustelu_asetettelu:"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4855
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Portit"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "_Ensimmäinen portti:"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "Viimeinen _portti:"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "Ei välityspalvelinta"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr ""
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "Gnome oletus"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4016,84 +4059,84 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "Järjestelmälokit"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "Ota järjestelmäloki _käyttöön"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Kirjaa lokiin tuttavien poistumiset/_palaamiset"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Kirjaa lokiin _omat sisäänkirjautumiset/joutenolot/poissaolot"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4102,88 +4145,88 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Soita"
 
 # NOTE source: gaim + google
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Kokeilu"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Jouten"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "X:n käyttö"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Windows:n käyttö"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4198,7 +4241,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4213,66 +4256,66 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 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:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
 # XXX
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Verkko"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -4296,7 +4339,7 @@
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Yksityisyys"
 
@@ -4361,28 +4404,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "Ei"
 
 # XXX dia uses "Sovella"
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Toteuta"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Sulje"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Tiedosto on jo olemassa"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Haluatko ylikirjoittaa sen?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#, fuzzy
+msgid "Save File..."
+msgstr "Lähetä tiedosto..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#, fuzzy
+msgid "Open File..."
+msgstr "Lähetä tiedosto..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Huonelista"
@@ -4453,23 +4514,15 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "Ikonitiedostoa ei voida tallentaa levylle."
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "Tallenna kuvake"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4478,7 +4531,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4487,25 +4540,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Teksti"
 
@@ -4597,12 +4650,12 @@
 msgstr "Hieman vähemmän tylsä oletusviesti"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -4614,12 +4667,12 @@
 msgid "Away for friends only"
 msgstr "Poissa vain ystäville"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
+#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4635,14 +4688,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Ei kyetty selvittämään isännän nimeä."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
@@ -4662,177 +4715,179 @@
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#, 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"
+
+# XXX need to check for gradation problems
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
+#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Tuttavan tiedot"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Yhteyttä ei kyetty muodostamaan"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Luetaan tietoja"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Tasapainottajan kättely"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Luetaan palvelinavainta"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Vaihdetaan avaimen hash-arvoa"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Kriittinen virhe GG-kirjastossa\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Palvelinta ei kyetty pingaamaan"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Lähetä viestinä"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Etsitään GG-palvelinta"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Epäkelpo Gadu-Gadu-UIN ilmoitettu"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 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:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Ei kyetty noutamaan hakutuloksia"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-hakukone"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Kunta"
 
-# XXX need to check for gradation problems
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Tuttavan tiedot"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 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:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Tuttavalista siirretty onnistuneesti Gadu-Gadu-palvelimelle"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Ei voitu siirtää tuttavalistaa Gadu-Gadu-palvelimelle"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Tuttavalista onnistuneesti poistettu Gadu-Gadu-palvelimelta"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Ei voitu poistaa tuttavalistaa Gadu-Gadu-palvelimelta"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Salasanaa ei voitu muuttaa"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Virhe kommunikoitaessa Gadu-Gadu palvelimen kanssa."
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4840,11 +4895,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:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Ei voitu tuoda Gadu-Gadu:n tuttavalistaa."
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4852,26 +4907,26 @@
 "Gaim ei saanut yhteyttä Gadu-Gadu tuttavalistapalvelimeen. Yritä myöhemmin "
 "uudelleen."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Tuttavalistan tallentaminen palvelimelle ei onnistunut"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 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:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu tuttavalistan poistaminen ei onnistu"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Hakemistoon ei yhteyttä"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4879,11 +4934,11 @@
 "Gaim ei voinut suorittaa hakua, koska hakemistopalvelimeen ei saatu "
 "yhteyttä. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Ei kyetty muuttamaan Gadu-Gadu -salasanaa"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4891,33 +4946,33 @@
 "Gaim ei voinut vaihtaa salasanaa koska yhteyttä Gadu-Gadu -palvelimelle ei "
 "voitu muodostaa. Yritä myöhemmin uudelleen."
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Käyttäjäprofiiliin ei pääsyä."
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4936,7 +4991,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
@@ -4950,14 +5005,14 @@
 msgstr "Käyttäjä %s (%s%s%s%s%s) haluaa luvan sinulta."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:6126
 msgid "Authorize"
 msgstr "Salli"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
+#: src/protocols/oscar/oscar.c:6127
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -4977,17 +5032,19 @@
 msgid "Gaim User"
 msgstr "Gaim-käyttäjä"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -5019,54 +5076,52 @@
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+#, fuzzy
+msgid "Server has disconnected"
+msgstr "Yhteys katkennut"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "Lähetä tiedosto"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Socketin luominen epäonnistui"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Aihe"
 
@@ -5079,34 +5134,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Portti"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Käyttäjänimi"
 
@@ -5131,12 +5187,12 @@
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Oikea nimi"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
@@ -5158,111 +5214,111 @@
 msgid "Buddy Information for %s"
 msgstr "Tuttavan %s tiedot"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim on lähettänyt viestin jota IRC-palvelin ei ymmärrä."
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -5275,50 +5331,67 @@
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [viesti]: Aseta poissaoloviesti, tai jätä viesti tyhjäksi poistaaksesi poissaolotilan."
+msgstr ""
+"away [viesti]: Aseta poissaoloviesti, tai jätä viesti tyhjäksi poistaaksesi "
+"poissaolotilan."
 
 #: src/protocols/irc/parse.c:111
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
-msgstr "deop &lt;nimi1&gt; [nimi2] ...: Poista kanavaoperaattorin status joltakulta. Sinun tulee olla kanavaoperaattori tehdäksesi näin."
+msgstr ""
+"deop &lt;nimi1&gt; [nimi2] ...: Poista kanavaoperaattorin status joltakulta. "
+"Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
 #: src/protocols/irc/parse.c:112
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
-msgstr "devoice &lt;nimi1&gt; [nimi2] ...: Poista ääni-tila joltakulta, estäen heitä puhumasta jos kanava on moderoitu (+m). Sinun tulee olla kanavaperaattori tehdäksesi näin."
+msgstr ""
+"devoice &lt;nimi1&gt; [nimi2] ...: Poista ääni-tila joltakulta, estäen heitä "
+"puhumasta jos kanava on moderoitu (+m). Sinun tulee olla kanavaperaattori "
+"tehdäksesi näin."
 
 #: src/protocols/irc/parse.c:113
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;nimi&gt; [huone]: Kutsu joku liittymään kanssasi tietylle tai tämänhetkiselle kanavalle."
+msgstr ""
+"invite &lt;nimi&gt; [huone]: Kutsu joku liittymään kanssasi tietylle tai "
+"tämänhetkiselle kanavalle."
 
 #: src/protocols/irc/parse.c:114
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle tai useammalle kanavalle, antaen myös kanava-avaimen mikäli tarpeen."
+msgstr ""
+"j &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle tai "
+"useammalle kanavalle, antaen myös kanava-avaimen mikäli tarpeen."
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle tai useammalle kanavalle antaen myös kanava-avaimen mikäli tarpeen."
+msgstr ""
+"join &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle "
+"tai useammalle kanavalle antaen myös kanava-avaimen mikäli tarpeen."
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr "kick &lt;nimi&gt; [viesti]: Poista joku kanavalta. Sinun tulee olla kanavaoperaattori tehdäksesi näin."
+msgstr ""
+"kick &lt;nimi&gt; [viesti]: Poista joku kanavalta. Sinun tulee olla "
+"kanavaoperaattori tehdäksesi näin."
 
 #: src/protocols/irc/parse.c:117
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
-msgstr "list: Näytä lista chat-huoneista verkossa. <i>Varoitus, jotkut palvelimet saattavat katkaista yhteytesi jos teet näin.</i>"
+msgstr ""
+"list: Näytä lista chat-huoneista verkossa. <i>Varoitus, jotkut palvelimet "
+"saattavat katkaista yhteytesi jos teet näin.</i>"
 
 #: src/protocols/irc/parse.c:118
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -5328,19 +5401,23 @@
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
-msgstr "mode &lt;nimi|kanava&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Aseta tai poista kanavan tai käyttäjän tila."
+msgstr ""
+"mode &lt;nimi|kanava&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Aseta tai poista kanavan "
+"tai käyttäjän tila."
 
 #: src/protocols/irc/parse.c:120
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (ollessasi kanavalla)."
+msgstr ""
+"msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle "
+"(ollessasi kanavalla)."
 
 #: src/protocols/irc/parse.c:121
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -5348,31 +5425,41 @@
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
-msgstr "op &lt;nimi1&gt; [nimi2] ...: Anna kanavaoperaattorin status jollekulle. Sinun tulee olla kanavaoperaattori tehdäksesi näin."
+msgstr ""
+"op &lt;nimi1&gt; [nimi2] ...: Anna kanavaoperaattorin status jollekulle. "
+"Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
 #: src/protocols/irc/parse.c:124
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr "operwall &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti tule käyttää tätä."
+msgstr ""
+"operwall &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
+"tule käyttää tätä."
 
 #: src/protocols/irc/parse.c:125
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [huone] [viesti]: Poistu tämänhetkiseltä kanavalta tai tietyltä kanavalta valinnaisen viestin kanssa."
+msgstr ""
+"part [huone] [viesti]: Poistu tämänhetkiseltä kanavalta tai tietyltä "
+"kanavalta valinnaisen viestin kanssa."
 
 #: src/protocols/irc/parse.c:126
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [nimi]: Kysyy kuinka paljon viivettä käyttäjällä(tai palvelimella jos ei käyttäjää annettu) on."
+msgstr ""
+"ping [nimi]: Kysyy kuinka paljon viivettä käyttäjällä(tai palvelimella jos "
+"ei käyttäjää annettu) on."
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (kun olet kanavalla)."
+msgstr ""
+"query &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (kun "
+"olet kanavalla)."
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -5386,7 +5473,9 @@
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;nimi&gt; [viesti]: Poista joku huoneesta. Sinun tulee olla kanavaoperaattori tehdäksesi näin."
+msgstr ""
+"remove &lt;nimi&gt; [viesti]: Poista joku huoneesta. Sinun tulee olla "
+"kanavaoperaattori tehdäksesi näin."
 
 #: src/protocols/irc/parse.c:131
 msgid "topic [new topic]:  View or change the channel topic."
@@ -5400,19 +5489,23 @@
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr "voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun tulee olla kanavaoperaattori tehdäksesi näin."
+msgstr ""
+"voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun "
+"tulee olla kanavaoperaattori tehdäksesi näin."
 
 #: src/protocols/irc/parse.c:134
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti tulee käyttää sitä."
+msgstr ""
+"wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
+"tulee käyttää sitä."
 
 #: src/protocols/irc/parse.c:135
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5432,7 +5525,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5468,87 +5561,88 @@
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Maa"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Sähköposti"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4883
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -5569,25 +5663,25 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Tila"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Lähde"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Osoite"
 
@@ -5608,31 +5702,31 @@
 msgid "Jabber Profile"
 msgstr "Jabber-profiili"
 
-#: src/protocols/jabber/buddy.c:936
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: src/protocols/jabber/buddy.c:939
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Peruuta paikallaoloilmoitus"
 
-#: src/protocols/jabber/buddy.c:952
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "Pyydetään lupaa uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:960
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -5719,451 +5813,452 @@
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Virhe session alustuksessa"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Socketin luonti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "Sähköposti"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Kirjautui ulos."
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "molemmille"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "vain sinulle"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "vain sinulta"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6690
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:979
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
 # XXX minor editing of existing string
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasanaa"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
 # NOTE source: gftt
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Poistunut"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Ei hyväksyttävä"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä koodaus valtuutusviestissä"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Väärä formaatti"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Koodausta ei tuettu"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(Stanza type) ei tuettu"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "Huonostimuotoiltua XML:ää"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Datavirta(stream) -virhe"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi chat-huone."
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi chat-huone."
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy chat-huoneeseen."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [huone]: Kutsu käyttäjä huoneeseen."
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;huone&gt; [palvelin]: Liity chattiin tällä palvelimella."
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msh &lt;käyttäjä&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle."
-
-#: src/protocols/jabber/jabber.c:1452
+msgstr ""
+"msh &lt;käyttäjä&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle."
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Piilota käyttöjärjestelmä"
 
@@ -6178,24 +6273,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -6339,7 +6434,7 @@
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
@@ -6487,8 +6582,8 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
@@ -6566,88 +6661,88 @@
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Lähetä"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Aseta kotipuhelinnumero"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Aseta työpuhelinnumero"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Aseta matkapuhelinnumero"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Aseta päälle/pois mobiililaitteet"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Salli/estä mobiilihaut"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Aloita chat"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Päivitä tuttavakuvaketta"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6655,113 +6750,129 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>Alias:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "MSN ID"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+#, fuzzy
+msgid "MSN Profile"
+msgstr "Aseta profiili"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Ammatti"
 
 # NOTE actual string used by msn itself, lit. "Self description"
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b>"
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "Profiili URL"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "Käyttäjän profiili on tyhjä."
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Näytä keskustelu suljettu-viestit"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Näytä aikakatkaisuviestit"
 
@@ -6776,15 +6887,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
@@ -6806,11 +6917,11 @@
 msgstr "Noudetaan tuttavalista"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6839,7 +6950,7 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "Synkronoidaan palvelimen kanssa"
 
@@ -6872,11 +6983,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "Saatiin HTTP-virhe. Raportoi tästä, kiitos."
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "Keskustelu on tullut inaktiiviseksi ja aikakatkaistu."
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s on sulkenut keskusteluikkunan."
@@ -6936,7 +7047,7 @@
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Ryhmä"
@@ -6952,91 +7063,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protokollaliitännäinen"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Vaadittuja parametreja ei syötetty"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Ei voida kirjoittaa verkkoon"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Ei voida lukea verkosta"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Virhe kommunikoitaessa palvelimelle"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Konferenssia ei löydy"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Konferenssia ei ole"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Sen niminen hakemisto on jo olemassa"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Ei tueta"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Salasana vanhentunut"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Virheellinen salasana"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Käyttäjää ei löytynyt"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Käyttäjätili on poistettu käytöstä"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Palvelin ei pääse hakemistoon"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Järjestelmänne ylläpitäjä on estänyt tämän toiminnon."
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Palvelin ei ole käytössä; yritä myöhemmin uudelleen"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Tuttavaa ei voi lisätä samaan hakemistoon kahdesti"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Et voi lisätä itseäsi"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Pääarkisto on väärin konfiguroitu"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Epäkelpo käyttäjänimi tai salasana"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ei voitu tunnistaa syöttämäsi käyttäjän isäntää."
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -7044,31 +7155,31 @@
 "Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on "
 "syötetty"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Et voi lisätä samaa henkilöä kahdesti keskusteluun"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Olet saavuttanut rajasi sallittujen tuttavien määrässä"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Olet syöttänyt epäkelvon käyttäjänimen"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Virhe tapahtui päivitettäessä hakemistoa"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Epäyhteensopiva protokollaversio"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Käyttäjä on estänyt sinut"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7076,11 +7187,11 @@
 "Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena "
 "sisään samaan aikaan"
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "Käyttäjä on joko poissa linjoilta tai sinut on estetty"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
@@ -7165,7 +7276,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
@@ -7175,11 +7286,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "Ei voitu luoda konferenssia (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "Käyttäjätunnus"
 
@@ -7190,47 +7301,47 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Koko nimi"
 
 # XXX could be wrong
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "Käyttäjän valinnat"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Virhe käsiteltäessä tapahtumaa tai vastausta. (%s)"
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7241,16 +7352,16 @@
 "\n"
 "Lähetetty: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7260,7 +7371,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7268,29 +7379,29 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 # src/sidebar.c:103
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "Viesti"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "Aloita _Chat"
 
@@ -7305,15 +7416,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GrouWise Messenger-protokollaliitännäinen"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Palvelimen portti"
 
@@ -7414,161 +7525,169 @@
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+#, fuzzy
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(Tämän viestin muunnoksessa oli virhe. Katso 'koodaus'-optio tilieditorista)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Ääni"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Pelit"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "ICQ suorayhteys"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
 # XXX edit of similar string
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Video"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Kamera"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6693
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6691
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6692
 msgid "Occupied"
 msgstr "Varattu"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Suorayhteys epäonnistui"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Yritetään yhdistää %s @ %s:%h suoraa pikaviestiä varten."
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pyydetään %s yhdistämään meihin @ %s:%h suoraa pikaviestiyhteyttä varten."
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviesti-yhteyttä"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, 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:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7577,24 +7696,24 @@
 "Haluatko jatkaa? "
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Chat ei ole parhaillaan käytettävissä"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7605,48 +7724,48 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 # XXX minor but not completely trivial editing of fuzzy text
 # NOTE "file descriptor" translation from ATK sanasto
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Socketin muodostus epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7656,21 +7775,21 @@
 "pidempään."
 
 # NOTE source: 0.59.8 (+ "%s")
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, 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:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7679,24 +7798,24 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-protokollaa "
 "kunnes tämä on korjattu. Tarkista päivitykset: %s "
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 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:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3321
 #, 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:3307
+#: src/protocols/oscar/oscar.c:3324
 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 "
@@ -7706,19 +7825,19 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3360
 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:3351
+#: src/protocols/oscar/oscar.c:3368
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3369
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3399
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7727,23 +7846,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3404 src/protocols/oscar/oscar.c:3406
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
+#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
+#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6164
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3462
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3545
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7752,11 +7871,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3565
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7767,17 +7886,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3566
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3573
 #, 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:3564
+#: src/protocols/oscar/oscar.c:3581
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7790,7 +7909,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3589
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7803,7 +7922,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3597
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7816,36 +7935,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3618
 #, 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:3607
+#: src/protocols/oscar/oscar.c:3624
 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:3611
+#: src/protocols/oscar/oscar.c:3628
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3713
 #, 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:3705
+#: src/protocols/oscar/oscar.c:3722
 #, 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:3714
+#: src/protocols/oscar/oscar.c:3731
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7855,7 +7974,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:3723
+#: src/protocols/oscar/oscar.c:3740
 #, 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."
@@ -7863,69 +7982,64 @@
 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:3732
+#: src/protocols/oscar/oscar.c:3749
 #, 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:3741
+#: src/protocols/oscar/oscar.c:3758
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3815 src/protocols/oscar/oscar.c:4039
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: src/protocols/oscar/oscar.c:3803
-#, 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:3864
+#: src/protocols/oscar/oscar.c:3881
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3882
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3917
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3976
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3999
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4002
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4090
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 # NOTE source: 0.59.8 (%d -> %hu)
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4276
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7933,11 +8047,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4494
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4495
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7946,123 +8060,123 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4558
 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:4542
+#: src/protocols/oscar/oscar.c:4560
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4591
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4874
 msgid "Not specified"
 msgstr "Ei määritelty"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4891
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4895
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4882
+#: src/protocols/oscar/oscar.c:4900
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
+#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4908
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4898
+#: src/protocols/oscar/oscar.c:4916
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4917
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4918
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4919
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4921
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4927
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4976
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4997
 #, 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:4983
+#: src/protocols/oscar/oscar.c:5001
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5018
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5039
 #, 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:5023
+#: src/protocols/oscar/oscar.c:5041
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5069
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8071,7 +8185,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5075
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8080,7 +8194,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:5060
+#: src/protocols/oscar/oscar.c:5078
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8089,7 +8203,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5081
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8098,7 +8212,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:5066
+#: src/protocols/oscar/oscar.c:5084
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8107,7 +8221,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:5069
+#: src/protocols/oscar/oscar.c:5087
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8116,12 +8230,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5090
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5100
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8130,27 +8244,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5106
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5171
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5345
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5346
 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 "
@@ -8160,7 +8274,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5373
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8173,19 +8287,19 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5378
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
 msgid "Visible"
 msgstr "Näkyvä"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5412
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5413
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8195,7 +8309,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5453
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8209,11 +8323,11 @@
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
 # XXX
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5458
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5536
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8224,16 +8338,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:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
+#: src/protocols/oscar/oscar.c:5998
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5698
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5699
 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 "
@@ -8242,13 +8356,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
+#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5984
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8258,11 +8372,11 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5997
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8272,7 +8386,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:6053
+#: src/protocols/oscar/oscar.c:6079
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8282,11 +8396,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6085
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6118
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8296,17 +8410,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6160
 #, 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:6135
+#: src/protocols/oscar/oscar.c:6161
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6164
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8317,74 +8431,74 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6165
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6224
 msgid "Invalid chat name specified."
 msgstr "Virheellinen chat nimi annettu."
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6314
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM chatissä."
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6471
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6756
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6774
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6780
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6792
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6814
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6844
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6845
 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:6826
+#: src/protocols/oscar/oscar.c:6852
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6904
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6949
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6952
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6953
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8393,76 +8507,76 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6970
 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:6945
+#: src/protocols/oscar/oscar.c:6971
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6972
 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:6963
+#: src/protocols/oscar/oscar.c:6989
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6990
 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:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7072 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7077
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7083
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7093
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7097
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7106
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7110
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7114
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7118
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7125
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7131
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7136
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
@@ -8477,15 +8591,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7275
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7280
 msgid "Auth port"
 msgstr "portti"
 
@@ -8574,32 +8688,32 @@
 msgstr "Aseta pikaviestin salasana"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
@@ -8616,6 +8730,11 @@
 "Et voi saada tuttavan tiedotteita ennenkuin lisäät hänen julkisen avaimensa. "
 "Voit käyttää Hae Julkinen avain-komentoa saadaksesi julkisen avaimen."
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Avaa..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8676,143 +8795,112 @@
 msgid "Robot"
 msgstr "Robotti"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Onnellinen"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Surullinen"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Vihainen"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Häpeää"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "Rakastunut"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Unelias"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Tylsistynyt"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Innostunut"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Levoton"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "Tilat"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#, fuzzy
+msgid "User Modes"
+msgstr "Käyttäjätila"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "Mieliala"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "Kaukohaku"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "Aloita videoneuvottelu"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "Suosittu kieli"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "Laite"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "Tietokone"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "Pääte"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Lähetä tiedosto..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
@@ -8825,8 +8913,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Kanavaa %s ei ole verkossa"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "Kanavatiedot"
 
@@ -8834,88 +8921,80 @@
 msgid "Cannot get channel information"
 msgstr "Ei saada kanavatietoja"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, fuzzy, c-format
+msgid "<b>Channel Name:</b> %s"
 msgstr "Kanavan nimi:           %s\n"
 
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "Käyttäjien lukumäärä:           %d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
+#: src/protocols/silc/chat.c:108
+#, fuzzy, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<b>Käyttäjä:</b> %s<br>"
+
+#: src/protocols/silc/chat.c:115
+#, fuzzy, c-format
+msgid "<br><b>Channel Founder:</b> %s"
 msgstr "Kanavan perustaja:      %s\n"
 
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
+#: src/protocols/silc/chat.c:124
+#, fuzzy, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "Kanavan salausalgoritmi:                %s\n"
 
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "Kanavan HMAC:           %s\n"
-
 #: src/protocols/silc/chat.c:127
-#, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
+#, fuzzy, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "Kanavan HMAC:           %s\n"
+
+#: src/protocols/silc/chat.c:132
+#, fuzzy, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr ""
 "\n"
 "Kanavan aihe:\n"
 "        %s\n"
 
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr "\nKanavan tilat:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
+#: src/protocols/silc/chat.c:137
+#, fuzzy
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+"\n"
+"Kanavan tilat:\n"
+
+#: src/protocols/silc/chat.c:150
+#, fuzzy, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 "\n"
 "Perustajan avain Fingerprint\n"
 "%s\n"
 "\n"
 
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
+#: src/protocols/silc/chat.c:151
+#, fuzzy, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 "Perustajan avain Babbleprint:\n"
 "%s"
 
-#: src/protocols/silc/chat.c:218
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8929,124 +9008,124 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "Lisää / Poista"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "Käyttäjärajoitus"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <<I>%s</I> on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1040
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -9097,223 +9176,269 @@
 msgid "Cannot send file"
 msgstr "Tiedoston lähetys ei onnistu"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Poistettu %s (%s)"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "Kirjaa ulos palvelimelta"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "Titteli"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "Sähköposti"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "Huomautus"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "Liity Chattiin"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "Verkkoisäntä"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "Käyttäjätila"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "Kanavat"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen Fingerprint"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen Babbleprint"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "Lisää..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "Ei voida irroittaa"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "Ei voida asettaa aihetta"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+#, fuzzy
+msgid "Failed to change nickname"
+msgstr "Ei kyetty muuttamaan kutsumanimeä"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "Huonelista"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "Huonelistaa ei saatu"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#, fuzzy
+msgid "Server Statistics"
+msgstr "Palvelimen osoite"
+
+#: src/protocols/silc/ops.c:1315
+#, fuzzy
+msgid "Cannot get server statistics"
+msgstr "Ei saada palvelimen tietoja"
+
+#: src/protocols/silc/ops.c:1324
+#, fuzzy
+msgid "No server statisitics available"
+msgstr "Ei toimintoja saatavilla."
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+#, fuzzy
+msgid "Ping"
+msgstr "Kaukohaku"
+
+#: src/protocols/silc/ops.c:1377
+#, fuzzy
+msgid "Ping failed"
+msgstr "Yhteys epäonnistui"
+
+#: src/protocols/silc/ops.c:1382
+#, fuzzy
+msgid "Ping reply received from server"
+msgstr "Kelvoton vastaus palvelimelta"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "Ei voitu poistaa käyttäjää"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "Avaintenvaihto epäonnistui"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versio-virhe, päivitä ohjelmisto"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:a"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Virhe: Etäkone ei tue ehdotettua hash-funktiota"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
@@ -9377,15 +9502,15 @@
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9393,31 +9518,43 @@
 "\n"
 "Suosimasi yhteysmetodit"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "Aloita videoneuvottelu"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "Online palvelut"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "VCard tiedostosi"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaoloatribuutit"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9427,113 +9564,240 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "Päivän viesti ei ole käytettävissä"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: src/protocols/silc/silc.c:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "Tila"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "Näytä Päivän viesti"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: src/protocols/silc/silc.c:1159
-msgid "part:  Leave the chat"
+#: src/protocols/silc/silc.c:962
+#, fuzzy
+msgid "Failed to leave channel"
+msgstr "Chattiin liittyminen epäonnistui"
+
+#: src/protocols/silc/silc.c:1006
+#, fuzzy
+msgid "Topic too long"
+msgstr "Profiili on liian pitkä"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1189
+#, fuzzy, c-format
+msgid "channel %s not found"
+msgstr "Konferenssia ei löydy"
+
+#: src/protocols/silc/silc.c:1194
+#, fuzzy, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s:n aihe on: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, fuzzy, c-format
+msgid "no channel modes are set on %s"
+msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
+
+#: src/protocols/silc/silc.c:1209
+#, fuzzy, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Kuvan tallennus epäonnistui: %s\n"
+
+#: src/protocols/silc/silc.c:1239
+#, fuzzy, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "Tuntematon komento: %s"
+
+#: src/protocols/silc/silc.c:1302
+#, fuzzy
+msgid "part [channel]:  Leave the chat"
 msgstr "part: Poistu chatistä"
 
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
+#: src/protocols/silc/silc.c:1306
+#, fuzzy
+msgid "leave [channel]:  Leave the chat"
 msgstr "leave: Poistu chatistä"
 
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: src/protocols/silc/silc.c:1175
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: src/protocols/silc/silc.c:1191
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: src/protocols/silc/silc.c:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
+#: src/protocols/silc/silc.c:1343
+#, fuzzy
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
+
+#: src/protocols/silc/silc.c:1347
+#, fuzzy
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1356
+#, fuzzy
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
+
+#: src/protocols/silc/silc.c:1360
+#, fuzzy
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
+
+#: src/protocols/silc/silc.c:1364
+#, fuzzy
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"mode &lt;nimi|kanava&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Aseta tai poista kanavan "
+"tai käyttäjän tila."
+
+#: src/protocols/silc/silc.c:1368
+#, fuzzy
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"mode &lt;nimi|kanava&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Aseta tai poista kanavan "
+"tai käyttäjän tila."
+
+#: src/protocols/silc/silc.c:1372
+#, fuzzy
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta itsellesi käyttäjätilavalinnat"
 
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1380
+#, fuzzy
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1392
+#, fuzzy
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1409
+#, fuzzy
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "Pikaviestit"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "Allekirjoita kaikki pikaviestit digitaalisesti"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "Tarkista kaikki pikaviesti allekirjoitukset"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "Kanavaviestit"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "Allekirjoita kaikki kanavaviestit digitaalisesti"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "Tarkista kaikki kanavan viesti-allekirjoitukset"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "Oletus SILC avainpari"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "SILC julkinen avain"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "SILC Yksityinen avain"
 
@@ -9547,112 +9811,130 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokollaplugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokolla"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "Julkinen avaintiedosto"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "Yksityinen avaintiedosto"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolo-tilan atribuuttipyynnöt"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi: \t%s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi: \t%s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Etunimi: \t%s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio: \t%s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa: \t%s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
+#: src/protocols/silc/util.c:321
+#, fuzzy, c-format
+msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi: \t\t%s\n"
 
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus: \t%d bits\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
-msgstr "Julkisen avaimen Fingerprint:\n"
+msgstr ""
+"Julkisen avaimen Fingerprint:\n"
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:304
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
-msgstr "Julkisen avaimen Babbleprint\n"
+msgstr ""
+"Julkisen avaimen Babbleprint\n"
 "%s"
 
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "Kaukohaku"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "Tietokone"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "Pääte"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9859,15 +10141,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC-portti"
 
@@ -9952,11 +10234,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokollaliitännäinen"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -9964,27 +10246,27 @@
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai "
 "laitteesta."
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Huomio!!"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! järjestelmäviesti käyttäjälle %s:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, 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:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9993,11 +10275,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10009,11 +10291,11 @@
 "päivitykset osoitteesta: %s."
 
 # NOTE edit of "Authentication failed"
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10023,77 +10305,92 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Älä välitä?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+#, fuzzy
+msgid "Normal authencation failed!"
+msgstr "Todennus epäonnistui"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 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:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Tuntematon viesti numero &d. Kirjautumalla Yahoo! verkkosivuille saattaa korjata tämän."
-
-#: src/protocols/yahoo/yahoo.c:1862
+msgstr ""
+"Tuntematon viesti numero &d. Kirjautumalla Yahoo! verkkosivuille saattaa "
+"korjata tämän."
+
+#: src/protocols/yahoo/yahoo.c:1894
 #, 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:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -10102,27 +10399,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Liity chattiin"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään chatissä?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Aktivoi ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
@@ -10137,44 +10434,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokollaliitännäinen"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3310
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3319
 msgid "Japan Pager host"
 msgstr "Isäntä (Japani)"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "Pager port"
 msgstr "Portti"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3328
 msgid "Japan File transfer host"
 msgstr "Tiedostosiirtopalvelin (Japani)"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "Chathuonelista Url"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3340
+#, fuzzy
+msgid "YCHT Port"
+msgstr "Portti"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
@@ -10183,152 +10489,181 @@
 "Gaim ei voi lähettää Yahoo!-protokollan kautta tiedostoja jotka ovat "
 "suurempia kuin yksi megatavu (1 048 576 tavua)."
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-osoite:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+#, fuzzy
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo Japan"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+#, fuzzy
+msgid "Yahoo! Profile"
+msgstr "Profiili"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Tällä hetkellä profiileja jotka on merkitty sisältämään aikuisviihdettä, ei tueta."
-
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+msgstr ""
+"Tällä hetkellä profiileja jotka on merkitty sisältämään aikuisviihdettä, ei "
+"tueta."
+
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
-msgstr "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä selaimessasi"
-
-#: src/protocols/yahoo/yahoo_profile.c:827
+msgstr ""
+"Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
+"selaimessasi"
+
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+# NOTE from msn
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "Harrastukset"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "Uutiset"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "Kotisivu"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "Linkki 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "Linkki 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "Linkki 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "Tämä profiili näyttää käyttävän kieltä jota ei tueta tällä hetkellä."
 
-# NOTE from msn
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "Harrastukset"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "Uutiset"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "Kotisivu"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "Linkki 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "Linkki 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "Linkki 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "Käyttäjän profiili on tyhjä."
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Chattiin liittyminen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Ehkä huone on täynnä?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan chat-huoneeseen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole chatissä?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Huonelistan haku epäonnistui."
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Äänet"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Huonelistaa ei voida hakea."
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "Käyttäjän Huoneet"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Ei voida lähettää chattiin %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
 # TODO
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
 # Context unclear.
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Zephyriin jo kirjauduttu"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10336,18 +10671,84 @@
 "Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin yhtä "
 "tiliä."
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1678
+#, fuzzy
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "whois &lt;nimi&gt;: Hae tietoja käyttäjästä."
+
+#: src/protocols/zephyr/zephyr.c:1683
+#, fuzzy
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "whois &lt;nimi&gt;: Hae tietoja käyttäjästä."
+
+#: src/protocols/zephyr/zephyr.c:1688
+#, fuzzy
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
+
+#: src/protocols/zephyr/zephyr.c:1693
+#, fuzzy
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "invite &lt;nimi&gt;: Kutsu käyttäjä tälle kanavalle"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1802
+#, fuzzy
+msgid "Resubscribe"
+msgstr "Poista listalta"
+
+#: src/protocols/zephyr/zephyr.c:1805
+#, fuzzy
+msgid "Retrieve subscriptions from server"
+msgstr "Kelvoton vastaus palvelimelta"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10359,20 +10760,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 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:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Altistus"
 
@@ -10401,14 +10802,14 @@
 "Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle. "
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Oma"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Hyväksy"
 
@@ -10432,27 +10833,27 @@
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s kirjautui sisään"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s palasi"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s on poissa"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
@@ -10462,17 +10863,17 @@
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s on kirjautui ulos"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10481,11 +10882,11 @@
 "Tiliä %s on juuri varoittanut %s.\n"
 "Uusi varoitustasosi on %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "nimetön käyttäjä"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10494,12 +10895,12 @@
 "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Hyväksy kutsu?"
 
@@ -10535,25 +10936,32 @@
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/util.c:2399
+#: src/util.c:2392
+#, fuzzy
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "Kuvake"
+msgstr[1] "Kuvake"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
@@ -10569,6 +10977,30 @@
 msgid "Notification"
 msgstr "Ilmoitus"
 
+#~ msgid "Invalid Groupname"
+#~ msgstr "Epäkelpo ryhmänimi"
+
+#~ msgid "That file already exists."
+#~ msgstr "Tiedosto on jo olemassa."
+
+#~ msgid "Save As..."
+#~ msgstr "Tallenna nimellä..."
+
+#~ msgid "MSN ID"
+#~ msgstr "MSN ID"
+
+#~ msgid "Modes"
+#~ msgstr "Tilat"
+
+#~ msgid "User Count:\t\t%d\n"
+#~ msgstr "Käyttäjien lukumäärä:           %d\n"
+
+#~ msgid "Hostname"
+#~ msgstr "Verkkoisäntä"
+
+#~ msgid "Channels"
+#~ msgstr "Kanavat"
+
 #~ msgid "Buddy icon file:"
 #~ msgstr "Tuttavakuvaketiedosto:"
 
@@ -11004,12 +11436,6 @@
 #~ msgid "Normal font size"
 #~ msgstr "Normaali kirjasin koko"
 
-#~ msgid "Disconnected"
-#~ msgstr "Yhteys katkennut"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "Kelvoton vastaus palvelimelta"
-
 #~ msgid "Could not connect for transfer!"
 #~ msgstr "Yhteyttä siirtoa varten ei voitu muodostaa!"
 
@@ -11150,9 +11576,6 @@
 #~ msgid "/Conversation/Send _File..."
 #~ msgstr "/Keskustelu/Lähetä _Tiedosto..."
 
-#~ msgid "/Conversation/Send File..."
-#~ msgstr "/Keskustelu/Lähetä Tiedosto..."
-
 #~ msgid "%s (Code %s)"
 #~ msgstr "%s (Koodi %s)"