changeset 9351:e537f33dc064

[gaim-migrate @ 10159] helps if i upload from the right tarball committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 22 Jun 2004 19:09:24 +0000
parents da075a155501
children cc2baf349805
files po/fi.po
diffstat 1 files changed, 2580 insertions(+), 2050 deletions(-) [+]
line wrap: on
line diff
--- a/po/fi.po	Tue Jun 22 18:58:05 2004 +0000
+++ b/po/fi.po	Tue Jun 22 19:09:24 2004 +0000
@@ -7,10 +7,10 @@
 # NOTE gftt is http://gnome-fi.sourceforge.net/
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.78\n"
+"Project-Id-Version: gaim 0.79\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-24 21:09-0400\n"
-"PO-Revision-Date: 2004-05-26 18:44+0300\n"
+"POT-Creation-Date: 2004-06-21 00:02-0400\n"
+"PO-Revision-Date: 2004-06-22 18:18+0300\n"
 "Last-Translator: Arto Alakulju <arto@alakulju.net>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +148,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
 msgid "Auto-login"
 msgstr "Automaattinen kirjautuminen"
 
@@ -164,14 +164,14 @@
 msgid "New..."
 msgstr "Uusi..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
+#: 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
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
-#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
+#: 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/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Poissa"
@@ -179,7 +179,7 @@
 # src/menus.c:327
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
+#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
 msgid "Back"
 msgstr "Palaa"
 
@@ -193,11 +193,11 @@
 msgid "File Transfers"
 msgstr "Tiedostosiirtot"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -250,6 +250,43 @@
 "kirjautumisikkunan välillä. Myöskin mahdollistaa ICQ-tyylisen viestien "
 "varastoinnin kunnes ne näytetään painamalla ikonia."
 
+#: plugins/extplacement.c:68
+msgid "By conversation count"
+msgstr "Keskustelujen määrän mukaan"
+
+#: plugins/extplacement.c:89
+msgid "Conversation Placement"
+msgstr "Keskustelun asettelu"
+
+#: plugins/extplacement.c:94
+msgid "Number of conversations per window"
+msgstr "Keskustelujen määrä per ikkuna"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:114
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:116
+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"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -418,15 +455,15 @@
 #: 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:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
-#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
+#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
 msgid "None"
 msgstr "Ei mitään"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
-#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
+#: 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
 msgid "Name"
 msgstr "Nimi"
 
@@ -441,13 +478,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
 msgid "Search"
 msgstr "Etsi"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
-#: src/gtkblist.c:4312
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
+#: src/gtkblist.c:4339
 msgid "Group:"
 msgstr "Ryhmä:"
 
@@ -486,9 +523,9 @@
 msgid "_Associate Buddy"
 msgstr "_Assosioi tuttava"
 
-#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
+#: 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
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Tuttavat"
 
@@ -551,7 +588,7 @@
 msgstr "Valinnaiset lisätiedot:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
 #: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
@@ -620,7 +657,7 @@
 msgid "_Set"
 msgstr "_Aseta"
 
-#: plugins/idle.c:67 src/dialogs.c:793
+#: plugins/idle.c:67 src/dialogs.c:786
 msgid "_Cancel"
 msgstr "_Peruuta"
 
@@ -692,71 +729,71 @@
 "Lisää pienen neliön tuttavalistaan joka ilmoittaa uudesta sähköpostista."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "Huomautus"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "_Pikaviesti-ikkunoille"
 
-#: plugins/notify.c:583
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "C_hat-ikkunoille"
 
 # TODO Untranslated
-#: plugins/notify.c:590
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "_Kohdistetuille ikkunoille"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "Ilmoitusmetodit"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "Lisää _merkkijono ikkunaotsikon eteen:"
 
 #. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr "Lisää uusien _viestien määrä ikkunaotsikkoon"
 
 #. Urgent method button
-#: plugins/notify.c:633
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aseta ikkunamanagerin \"_URGENT\"(kiireellinen)-lippu"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "Huomautuksen poisto"
 
 #. Remove on focus button
-#: plugins/notify.c:646
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "Poista kun keskusteluikkuna on _aktiivinen"
 
 #. Remove on click button
-#: plugins/notify.c:654
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "Poista kun keskusteluikkunaa _klikataan"
 
 #. Remove on type button
-#: plugins/notify.c:662
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "Poista kun keskusteluikkunaan _kirjoitetaan"
 
 #. Remove on message send button
-#: plugins/notify.c:670
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "Poista kun viesti _lähetetään"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:679
-msgid "Remove on conversation ta_b switch"
-msgstr "Poista kun keskustelu-_välilehti vaihtuu"
+#: plugins/notify.c:704
+msgid "Remove on switch to conversation ta_b"
+msgstr "Poista kun _välilehti vaihtuu"
 
 #. *< api_version
 #. *< type
@@ -765,7 +802,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:792
 msgid "Message Notification"
 msgstr "Viestihuomautus"
 
@@ -773,7 +810,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
 
@@ -996,7 +1033,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:910
+#: plugins/statenotify.c:30
 #, c-format
 msgid "%s has gone away."
 msgstr "%s on poissa."
@@ -1065,20 +1102,20 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
 
-#: plugins/timestamp.c:95
+#: plugins/timestamp.c:185
 msgid "iChat Timestamp"
 msgstr "iChat-tyylinen aikaleima"
 
-#: plugins/timestamp.c:102
+#: plugins/timestamp.c:192
 msgid "Delay"
 msgstr "Viive"
 
-#: plugins/timestamp.c:109
+#: plugins/timestamp.c:199
 msgid "minutes."
 msgstr "minuuttia."
 
 # NOTE source: dia
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:205
 msgid "_Apply"
 msgstr "_Toteuta"
 
@@ -1089,7 +1126,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:268
 msgid "Timestamp"
 msgstr "Aikaleima"
 
@@ -1097,7 +1134,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Lisää iChat tyylisen aikaleiman keskusteluihin N sekunnin välein."
 
@@ -1124,7 +1161,7 @@
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
@@ -1181,8 +1218,8 @@
 msgstr "_Käynnistä gaim windowsin käynnistyessä."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
-#: src/gtkprefs.c:2503
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
+#: src/gtkprefs.c:2399
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1201,8 +1238,8 @@
 msgstr "_Pidä tuttavalistaikkuna päälimmäisenä."
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
-#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
+#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1229,243 +1266,239 @@
 
 #: src/about.c:95
 msgid ""
-"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
-"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
-"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-, 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:105
+"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>"
+
+#: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #gaim palvelimella irc.freenode.net<BR><BR>"
 
 # NOTE source: 0.59.8
-#: src/about.c:110
+#: src/about.c:111
 msgid "Active Developers"
 msgstr "Aktiiviset kehittäjät"
 
 # NOTE source: 0.59.8
-#: src/about.c:111
+#: src/about.c:112
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: src/about.c:113
+#: src/about.c:114
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "developer & webmaster"
 msgstr "Kehittäjä & verkkosivujen ylläpitäjä"
 
-#: src/about.c:117
+#: src/about.c:118
 msgid "win32 port"
 msgstr "win32 käännös"
 
 # NOTE source: 0.59.8 (plural -> singular)
-#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
+#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
 msgid "developer"
 msgstr "kehittäjä"
 
-#: src/about.c:124
+#: src/about.c:125
 msgid "support"
 msgstr "tuki"
 
-#: src/about.c:131
+#: src/about.c:132
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
 # NOTE source: 0.59.8
-#: src/about.c:146
+#: src/about.c:147
 msgid "Retired Developers"
 msgstr "Poistuneet kehittäjät"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "former libfaim maintainer"
 msgstr "entinen libfaim-ylläpitäjä"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "entinen pääkehittäjä"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "entinen ylläpitäjä"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former Jabber developer"
 msgstr "entinen Jabber-ylläpitäjä"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: src/about.c:156
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri sekä määrätty kuljettaja [laiska pummi]"
 
-#: src/about.c:164
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
 # NOTE source: netscape
-#: src/about.c:165 src/about.c:202
+#: src/about.c:166 src/about.c:204
 msgid "Catalan"
 msgstr "Katalaani"
 
 # NOTE source: netscape
-#: src/about.c:166 src/about.c:203
+#: src/about.c:167 src/about.c:205
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "Danish"
 msgstr "Tanska"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "British English"
 msgstr "Brittienglanti"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "Canadian English"
 msgstr "Kanadan Englanti"
 
-#: src/about.c:170 src/about.c:204
+#: src/about.c:171 src/about.c:206
 msgid "German"
 msgstr "Saksa"
 
-#: src/about.c:171 src/about.c:205
+#: src/about.c:172 src/about.c:207
 msgid "Spanish"
 msgstr "Espanja"
 
-#: src/about.c:172 src/about.c:206
+#: src/about.c:173 src/about.c:208
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/about.c:173 src/about.c:207
+#: src/about.c:174 src/about.c:209
 msgid "French"
 msgstr "Ranska"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: src/about.c:177 src/about.c:208
+#: src/about.c:178 src/about.c:210
 msgid "Italian"
 msgstr "Italia"
 
 # NOTE source: netscape
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:212
 msgid "Korean"
 msgstr "Korea"
 
 # NOTE source: netscape
-#: src/about.c:179
+#: src/about.c:180
 msgid "Dutch; Flemish"
 msgstr "Hollanti; Flaami"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Macedonian"
 msgstr "Makedonia"
 
 # NOTE source: netscape
-#: src/about.c:181
+#: src/about.c:182
 msgid "Norwegian"
 msgstr "Norja"
 
 # NOTE source: netscape
-#: src/about.c:182 src/about.c:211
+#: src/about.c:183 src/about.c:213
 msgid "Polish"
 msgstr "Puola"
 
 # XXX
-#: src/about.c:183
+#: src/about.c:184
 msgid "Portuguese"
 msgstr "Portugali"
 
 # XXX
-#: src/about.c:184
+#: src/about.c:185
 msgid "Portuguese-Brazil"
 msgstr "Portugali (brasilialainen)"
 
 # NOTE source: netscape
-#: src/about.c:185
+#: src/about.c:186
 msgid "Romanian"
 msgstr "Romania"
 
-#: src/about.c:186 src/about.c:212
+#: src/about.c:187 src/about.c:214 src/about.c:215
 msgid "Russian"
 msgstr "Venäjä"
 
 # NOTE source: netscape
-#: src/about.c:187
+#: src/about.c:188
 msgid "Serbian"
 msgstr "Serbia"
 
 # NOTE source: netscape
-#: src/about.c:188
+#: src/about.c:189
 msgid "Slovenian"
 msgstr "Sloveeni"
 
-#: src/about.c:189 src/about.c:214
+#: src/about.c:190 src/about.c:217
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi-työryhmä"
 
 # XXX source: netscape + google
-#: src/about.c:191
+#: src/about.c:193
 msgid "Simplified Chinese"
 msgstr "Kiina (yksinkertaistettu)"
 
 # XXX source: netscape + google
-#: src/about.c:192
+#: src/about.c:194
 msgid "Traditional Chinese"
 msgstr "Kiina (perinteinen)"
 
-#: src/about.c:199
+#: src/about.c:201
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: src/about.c:200
+#: src/about.c:202
 msgid "Amharic"
 msgstr "Amhara"
 
-#: src/about.c:201
+#: src/about.c:203
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: src/about.c:209
+#: src/about.c:211
 msgid "Japanese"
 msgstr "Japani"
 
 # NOTE source: netscape
-#: src/about.c:213
+#: src/about.c:216
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: src/about.c:215
+#: src/about.c:218
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:998
+#: src/account.c:278 src/protocols/jabber/jabber.c:1000
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
@@ -1497,45 +1530,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
-#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
-#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
-#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
-#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
-#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
-#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
-#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: 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/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/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:2564 src/protocols/yahoo/yahoo.c:2573
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
 #: src/request.h:1242
 msgid "OK"
 msgstr "OK"
 
 #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
-#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
-#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: 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/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/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
-#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
-#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
-#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
-#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
-#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
-#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
-#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
-#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
-#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
+#: 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/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/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
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1568,7 +1603,7 @@
 msgstr "Poista poissaoloviesti"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
+#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Poista"
@@ -1581,11 +1616,11 @@
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
-#: src/blist.c:590 src/gtkprefs.c:2506
+#: src/blist.c:681
 msgid "Chats"
 msgstr "Chatit"
 
-#: src/blist.c:1192
+#: src/blist.c:1321
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1596,20 +1631,20 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1201
+#: src/blist.c:1330
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
+#: 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
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/blist.c:1579
+#: src/blist.c:1721
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmänimi"
 
-#: src/blist.c:2236
+#: src/blist.c:2192
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1618,7 +1653,7 @@
 "on siirretty tiedostoon blist.xml~."
 
 # XXX probably better than forming yet another new compound?
-#: src/blist.c:2239
+#: src/blist.c:2195
 msgid "Buddy List Error"
 msgstr "Tuttavalistan virhe"
 
@@ -1635,87 +1670,86 @@
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-# XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
 #: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "Anna %s:n salasana"
 
 # XXX relatively trivial editing of old string (+"Viesti on")
-#: src/conversation.c:293
+#: src/conversation.c:271
 msgid "Unable to send message. The message is too large."
 msgstr "Viestiä ei voitu lähettää. Viesti on liian suuri."
 
-#: src/conversation.c:301
+#: src/conversation.c:279
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1960
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1963
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: src/conversation.c:2047
+#: src/conversation.c:2054
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2057
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2099
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: src/conversation.c:2094
+#: src/conversation.c:2101
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/conversation.c:2165
+#: src/conversation.c:2172
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2174
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: src/conversation.c:2487
+#: src/conversation.c:2464
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
+#: src/conversation.c:2466
+msgid "Separate IM and Chat windows"
+msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
+
 # XXX
-#: src/conversation.c:2489 src/gtkprefs.c:1438
+#: src/conversation.c:2468 src/gtkprefs.c:1335
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: src/conversation.c:2491
+#: src/conversation.c:2470
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: src/conversation.c:2493
+#: src/conversation.c:2472
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: src/conversation.c:2495
-msgid "By conversation count"
-msgstr "Keskustelujen määrän mukaan"
-
-#: src/dialogs.c:154
+#: src/dialogs.c:149
 msgid "Warn User"
 msgstr "Varoita käyttäjää"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1729,25 +1763,25 @@
 "taajuusrajoituksen.\n"
 "\n"
 
-#: src/dialogs.c:182
+#: src/dialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Varoitako _nimettömänä?"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Nimettömät varoitukset ovat vähemmän ankaria.</b>"
 
-#: src/dialogs.c:301
+#: src/dialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa '%s':n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:297 src/dialogs.c:298
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1756,11 +1790,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä '%s' tuttavalistaltasi.  Haluatko "
 "jatkaa?"
 
-#: src/dialogs.c:315 src/dialogs.c:316
+#: src/dialogs.c:309 src/dialogs.c:310
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1768,12 +1802,12 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä '%s' tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:328 src/dialogs.c:329
+#: src/dialogs.c:322 src/dialogs.c:323
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
 # TODO Untranslated
-#: src/dialogs.c:346
+#: src/dialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1783,107 +1817,107 @@
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
 # NOTE source: 0.59.8/0.60
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:343 src/dialogs.c:344
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
+#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
 msgid "_Screen name"
 msgstr "_Näyttönimi"
 
-#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
+#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:457
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Syötä sen henkilön näyttönimi, jolle haluat lähettää pikaviestin."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:513
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: src/dialogs.c:524
+#: src/dialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Syötä sen henkilön näyttönimi, jonka tiedot haluat nähdä."
 
-#: src/dialogs.c:575
+#: src/dialogs.c:566
 msgid "Get User Log"
 msgstr "Hae käyttäjäloki"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviestiä tyhjällä otsikolla"
 
-#: src/dialogs.c:634
+#: src/dialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Anna viestille otsikko, tai valitse \"Käytä\" käyttääksesi tallentamatta."
 
-#: src/dialogs.c:644
+#: src/dialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:706
+#: src/dialogs.c:697
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:727
+#: src/dialogs.c:718
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
 # src/menus.c:280
-#: src/dialogs.c:781
+#: src/dialogs.c:774
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/dialogs.c:785
+#: src/dialogs.c:778
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: src/dialogs.c:789
+#: src/dialogs.c:782
 msgid "_Use"
 msgstr "_Käytä"
 
-#: src/dialogs.c:811
+#: src/dialogs.c:804
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: src/dialogs.c:812
+#: src/dialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:571
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:569
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:820
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-#: src/dialogs.c:829
+#: src/dialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Anna alias tälle kontaktiryhmälle."
 
 # XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
-#: src/dialogs.c:846
+#: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: src/dialogs.c:848
+#: src/dialogs.c:839
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
@@ -1925,7 +1959,7 @@
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -h, --help [commmand]    Show help for command\n"
+"       -h, --help [command]     Show help for command\n"
 msgstr ""
 "Käyttö: %s komento [OPTIOT] [URI]\n"
 "\n"
@@ -1995,23 +2029,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Hetkisen poissa."
 
-#: src/gaimrc.c:372 src/gaimrc.c:1411
+#: src/gaimrc.c:372 src/gaimrc.c:1409
 msgid "boring default"
 msgstr "Tylsä perusviesti"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2960
+#: src/gaimrc.c:1219 src/gtkblist.c:2984
 msgid "Alphabetical"
 msgstr "Aakkosellinen"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2961
+#: src/gaimrc.c:1221 src/gtkblist.c:2985
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: src/gaimrc.c:1225 src/gtkblist.c:2962
+#: src/gaimrc.c:1223 src/gtkblist.c:2986
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: src/gtkaccount.c:289
+#: src/gtkaccount.c:309
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2023,174 +2057,166 @@
 "<b>Kuvan koko:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:530
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: src/gtkaccount.c:401
+#: src/gtkaccount.c:547
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3955
+#: src/gtkaccount.c:552 src/gtkblist.c:3983
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: src/gtkaccount.c:479
+#: src/gtkaccount.c:625
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
+#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:634
 msgid "Remember password"
 msgstr "Muista salasana"
 
 # XXX could be wrong
 #. Build the user options frame.
-#: src/gtkaccount.c:542
+#: src/gtkaccount.c:690
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: src/gtkaccount.c:555
+#: src/gtkaccount.c:703
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: src/gtkaccount.c:564
-msgid "Buddy icon file:"
-msgstr "Tuttavakuvaketiedosto:"
-
-#: src/gtkaccount.c:574
-msgid "_Browse"
-msgstr "_Selaa"
-
-#: src/gtkaccount.c:580
-msgid "_Reset"
-msgstr "_Nollaa"
+#: src/gtkaccount.c:712
+msgid "Buddy icon:"
+msgstr "Tuttavakuvake:"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:642
+#: src/gtkaccount.c:801
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778 src/gtkaccount.c:825
+#: src/gtkaccount.c:937 src/gtkaccount.c:984
 msgid "Use Global Proxy Settings"
 msgstr "Käytä globaalia proxy-asetusta"
 
 #. No Proxy
-#: src/gtkaccount.c:784 src/gtkaccount.c:832
+#: src/gtkaccount.c:943 src/gtkaccount.c:991
 msgid "No Proxy"
 msgstr "Ei välityspalvelinta"
 
 #. HTTP
-#: src/gtkaccount.c:790 src/gtkaccount.c:839
+#: src/gtkaccount.c:949 src/gtkaccount.c:998
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796 src/gtkaccount.c:846
+#: src/gtkaccount.c:955 src/gtkaccount.c:1005
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:802 src/gtkaccount.c:853
+#: src/gtkaccount.c:961 src/gtkaccount.c:1012
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
+#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: src/gtkaccount.c:899
+#: src/gtkaccount.c:1058
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: src/gtkaccount.c:903
+#: src/gtkaccount.c:1062
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: src/gtkaccount.c:919
+#: src/gtkaccount.c:1078
 msgid "Proxy Options"
 msgstr "Välityspalvelinvalinnat"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1233
+#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
 msgid "Proxy _type:"
 msgstr "Välityspalvelimen _tyyppi:"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
 msgid "_Host:"
 msgstr "_Isäntä:"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1281
+#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: src/gtkaccount.c:958
+#: src/gtkaccount.c:1117
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1318
+#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: src/gtkaccount.c:1331
+#: src/gtkaccount.c:1494
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/gtkaccount.c:1333
+#: src/gtkaccount.c:1496
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1357
+#: src/gtkaccount.c:1520
 msgid "Show more options"
 msgstr "Näytä enemmän valintoja"
 
-#: src/gtkaccount.c:1358
+#: src/gtkaccount.c:1521
 msgid "Show fewer options"
 msgstr "Näytä vähemmän valintoja"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
+#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: src/gtkaccount.c:1739
+#: src/gtkaccount.c:1913
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:239
+#: src/gtkaccount.c:1917 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
+#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
-#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
-#: src/protocols/zephyr/zephyr.c:1177
+#: 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
 msgid "Online"
 msgstr "Linjoilla"
 
-#: src/gtkaccount.c:1898
+#: src/gtkaccount.c:2072
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: src/gtkaccount.c:2210
+#: src/gtkaccount.c:2384
 #, 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:2224
+#: src/gtkaccount.c:2398
 msgid ""
 "\n"
 "\n"
@@ -2200,98 +2226,99 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/gtkaccount.c:2228
+#: src/gtkaccount.c:2402
 msgid "Information"
 msgstr "Tiedot"
 
-#: src/gtkaccount.c:2232
+#: src/gtkaccount.c:2406
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
-#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
+#: 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
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gtkblist.c:812
+#: src/gtkblist.c:810
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:833
+#: src/gtkblist.c:831
 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:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
+#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: src/gtkblist.c:1132 src/gtkblist.c:3152
+#: src/gtkblist.c:1128 src/gtkblist.c:3177
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: src/gtkblist.c:1135 src/gtkblist.c:3143
+#: src/gtkblist.c:1131 src/gtkblist.c:3168
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1133
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: src/gtkblist.c:1139
+#: src/gtkblist.c:1135
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
+#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
+#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1191
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1193
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
 # XXX
-#: src/gtkblist.c:1199
+#: src/gtkblist.c:1195
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: src/gtkblist.c:1201
+#: src/gtkblist.c:1197
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
+#: src/gtkblist.c:1219 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:1225
+#: src/gtkblist.c:1221
 msgid "Auto-Join"
 msgstr "Kirjautu sisään automaattisesti"
 
-#: src/gtkblist.c:1249 src/gtkblist.c:1278
+#: src/gtkblist.c:1245 src/gtkblist.c:1274
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: src/gtkblist.c:1283
+#: src/gtkblist.c:1279
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
+#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2299,134 +2326,134 @@
 "tuttavan."
 
 #. Buddies menu
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2286
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2287
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2288
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2289
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2290
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2292
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2293
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2294
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
 # XXX or should it mean "Add a chat *room*"?
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2295
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2296
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2298
 msgid "/Buddies/_Signoff"
 msgstr "/Tuttavat/Kirjaa _ulos"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2299
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2302
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2303
 msgid "/Tools/_Away"
 msgstr "/Työkalut/_Poissa"
 
+#: src/gtkblist.c:2304
+msgid "/Tools/Buddy _Pounce"
+msgstr "/Työkalut/Tuttava_ilmoitin"
+
+#: src/gtkblist.c:2305
+msgid "/Tools/Account Ac_tions"
+msgstr "/Työkalut/_Käyttäjätilitoiminnot"
+
+#: src/gtkblist.c:2306
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Työkalut/_Liitännäistoiminnot"
+
+#: src/gtkblist.c:2308
+msgid "/Tools/A_ccounts"
+msgstr "/Työkalut/_Käyttäjätilit"
+
+#: src/gtkblist.c:2309
+msgid "/Tools/_File Transfers"
+msgstr "/Työkalut/_Tiedostosiirtot..."
+
 #: src/gtkblist.c:2310
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Työkalut/Tuttava_ilmoitin"
+msgid "/Tools/R_oom List"
+msgstr "/Työkalut/Chat-huone_lista"
 
 #: src/gtkblist.c:2311
-msgid "/Tools/Account Ac_tions"
-msgstr "/Työkalut/_Käyttäjätilitoiminnot"
+msgid "/Tools/Pr_eferences"
+msgstr "/Työkalut/A_setukset"
 
 #: src/gtkblist.c:2312
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/Työkalut/_Liitännäistoiminnot"
+msgid "/Tools/Pr_ivacy"
+msgstr "/Työkalut/Yks_ityisyys"
 
 #: src/gtkblist.c:2314
-msgid "/Tools/A_ccounts"
-msgstr "/Työkalut/_Käyttäjätilit"
-
-#: src/gtkblist.c:2315
-msgid "/Tools/_File Transfers"
-msgstr "/Työkalut/_Tiedostosiirtot..."
-
-#: src/gtkblist.c:2316
-msgid "/Tools/R_oom List"
-msgstr "/Työkalut/Chat-huone_lista"
-
-#: src/gtkblist.c:2317
-msgid "/Tools/Pr_eferences"
-msgstr "/Työkalut/A_setukset"
-
-#: src/gtkblist.c:2318
-msgid "/Tools/Pr_ivacy"
-msgstr "/Työkalut/Yks_ityisyys"
-
-#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2317
 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:2324
+#: src/gtkblist.c:2318
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Tukea linjoilla"
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2319
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Testausikkuna"
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2320
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2338
 msgid "Rename Group"
 msgstr "Nimeä ryhmä uudelleen"
 
 # XXX
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2338
 msgid "New group name"
 msgstr "Uusi ryhmänimi"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2339
 msgid "Please enter a new name for the selected group."
 msgstr "Anna uusi nimi valitulle ryhmälle."
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2367
 #, c-format
 msgid ""
 "\n"
@@ -2435,7 +2462,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: src/gtkblist.c:2435
+#: src/gtkblist.c:2431
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2443,12 +2470,12 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: src/gtkblist.c:2450
+#: src/gtkblist.c:2446
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2462
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2456,7 +2483,7 @@
 "\n"
 "<b>Käyttäjätili:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2463
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2464,7 +2491,7 @@
 "\n"
 "<b>Kontaktin Alias:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2464
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2472,7 +2499,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2465
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2480,7 +2507,7 @@
 "\n"
 "<b>Kutsumanimi:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2488,7 +2515,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> "
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2496,7 +2523,7 @@
 "\n"
 "<b>Jouten:</b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2504,7 +2531,7 @@
 "\n"
 "<b>Varoitettu:</b>"
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2512,7 +2539,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: src/gtkblist.c:2475
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2520,7 +2547,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: src/gtkblist.c:2476
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2528,97 +2555,97 @@
 "\n"
 "<b>Tila</b>: Rockin'"
 
-#: src/gtkblist.c:2747
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Jouten (%dt%02dm) "
 
-#: src/gtkblist.c:2749
+#: src/gtkblist.c:2773
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: src/gtkblist.c:2754
+#: src/gtkblist.c:2778
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varoitettu (%d%%)"
 
-#: src/gtkblist.c:2757
+#: src/gtkblist.c:2781
 msgid "Offline "
 msgstr "Poissa linjoilta"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2875
+#: src/gtkblist.c:2899
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity Chattiin..."
 
-#: src/gtkblist.c:2878
+#: src/gtkblist.c:2902
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Chat-lista"
 
-#: src/gtkblist.c:2881
+#: src/gtkblist.c:2905
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: src/gtkblist.c:3026
+#: src/gtkblist.c:3050
 msgid "/Tools/Away"
 msgstr "/Työkalut/Poissa"
 
-#: src/gtkblist.c:3029
+#: src/gtkblist.c:3053
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: src/gtkblist.c:3032
+#: src/gtkblist.c:3056
 msgid "/Tools/Account Actions"
 msgstr "/Työkalut/Käyttäjätilitoiminnot"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3059
 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:3123
+#: src/gtkblist.c:3148
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: src/gtkblist.c:3125
+#: src/gtkblist.c:3150
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: src/gtkblist.c:3149
+#: src/gtkblist.c:3174
 msgid "Send a message to the selected buddy"
 msgstr "Lähetä viesti valitulle tuttavalle"
 
-#: src/gtkblist.c:3158
+#: src/gtkblist.c:3183
 msgid "Get information on the selected buddy"
 msgstr "Hae tietoja valitusta tuttavasta"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3186
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3166
+#: src/gtkblist.c:3191
 msgid "Join a chat room"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3194
 msgid "_Away"
 msgstr "_Poissa"
 
 # XXX This is "almost certain" to be right
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3199
 msgid "Set an away message"
 msgstr "Aseta poissaoloviesti"
 
-#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
-#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
-#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
+#: src/gtkblist.c:3937 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
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/gtkblist.c:3933
+#: src/gtkblist.c:3961
 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. "
@@ -2629,11 +2656,11 @@
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3993 src/gtkblist.c:4278
+#: src/gtkblist.c:4021 src/gtkblist.c:4305
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: src/gtkblist.c:4237
+#: src/gtkblist.c:4264
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2641,11 +2668,11 @@
 "Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: src/gtkblist.c:4244
+#: src/gtkblist.c:4271
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: src/gtkblist.c:4268
+#: src/gtkblist.c:4295
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2653,15 +2680,15 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: src/gtkblist.c:4347
+#: src/gtkblist.c:4373
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/gtkblist.c:4348
+#: src/gtkblist.c:4374
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: src/gtkblist.c:4915 src/gtkblist.c:5012
+#: src/gtkblist.c:4941 src/gtkblist.c:5038
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
@@ -2713,327 +2740,404 @@
 msgid "Time"
 msgstr "Aika"
 
-#: src/gtkconv.c:172
+#: 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:190 src/gtkdebug.c:212
+#: src/gtkconv.c:186 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
+#: 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:554
+#: src/gtkconv.c:365
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr "Minä käyttää Gaim versiota v%s."
+
+#: src/gtkconv.c:374
+msgid "Supported debug options are:  version"
+msgstr "Tuetut debug valinnat ovat: versio"
+
+#: src/gtkconv.c:387
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Kirjoita \"/help &alt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
+"Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
+
+#: src/gtkconv.c:421
+msgid "No such command (in this context)."
+msgstr "Komento ei saatavilla (tässä kontekstissa)."
+
+#: src/gtkconv.c:468
+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
+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
+msgid "Your command failed for an unknown reason."
+msgstr "Komento epäonnistui tuntemattomasta syystä."
+
+#: src/gtkconv.c:490
+msgid "That command only works in Chats, not IMs."
+msgstr "Tämä komento toimii vain chatissä, ei pikaviesteissä."
+
+#: src/gtkconv.c:493
+msgid "That command only works in IMs, not Chats."
+msgstr "Tämä komento toimii vain pikaviesteissä, ei chatissä."
+
+#: src/gtkconv.c:497
+msgid "That command doesn't work on this protocol."
+msgstr "Tämä komento ei toimi tälle protokollalle."
+
+#: src/gtkconv.c:713
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:582
+#: src/gtkconv.c:741
 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:603
+#: src/gtkconv.c:762
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:623
+#: src/gtkconv.c:782
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: src/gtkconv.c:731 src/gtkdebug.c:127
+#: src/gtkconv.c:890 src/gtkdebug.c:127
 msgid "Find"
 msgstr "Etsi"
 
-#: src/gtkconv.c:757 src/gtkdebug.c:155
+#: src/gtkconv.c:916 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: src/gtkconv.c:1135
+#: src/gtkconv.c:1312
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/gtkconv.c:1143
+#: src/gtkconv.c:1320
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/gtkconv.c:1145 src/gtkprefs.c:783
+#: src/gtkconv.c:1322 src/gtkprefs.c:778
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Info button
-#: src/gtkconv.c:1154 src/gtkconv.c:3361
+#: src/gtkconv.c:1331 src/gtkconv.c:3577
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/gtkconv.c:1163
+#: src/gtkconv.c:1340
 msgid "Get Away Msg"
 msgstr "Hae poissaoloviesti"
 
-#: src/gtkconv.c:2255
+#: src/gtkconv.c:2467
 msgid "Animate"
 msgstr "Animoi"
 
-#: src/gtkconv.c:2260
+#: src/gtkconv.c:2472
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/gtkconv.c:2266
+#: src/gtkconv.c:2478
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/gtkconv.c:2635
+#: src/gtkconv.c:2847
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: src/gtkconv.c:2643
+#: src/gtkconv.c:2855
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2746
+#: src/gtkconv.c:2958
 msgid "_Send As"
 msgstr "_Lähetä nimellä"
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3335
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 #. Conversation menu
-#: src/gtkconv.c:3140
+#: src/gtkconv.c:3352
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3354
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3359
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3361
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä_loki..."
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3362
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3364
 msgid "/Conversation/Clear"
 msgstr "/Keskustelu/Tyhjennä"
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3368
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: src/gtkconv.c:3158
+#: src/gtkconv.c:3370
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: src/gtkconv.c:3160
+#: src/gtkconv.c:3372
 msgid "/Conversation/_Warn..."
 msgstr "/Keskustelu/_Varoita..."
 
-#: src/gtkconv.c:3162
+#: src/gtkconv.c:3374
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3379
 msgid "/Conversation/A_lias..."
 msgstr "/Keskustelu/A_lias..."
 
-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3381
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3383
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3385
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3390
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3392
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: src/gtkconv.c:3185
+#: src/gtkconv.c:3397
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3189
+#: src/gtkconv.c:3401
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3402
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: src/gtkconv.c:3191
+#: src/gtkconv.c:3403
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3404
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivi"
 
-#: src/gtkconv.c:3234
+#: src/gtkconv.c:3405
+msgid "/Options/Show T_imestamps"
+msgstr "/Valinnat/Näytä _aikaleima"
+
+#: src/gtkconv.c:3447
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3452
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3458
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3462
 msgid "/Conversation/Warn..."
 msgstr "/Keskustelu/Varoita..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3466
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: src/gtkconv.c:3259
+#: src/gtkconv.c:3472
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3476
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3480
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: src/gtkconv.c:3271
+#: src/gtkconv.c:3484
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: src/gtkconv.c:3277
+#: src/gtkconv.c:3490
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Liitä linkki..."
 
-#: src/gtkconv.c:3281
+#: src/gtkconv.c:3494
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Liitä kuva..."
 
-#: src/gtkconv.c:3287
+#: src/gtkconv.c:3500
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: src/gtkconv.c:3290
+#: src/gtkconv.c:3503
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: src/gtkconv.c:3293
+#: src/gtkconv.c:3506
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Valinnat/Näytä muokkaus-työkalurivi"
 
+#: src/gtkconv.c:3509
+msgid "/Options/Show Timestamps"
+msgstr "/Valinnat/Näytä aikaleima"
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
+#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
 msgid "Send"
 msgstr "Lähetä"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3549
 msgid "Warn"
 msgstr "Varoita"
 
 # XXX partitive is wrong; should be accusative II
-#: src/gtkconv.c:3336
+#: src/gtkconv.c:3552
 msgid "Warn the user"
 msgstr "Varoita käyttäjää"
 
 #. Block button
-#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Estä"
 
-#: src/gtkconv.c:3343
+#: src/gtkconv.c:3559
 msgid "Block the user"
 msgstr "Estä käyttäjä"
 
-#: src/gtkconv.c:3350
+#: src/gtkconv.c:3566
 msgid "Add the user to your buddy list"
 msgstr "Lisää käyttäjä tuttavalistalle"
 
-#: src/gtkconv.c:3357
+#: src/gtkconv.c:3573
 msgid "Remove the user from your buddy list"
 msgstr "Poista käyttäjä tuttavalistalta"
 
-#: src/gtkconv.c:3364 src/gtkconv.c:3708
+#: src/gtkconv.c:3580 src/gtkconv.c:3923
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
 #. Invite
-#: src/gtkconv.c:3439
+#: src/gtkconv.c:3655
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gtkconv.c:3442
+#: src/gtkconv.c:3658
 msgid "Invite a user"
 msgstr "Kutsu käyttäjä"
 
-#: src/gtkconv.c:3449
+#: src/gtkconv.c:3665
 msgid "Add the chat to your buddy list"
 msgstr "Lisää chat tuttavalistalle"
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3672
 msgid "Remove the chat from your buddy list"
 msgstr "Poista chat tuttavalistalta"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3782
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3845
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3900
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:3912
 msgid "Ignore the user"
 msgstr "Älä välitä käyttäjästä"
 
-#: src/gtkconv.c:4252
+#: src/gtkconv.c:4490
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
+#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
 #, 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:5503 src/gtkconv.c:5506
+#: src/gtkconv.c:5757 src/gtkconv.c:5760
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Keskustelu/Sulje"
 
+#: src/gtkconv.c:6132
+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
+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
+msgid "help:  List available commands."
+msgstr "help: Listaa saatavillaolevat komennot."
+
+#: src/gtkconv.c:6143
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
+
 #: src/gtkdebug.c:226
 msgid "Save Debug Log"
 msgstr "Tallenna Debug-loki"
@@ -3167,7 +3271,7 @@
 msgstr "Tiedosto on jo olemassa."
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "Avaa..."
 
@@ -3196,31 +3300,31 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: src/gtkimhtml.c:559
+#: src/gtkimhtml.c:567
 msgid "Pa_ste As Text"
 msgstr "_Liimaa tekstinä"
 
-#: src/gtkimhtml.c:1004
+#: src/gtkimhtml.c:1012
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: src/gtkimhtml.c:1005
+#: src/gtkimhtml.c:1013
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: src/gtkimhtml.c:1211
+#: src/gtkimhtml.c:1218
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: src/gtkimhtml.c:1223
+#: src/gtkimhtml.c:1230
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: src/gtkimhtml.c:1233
+#: src/gtkimhtml.c:1240
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimeen"
 
-#: src/gtkimhtml.c:2667
+#: src/gtkimhtml.c:2761
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3228,18 +3332,18 @@
 "Ei kyetty arvaamaan kuvatyyppiä tiedostonimen perusteella. Oletetaan PNG-"
 "kuvaksi."
 
-#: src/gtkimhtml.c:2675
+#: src/gtkimhtml.c:2769
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Virhe tallennettaessa kuvaa: %s"
 
 # XXX
-#: src/gtkimhtml.c:2684
+#: src/gtkimhtml.c:2778
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
 # XXX
-#: src/gtkimhtml.c:2707
+#: src/gtkimhtml.c:2801
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -3283,67 +3387,67 @@
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: src/gtkimhtmltoolbar.c:473
+#: src/gtkimhtmltoolbar.c:472
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: src/gtkimhtmltoolbar.c:499
+#: src/gtkimhtmltoolbar.c:498
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:638
+#: src/gtkimhtmltoolbar.c:637
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:653
+#: src/gtkimhtmltoolbar.c:652
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/gtkimhtmltoolbar.c:871
+#: src/gtkimhtmltoolbar.c:870
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/gtkimhtmltoolbar.c:882
+#: src/gtkimhtmltoolbar.c:881
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: src/gtkimhtmltoolbar.c:893
+#: src/gtkimhtmltoolbar.c:892
 msgid "Underline"
 msgstr "Alleviivaa"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:909
+#: src/gtkimhtmltoolbar.c:908
 msgid "Larger font size"
 msgstr "Suurempi kirjasin koko"
 
 # XXX might be wrong
-#: src/gtkimhtmltoolbar.c:921
+#: src/gtkimhtmltoolbar.c:920
 msgid "Smaller font size"
 msgstr "Pienempi kirjasin koko"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:937
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: src/gtkimhtmltoolbar.c:950
+#: src/gtkimhtmltoolbar.c:949
 msgid "Foreground font color"
 msgstr "Kirjasimen etuala-väri"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:961
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: src/gtkimhtmltoolbar.c:977
+#: src/gtkimhtmltoolbar.c:976
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: src/gtkimhtmltoolbar.c:987
+#: src/gtkimhtmltoolbar.c:986
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: src/gtkimhtmltoolbar.c:998
+#: src/gtkimhtmltoolbar.c:997
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
@@ -3352,7 +3456,7 @@
 msgstr "Keskustelut:"
 
 #. Window **********
-#: src/gtklog.c:370 src/gtklog.c:386
+#: src/gtklog.c:372 src/gtklog.c:388
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
@@ -3421,161 +3525,166 @@
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: src/gtkpounce.c:193
+#: src/gtkpounce.c:194
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:406 src/gtkpounce.c:846
+#: src/gtkpounce.c:420 src/gtkpounce.c:923
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
 # XXX probably partitive?
-#: src/gtkpounce.c:406
+#: src/gtkpounce.c:420
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:438
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 # XXX
-#: src/gtkpounce.c:451
+#: src/gtkpounce.c:465
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:475
+#: src/gtkpounce.c:489
 msgid "Pounce When"
 msgstr "Ilmoitetaan kun"
 
-#: src/gtkpounce.c:483 src/main.c:296
+#: src/gtkpounce.c:497 src/main.c:296
 msgid "_Sign on"
 msgstr "_Kirjautuu sisään"
 
-#: src/gtkpounce.c:485
+#: src/gtkpounce.c:499
 msgid "Sign _off"
 msgstr "Kirjautuu _ulos"
 
-#: src/gtkpounce.c:487
+#: src/gtkpounce.c:501
 msgid "A_way"
 msgstr "_Poissa"
 
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:503
 msgid "Re_turn from away"
 msgstr "Palaa oltuaan _poissa"
 
-#: src/gtkpounce.c:491
+#: src/gtkpounce.c:505
 msgid "_Idle"
 msgstr "_Jouten"
 
-#: src/gtkpounce.c:493
+#: src/gtkpounce.c:507
 msgid "Retur_n from idle"
 msgstr "Palaa oltuaan _jouten"
 
-#: src/gtkpounce.c:495
+#: src/gtkpounce.c:509
 msgid "Buddy starts _typing"
 msgstr "T_uttava alkaa kirjoittaa"
 
-#: src/gtkpounce.c:497
+#: src/gtkpounce.c:511
 msgid "Buddy stops t_yping"
 msgstr "Tuttava lope_ttaa kirjoittamisen"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:540
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:548
 msgid "Op_en an IM window"
 msgstr "_Avaa pikaviesti-ikkuna"
 
-#: src/gtkpounce.c:534
+#: src/gtkpounce.c:550
 msgid "_Popup notification"
 msgstr "_Ponnahdus-ilmoitus"
 
-#: src/gtkpounce.c:535
+#: src/gtkpounce.c:552
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: src/gtkpounce.c:536
+#: src/gtkpounce.c:554
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: src/gtkpounce.c:537
+#: src/gtkpounce.c:556
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: src/gtkpounce.c:541
+#: src/gtkpounce.c:560
 msgid "B_rowse..."
 msgstr "_Selaa"
 
-#: src/gtkpounce.c:543
+#: src/gtkpounce.c:562
 msgid "Bro_wse..."
 msgstr "_Selaa"
 
-#: src/gtkpounce.c:544
+#: src/gtkpounce.c:563
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: src/gtkpounce.c:627
+#: src/gtkpounce.c:646
 msgid "Sav_e this pounce after activation"
 msgstr "_Säilytä tämä ilmoitin aktivoinnin jälkeen"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:853
+#: src/gtkpounce.c:930
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/gtkpounce.c:903
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s alkoi kirjoittaa"
-
-#: src/gtkpounce.c:904
-#, c-format
-msgid "%s has signed on"
-msgstr "%s on kirjautunut sisään"
-
-#: src/gtkpounce.c:905
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s on palannut oltuaan jouten"
-
-#: src/gtkpounce.c:906
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s on palannut oltuaan poissa"
-
-#: src/gtkpounce.c:907
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr "%s on lopettanut kirjoittamisen sinulle"
-
-#: src/gtkpounce.c:908
-#, c-format
-msgid "%s has signed off"
-msgstr "%s on kirjautunut ulos"
-
-#: src/gtkpounce.c:909
-#, c-format
-msgid "%s has become idle"
-msgstr "%s on jouten"
-
-#: src/gtkpounce.c:911
+#: src/gtkpounce.c:994
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s alkoi kirjoittaa sinulle (%s)"
+
+#: src/gtkpounce.c:996
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s on kirjautunut sisään (%s)"
+
+#: src/gtkpounce.c:998
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s on palannut oltuaan jouten (%s)"
+
+#: src/gtkpounce.c:1000
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s on palannut oltuaan poissa (%s)"
+
+#: src/gtkpounce.c:1002
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
+
+#: src/gtkpounce.c:1004
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s on kirjautunut ulos (%s)"
+
+#: src/gtkpounce.c:1006
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s on jouten (%s)"
+
+#: src/gtkpounce.c:1008
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s on poissa. (%s)"
+
+#: src/gtkpounce.c:1009
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
-#: src/gtkprefs.c:406
+#: src/gtkprefs.c:401
 msgid "Interface Options"
 msgstr "Rajapintavalinnat"
 
-#: src/gtkprefs.c:408
+#: src/gtkprefs.c:403
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Näytä palvelimelle tallennettu lempinimi jos aliasta ei ole asetettu"
 
-#: src/gtkprefs.c:632
+#: src/gtkprefs.c:627
 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."
@@ -3583,332 +3692,322 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:667
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/gtkprefs.c:775 src/gtkprefs.c:1114
+#: src/gtkprefs.c:770
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:771
 msgid "Show _timestamp on messages"
 msgstr "Näytä _aikaleimat viesteissä"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:774
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: src/gtkprefs.c:784
+#: src/gtkprefs.c:779
 msgid "Ignore c_olors"
 msgstr "Älä välitä _väreistä"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:781
 msgid "Ignore font _faces"
 msgstr "Älä välitä kirjasimien _tyypistä"
 
-#: src/gtkprefs.c:788
+#: src/gtkprefs.c:783
 msgid "Ignore font si_zes"
 msgstr "Älä välitä kirjasimien k_oosta"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:786
 msgid "_Ignore formatting on incoming messages"
 msgstr "_Sivuuta muotoilut tulevissa viesteissä"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:790
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:792
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Lähetä oletusmuotoilu lähetettävien viestien mukana"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:824
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
-msgstr "Tältä ulosmenevä viesti näyttää kun käytät protokollaa joka tukee muotoiluja. :)"
-
-#: src/gtkprefs.c:832
+msgstr ""
+"Tältä ulosmenevä viesti näyttää kun käytät protokollaa joka tukee "
+"muotoiluja. :)"
+
+#: src/gtkprefs.c:827
 msgid "_Clear Formatting"
 msgstr "_Tyhjennä muotoilu"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:864
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:865
 msgid "Enter _sends message"
 msgstr "\"Enter\" _lähettää viestin"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid "C_ontrol-Enter sends message"
 msgstr "\"C_ontrol-Enter\" lähettää viestin"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "Window Closing"
 msgstr "Ikkunan sulkeminen"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:871
 msgid "_Escape closes window"
 msgstr "\"_Escape\" sulkee ikkunan"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:874
 msgid "Insertions"
 msgstr "Lisäykset"
 
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:875
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} muuttaa tekstimuotoiluja"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:877
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(numero) _lisää hymiön"
 
 # NOTE source: gftt glossary
 # XXX
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:893
 msgid "Buddy List Sorting"
 msgstr "Tuttavalistan lajittelu"
 
 # NOTE source: gftt glossary
-#: src/gtkprefs.c:907
+#: src/gtkprefs.c:902
 msgid "_Sorting:"
 msgstr "_Järjestys:"
 
 # NOTE 0.59.8
-#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
+#: src/gtkprefs.c:908 src/gtkprefs.c:961
 msgid "Show _buttons as:"
 msgstr "Näytä _painikkeissa:"
 
-#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
+#: src/gtkprefs.c:910 src/gtkprefs.c:963
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
+#: src/gtkprefs.c:911 src/gtkprefs.c:964
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
+#: src/gtkprefs.c:912 src/gtkprefs.c:965
 msgid "Pictures and text"
 msgstr "Kuvat ja teksti"
 
-#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
+#: src/gtkprefs.c:915
 msgid "_Raise window on events"
 msgstr "_Nosta ikkuna tapahtumahetkinä"
 
+#: src/gtkprefs.c:918
+msgid "Buddy Display"
+msgstr "Tuttavien näyttö"
+
+#: src/gtkprefs.c:919 src/gtkprefs.c:979
+msgid "Show buddy _icons"
+msgstr "Näytä tuttavien _kuvakkeet"
+
+#: src/gtkprefs.c:921
+msgid "Show _warning levels"
+msgstr "Näytä _varoitustasot"
+
 #: src/gtkprefs.c:923
-msgid "Buddy Display"
-msgstr "Tuttavien näyttö"
-
-#: src/gtkprefs.c:924 src/gtkprefs.c:1074
-msgid "Show buddy _icons"
-msgstr "Näytä tuttavien _kuvakkeet"
-
-#: src/gtkprefs.c:926
-msgid "Show _warning levels"
-msgstr "Näytä _varoitustasot"
-
-#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "Näytä joutenolo_ajat"
 
-#: src/gtkprefs.c:930
+#: src/gtkprefs.c:925
 msgid "Dim i_dle buddies"
 msgstr "Näytä _jouten olevat tuttavat harmaina"
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:927
 msgid "_Automatically expand contacts"
 msgstr "_Laajenna tuttavaryhmät automaattisesti"
 
-#: src/gtkprefs.c:969
-msgid "_Placement:"
-msgstr "_Sijoitus:"
-
-#: src/gtkprefs.c:976
-msgid "Number of conversations per window"
-msgstr "Keskustelujen määrä per ikkuna"
-
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:972
+msgid "Enable \"_slash\" commands"
+msgstr "Käytä \"kauttaviiva\"-komentoja"
+
+#: src/gtkprefs.c:975
 msgid "Show _formatting toolbar"
 msgstr "Näytä _muotoilu-työkalurivi"
 
+#: src/gtkprefs.c:977
+msgid "Show _aliases in tabs/titles"
+msgstr "Näytä _a_liakset välilehdissä/otsikoissa"
+
+#: src/gtkprefs.c:981
+msgid "Enable buddy ic_on animation"
+msgstr "Näytä tuttavaikonin a_nimaatio"
+
+#: src/gtkprefs.c:983
+msgid "_Notify buddies that you are typing to them"
+msgstr "Ilmoita tuttaville kun _kirjoitat heille"
+
+#: src/gtkprefs.c:985
+msgid "_Raise IM window on events"
+msgstr "_Nosta pikaviesti-ikkuna tapahtumahetkinä"
+
 #: src/gtkprefs.c:988
-msgid "Show a_liases in tabs/titles"
-msgstr "Näytä a_liakset välilehdissä/otsikoissa"
-
-#: src/gtkprefs.c:991
+msgid "Raise chat _window on events"
+msgstr "Nosta _chat-ikkuna tapahtumahetkinä"
+
+#: src/gtkprefs.c:990
+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
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:996
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-# NOTE difference from above from 0.59.8/0.60
-#: src/gtkprefs.c:996
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
-
-#: src/gtkprefs.c:1006
+#: src/gtkprefs.c:1011
 msgid "Show _close button on tabs"
 msgstr "Näytä _sulje-painikkeet välilehdissä"
 
+#: src/gtkprefs.c:1014
+msgid "Tab p_lacement:"
+msgstr "_Välilehtien sijoitus:"
+
+#: src/gtkprefs.c:1016
+msgid "Top"
+msgstr "Ylhäällä"
+
+#: src/gtkprefs.c:1017
+msgid "Bottom"
+msgstr "Alhaalla"
+
+#: src/gtkprefs.c:1018
+msgid "Left"
+msgstr "Vasemmalla"
+
 #: src/gtkprefs.c:1019
-msgid "_Tab Placement:"
-msgstr "_Välilehtien sijoitus:"
-
-#: src/gtkprefs.c:1021
-msgid "Top"
-msgstr "Ylhäällä"
-
-#: src/gtkprefs.c:1022
-msgid "Bottom"
-msgstr "Alhaalla"
-
-#: src/gtkprefs.c:1023
-msgid "Left"
-msgstr "Vasemmalla"
-
-#: src/gtkprefs.c:1024
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
-msgid "Window"
-msgstr "Ikkuna"
-
-#: src/gtkprefs.c:1073
-msgid "Buddy Icons"
-msgstr "Tuttavakuvakkeet"
-
-#: src/gtkprefs.c:1076
-msgid "Enable buddy icon a_nimation"
-msgstr "Näytä tuttavaikonin a_nimaatio"
-
-#: src/gtkprefs.c:1079
-msgid "Typing Notification"
-msgstr "Kirjoitusilmoitus"
-
-#: src/gtkprefs.c:1080
-msgid "Notify buddies that you are _typing to them"
-msgstr "Ilmoita tuttaville kun _kirjoitat heille"
-
-#: src/gtkprefs.c:1115
-msgid "Co_lorize screen names"
-msgstr "_Väritä näyttönimet"
-
-#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4811
+#: src/gtkprefs.c:1025
+msgid "New conversation _placement:"
+msgstr "Uusi keskustelu_asetettelu:"
+
+#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4837
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1078
 msgid "_Autodetect IP Address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: src/gtkprefs.c:1147
+#: src/gtkprefs.c:1087
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: src/gtkprefs.c:1171
+#: src/gtkprefs.c:1111
 msgid "Ports"
 msgstr "Portit"
 
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1114
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1117
 msgid "_Start Port:"
 msgstr "_Ensimmäinen portti:"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1124
 msgid "_End Port:"
 msgstr "Viimeinen _portti:"
 
-#: src/gtkprefs.c:1232
-msgid "Proxy Type"
-msgstr "Välityspalvelimen tyyppi"
-
-#: src/gtkprefs.c:1235
-msgid "No proxy"
-msgstr "Ei välityspalvelinta"
-
-#: src/gtkprefs.c:1242
+#: src/gtkprefs.c:1131
 msgid "Proxy Server"
 msgstr "Välityspalvelin"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1135
+msgid "No proxy"
+msgstr "Ei välityspalvelinta"
+
+#: src/gtkprefs.c:1197
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: src/gtkprefs.c:1356
+#: src/gtkprefs.c:1253
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1357
+#: src/gtkprefs.c:1254
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1358
+#: src/gtkprefs.c:1255
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1359
+#: src/gtkprefs.c:1256
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1257
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1258
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1259
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1363
+#: src/gtkprefs.c:1260
 msgid "Gnome Default"
 msgstr "Gnome oletus"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1269
 msgid "Manual"
 msgstr "Oma komento"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1320
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/gtkprefs.c:1427
+#: src/gtkprefs.c:1324
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1331
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1333
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1334
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1336
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1350
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3917,80 +4016,84 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: src/gtkprefs.c:1490
+#: src/gtkprefs.c:1387
 msgid "Message Logs"
 msgstr "Viestilokit"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1390
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1393
 msgid "_Log all instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1395
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki _keskustelut lokiin"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1398
 msgid "System Logs"
 msgstr "Järjestelmälokit"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1400
 msgid "_Enable system log"
 msgstr "Ota järjestelmäloki _käyttöön"
 
-#: src/gtkprefs.c:1506
+#: src/gtkprefs.c:1403
 msgid "Log when buddies _sign on/sign off"
 msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1409
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1415
 msgid "Log when buddies go away/come _back"
 msgstr "Kirjaa lokiin tuttavien poistumiset/_palaamiset"
 
-#: src/gtkprefs.c:1524
+#: src/gtkprefs.c:1421
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Kirjaa lokiin _omat sisäänkirjautumiset/joutenolot/poissaolot"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1559
+msgid "Sound Selection"
+msgstr "Äänivalinta"
+
+#: src/gtkprefs.c:1634
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1635
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1637
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1641
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: src/gtkprefs.c:1578
+#: src/gtkprefs.c:1642
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: src/gtkprefs.c:1580
+#: src/gtkprefs.c:1644
 msgid "Console beep"
 msgstr "Konsoli-äänimerkki"
 
 # NOTE source: galeon
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1646
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1653
 msgid "Command"
 msgstr "Komento"
 
-#: src/gtkprefs.c:1599
+#: src/gtkprefs.c:1661
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3999,62 +4102,88 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1688
+msgid "Sound Events"
+msgstr "Äänitapahtumat"
+
+#: src/gtkprefs.c:1739
+msgid "Play"
+msgstr "Soita"
+
+# NOTE source: gaim + google
+#: src/gtkprefs.c:1746
+msgid "Event"
+msgstr "Tapahtuma"
+
+#: src/gtkprefs.c:1765
+msgid "Test"
+msgstr "Kokeilu"
+
+#: src/gtkprefs.c:1769
+msgid "Reset"
+msgstr "Nollaa"
+
+#: src/gtkprefs.c:1773
+msgid "Choose..."
+msgstr "Valitse..."
+
+#: src/gtkprefs.c:1797
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1800
 msgid "Auto-response"
 msgstr "Automaattinen vastaus"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1801
 msgid "_Send auto-response"
 msgstr "_Lähetä automaattinen vastaus"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1803
 msgid "_Only send auto-response when idle"
 msgstr "Lähetä automaattinen vastaus _vain jouten ollessa"
 
-#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
-#: src/protocols/yahoo/yahoo.c:2297
+#: 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
 msgid "Idle"
 msgstr "Jouten"
 
-#: src/gtkprefs.c:1656
+#: src/gtkprefs.c:1807
 msgid "Idle _time reporting:"
 msgstr "Jouto_aikailmoitus"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1810
 msgid "Gaim usage"
 msgstr "Gaim:in käyttö"
 
-#: src/gtkprefs.c:1662
+#: src/gtkprefs.c:1813
 msgid "X usage"
 msgstr "X:n käyttö"
 
-#: src/gtkprefs.c:1664
+#: src/gtkprefs.c:1815
 msgid "Windows usage"
 msgstr "Windows:n käyttö"
 
-#: src/gtkprefs.c:1672
+#: src/gtkprefs.c:1823
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: src/gtkprefs.c:1673
+#: src/gtkprefs.c:1824
 msgid "Set away _when idle"
 msgstr "Aseta poissaolevaksi _kun jouten"
 
-#: src/gtkprefs.c:1677
+#: src/gtkprefs.c:1828
 msgid "_Minutes before setting away:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: src/gtkprefs.c:1685
+#: src/gtkprefs.c:1836
 msgid "Away m_essage:"
 msgstr "Poissaolovi_esti:"
 
 # FIXME
-#: src/gtkprefs.c:1760
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4069,7 +4198,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1922
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4084,107 +4213,66 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#: src/gtkprefs.c:1998
+#: src/gtkprefs.c:2155
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gtkprefs.c:2012
+#: src/gtkprefs.c:2169
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: src/gtkprefs.c:2060
+#: src/gtkprefs.c:2217
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/gtkprefs.c:2187
-msgid "Sound Selection"
-msgstr "Äänivalinta"
-
-#: src/gtkprefs.c:2294
-msgid "Play"
-msgstr "Soita"
-
-# NOTE source: gaim + google
-#: src/gtkprefs.c:2301
-msgid "Event"
-msgstr "Tapahtuma"
-
-#: src/gtkprefs.c:2320
-msgid "Test"
-msgstr "Kokeilu"
-
-#: src/gtkprefs.c:2324
-msgid "Reset"
-msgstr "Nollaa"
-
-#: src/gtkprefs.c:2328
-msgid "Choose..."
-msgstr "Valitse..."
-
-#: src/gtkprefs.c:2463
+#: src/gtkprefs.c:2362
 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:2499
+#: src/gtkprefs.c:2398
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/gtkprefs.c:2500
-msgid "Smiley Themes"
-msgstr "Hymiöteemat"
-
 # XXX
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2401
 msgid "Message Text"
 msgstr "Viestin teksti"
 
-#: src/gtkprefs.c:2502
+#: src/gtkprefs.c:2402
 msgid "Shortcuts"
 msgstr "Oikopolut"
 
-#: src/gtkprefs.c:2505
-msgid "IMs"
-msgstr "Pikaviestit"
-
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2403
+msgid "Smiley Themes"
+msgstr "Hymiöteemat"
+
+#: src/gtkprefs.c:2404
+msgid "Sounds"
+msgstr "Äänet"
+
+#: src/gtkprefs.c:2405
 msgid "Network"
 msgstr "Verkko"
 
-#: src/gtkprefs.c:2508
-msgid "Proxy"
-msgstr "Välityspalvelin"
-
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2511
+#: src/gtkprefs.c:2408
 msgid "Browser"
 msgstr "Selain"
 
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2410
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/gtkprefs.c:2514
-msgid "Sounds"
-msgstr "Äänet"
-
-#: src/gtkprefs.c:2515
-msgid "Sound Events"
-msgstr "Äänitapahtumat"
-
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2411
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2412
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/gtkprefs.c:2520
-msgid "Protocols"
-msgstr "Protokollat"
-
-#: src/gtkprefs.c:2521
+#: src/gtkprefs.c:2415
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -4208,64 +4296,64 @@
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:400
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:412
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
 # XXX
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:582
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:583
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
 msgid "Permit"
 msgstr "Salli"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
+#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:621
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:622
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -4273,14 +4361,14 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
+#: 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
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
+#: 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
 msgid "No"
 msgstr "Ei"
@@ -4290,17 +4378,17 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
-#: src/protocols/silc/util.c:299
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
+#: src/protocols/silc/util.c:311
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gtkroomlist.c:328
+#: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Huonelista"
 
 #. list button
-#: src/gtkroomlist.c:397
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "_Hae lista"
 
@@ -4509,12 +4597,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:378 src/protocols/msn/state.c:27
-#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720
-#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
-#: src/protocols/yahoo/yahoo.c:2771
+#: src/protocols/msn/msn.c:465 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
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -4526,12 +4614,12 @@
 msgid "Away for friends only"
 msgstr "Poissa vain ystäville"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
+#: 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:5353 src/protocols/oscar/oscar.c:5431
-#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
-#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
+#: 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
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -4547,14 +4635,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:1667
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
 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:104
+#: src/protocols/jabber/jabber.c:105
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
@@ -4579,68 +4667,67 @@
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: src/protocols/gg/gg.c:407
+#: src/protocols/gg/gg.c:406
 msgid "Could not connect"
 msgstr "Yhteyttä ei kyetty muodostamaan"
 
-#: src/protocols/gg/gg.c:414
+#: src/protocols/gg/gg.c:413
 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:601 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
-#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
-#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
-#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
-#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/gg/gg.c:600 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/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:617
+#: src/protocols/gg/gg.c:616
 msgid "Reading data"
 msgstr "Luetaan tietoja"
 
-#: src/protocols/gg/gg.c:620
+#: src/protocols/gg/gg.c:619
 msgid "Balancer handshake"
 msgstr "Tasapainottajan kättely"
 
-#: src/protocols/gg/gg.c:623
+#: src/protocols/gg/gg.c:622
 msgid "Reading server key"
 msgstr "Luetaan palvelinavainta"
 
-#: src/protocols/gg/gg.c:626
+#: src/protocols/gg/gg.c:625
 msgid "Exchanging key hash"
 msgstr "Vaihdetaan avaimen hash-arvoa"
 
-#: src/protocols/gg/gg.c:636
+#: src/protocols/gg/gg.c:635
 msgid "Critical error in GG library\n"
 msgstr "Kriittinen virhe GG-kirjastossa\n"
 
-#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
-#: src/protocols/toc/toc.c:175
+#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:701
 msgid "Unable to ping server"
 msgstr "Palvelinta ei kyetty pingaamaan"
 
-#: src/protocols/gg/gg.c:714
+#: src/protocols/gg/gg.c:713
 msgid "Send as message"
 msgstr "Lähetä viestinä"
 
-#: src/protocols/gg/gg.c:719
+#: src/protocols/gg/gg.c:718
 msgid "Looking up GG server"
 msgstr "Etsitään GG-palvelinta"
 
-#: src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:721
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Epäkelpo Gadu-Gadu-UIN ilmoitettu"
 
-#: src/protocols/gg/gg.c:769
+#: src/protocols/gg/gg.c:768
 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!"
 
@@ -4653,44 +4740,44 @@
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-hakukone"
 
-#: src/protocols/gg/gg.c:865
+#: src/protocols/gg/gg.c:866
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
+#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: 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/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Last Name
-#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
+#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
+#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
+#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
-#: src/protocols/gg/gg.c:903
+#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
+#: src/protocols/gg/gg.c:904
 msgid "Sex"
 msgstr "Sukupuoli"
 
 #. City
-#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
+#: 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/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Kunta"
@@ -4698,20 +4785,22 @@
 # XXX need to check for gradation problems
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
-#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
-#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
-#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
-#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
-#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
+#: 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:950
+#: src/protocols/gg/gg.c:951
 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:958
+#: src/protocols/gg/gg.c:959
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
@@ -4807,8 +4896,8 @@
 msgstr "Haku hakemistosta"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
-#: src/protocols/toc/toc.c:1558
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Vaihda salasanaa"
 
@@ -4847,7 +4936,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
+#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
@@ -4860,17 +4949,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Käyttäjä %s (%s%s%s%s%s) haluaa luvan sinulta."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
-#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
-#: src/protocols/oscar/oscar.c:6059
+#: 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
 msgid "Authorize"
 msgstr "Salli"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
-#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
-#: src/protocols/oscar/oscar.c:6060
+#: 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
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -4882,11 +4969,11 @@
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/protocols/icq/gaim_icq.c:497
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Nick:"
 msgstr "Kutsumanimi:"
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:499
 msgid "Gaim User"
 msgstr "Gaim-käyttäjä"
 
@@ -4895,36 +4982,19 @@
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: src/protocols/irc/cmds.c:137
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-"<B>Tuetut IRC-komennot:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-
-#: src/protocols/irc/cmds.c:146
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-"<B>Tuetut IRC-komennot:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:179
+#: src/protocols/yahoo/yahoo_filexfer.c:188
+#: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "File Transfer Aborted"
 msgstr "Tiedostosiirto keskeytetty"
 
@@ -4954,9 +5024,9 @@
 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:929
-#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
-#: src/protocols/yahoo/yahoo.c:2507
+#: 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"
 
@@ -4972,7 +5042,7 @@
 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:227
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
@@ -4981,22 +5051,22 @@
 msgid "Couldn't create socket"
 msgstr "Socketin luominen epäonnistui"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
 #: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
-#: src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
+#: src/protocols/yahoo/yahoochat.c:1341
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
 msgid "Topic"
 msgstr "Aihe"
 
@@ -5009,33 +5079,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:624
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaplugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:625
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Irc-protokollaplugin joka toimii."
 
-#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: 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
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
-#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
-#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
+#: 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
 msgid "Port"
 msgstr "Portti"
 
-#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: 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
 msgid "Username"
 msgstr "Käyttäjänimi"
@@ -5062,7 +5132,7 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo.c:3058
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Realname"
 msgstr "Oikea nimi"
 
@@ -5111,110 +5181,260 @@
 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:404
+#: src/protocols/irc/msgs.c:323
+#, c-format
+msgid "Users on %s: %s"
+msgstr "Käyttäjät %s: %s"
+
+#: src/protocols/irc/msgs.c:405
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:415
+#: src/protocols/irc/msgs.c:416
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:419
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: src/protocols/irc/msgs.c:423
+#: src/protocols/irc/msgs.c:424
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: src/protocols/irc/msgs.c:443
+#: src/protocols/irc/msgs.c:444
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:501
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: src/protocols/irc/msgs.c:596
+#: src/protocols/irc/msgs.c:604
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: src/protocols/irc/msgs.c:601
+#: src/protocols/irc/msgs.c:609
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: src/protocols/irc/msgs.c:622
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:709
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:710
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: src/protocols/irc/msgs.c:723
+#: src/protocols/irc/msgs.c:731
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: src/protocols/irc/msgs.c:763
+#: src/protocols/irc/msgs.c:771
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: src/protocols/irc/msgs.c:765
+#: src/protocols/irc/msgs.c:773
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:848
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: src/protocols/irc/msgs.c:871
+#: src/protocols/irc/msgs.c:885
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:109
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;tehtävä toiminta&gt;: Tee toiminta."
+
+#: src/protocols/irc/parse.c:110
+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."
+
+#: 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."
+
+#: 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."
+
+#: 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."
+
+#: 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."
+
+#: 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."
+
+#: 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."
+
+#: 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>"
+
+#: src/protocols/irc/parse.c:118
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;tehtävä toiminto&gt;: Suorita toiminto."
+
+#: src/protocols/irc/parse.c:119
+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."
+
+#: 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)."
+
+#: 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
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
+
+#: src/protocols/irc/parse.c:123
+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."
+
+#: 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ä."
+
+#: 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."
+
+#: 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."
+
+#: 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)."
+
+#: src/protocols/irc/parse.c:128
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
+
+#: src/protocols/irc/parse.c:129
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]: Lähetä \"raaka\" komento palvelimelle."
+
+#: src/protocols/irc/parse.c:130
+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."
+
+#: src/protocols/irc/parse.c:131
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [uusi aihe]: Näytä tai vaihda kanavan aihetta."
+
+#: src/protocols/irc/parse.c:132
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;nimi1&gt; [nimi2] ...: Aseta tai poista käyttäjän tila."
+
+#: src/protocols/irc/parse.c:133
+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."
+
+#: 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ä."
+
+#: 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
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
 "(Tämän viestin muunnoksessa oli virhe. Katso 'koodaus'-optio tilieditorista)"
 
-#: src/protocols/irc/parse.c:320
+#: src/protocols/irc/parse.c:382
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: src/protocols/irc/parse.c:321
+#: src/protocols/irc/parse.c:383
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:321
+#: src/protocols/irc/parse.c:383
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
-#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
-#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: 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."
 msgstr "Yhteys katkennut."
 
@@ -5262,74 +5482,73 @@
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
-#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
-#: src/protocols/yahoo/yahoo.c:3054
+#: 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
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Alue"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Seutu"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:637
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
-#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
-#: src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 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:692
-#: src/protocols/jabber/buddy.c:699
+#: src/protocols/jabber/buddy.c:258 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:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
+#: 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
 msgid "Email"
 msgstr "Sähköposti"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Arvonimi"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Asema"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4839
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4865
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -5350,15 +5569,15 @@
 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:935
-#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
-#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: 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:2426
+#: src/protocols/yahoo/yahoo.c:2611
 msgid "Status"
 msgstr "Tila"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
 msgid "Resource"
 msgstr "Lähde"
 
@@ -5366,54 +5585,54 @@
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: 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
 msgid "Address"
 msgstr "Osoite"
 
-#: src/protocols/jabber/buddy.c:656
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "Postilokero"
 
 # TODO Untranslated
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Valokuva"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:778
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber-profiili"
 
-#: src/protocols/jabber/buddy.c:937
+#: src/protocols/jabber/buddy.c:936
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:939
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:947
+#: src/protocols/jabber/buddy.c:946
 msgid "Cancel Presence Notification"
 msgstr "Peruuta paikallaoloilmoitus"
 
-#: src/protocols/jabber/buddy.c:953
+#: src/protocols/jabber/buddy.c:952
 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:961
+#: src/protocols/jabber/buddy.c:960
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -5425,472 +5644,526 @@
 msgid "_Handle:"
 msgstr "_chat-alias:"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ei ole kelvollinen keskusteluhuoneen nimi."
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:177
 msgid "Invalid Room Name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:182
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ei ole kelvollinen palvelinnimi."
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
 msgid "Invalid Server Name"
 msgstr "Palvelimen nimi ei kelpaa"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:188
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ei ole kelvollinen chat-nimi (room handle)"
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
 msgid "Invalid Room Handle"
 msgstr "Chat-alias ei kelpaa"
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:349
 msgid "Configuration error"
 msgstr "Konfigurointivirhe."
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida."
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:374
 msgid "Room Configuration Error"
 msgstr "Huoneen konfigurointivirhe"
 
-#: src/protocols/jabber/chat.c:358
+#: src/protocols/jabber/chat.c:375
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: src/protocols/jabber/chat.c:556
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa ei-MUC chat-huoneissa"
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
 msgid "Roomlist Error"
 msgstr "Huonelista-virhe"
 
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
 msgid "Error retreiving roomlist"
 msgstr "Virhe haettaessa huonelistaa"
 
-#: src/protocols/jabber/chat.c:652
+#: src/protocols/jabber/chat.c:669
 msgid "Invalid Server"
 msgstr "Palvelin ei kelpaa"
 
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:706
 msgid "Enter a Conference Server"
 msgstr "Syötä konferenssipalvelin"
 
-#: src/protocols/jabber/chat.c:690
+#: src/protocols/jabber/chat.c:707
 msgid "Select a conference server to query"
 msgstr "Valitse konferenssipalvelin"
 
-#: src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/chat.c:710
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-#: src/protocols/jabber/jabber.c:74
+#: src/protocols/jabber/jabber.c:75
 msgid "Error initializing session"
 msgstr "Virhe session alustuksessa"
 
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/jabber/jabber.c:205 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:1186
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: src/protocols/jabber/jabber.c:322
+#: src/protocols/jabber/jabber.c:323
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/jabber/jabber.c:325
+#: src/protocols/jabber/jabber.c:326
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
+#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber I.D."
 
-#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
+#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Socketin luonti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:431
+#: src/protocols/jabber/jabber.c:432
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
+#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
+#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocols/jabber/jabber.c:601
+#: src/protocols/jabber/jabber.c:602
 msgid "E-Mail"
 msgstr "Sähköposti"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
-#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
+#: 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/trepia/trepia.c:413
 msgid "State"
 msgstr "Lääni"
 
-#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
 #: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "Puhelin"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:652
 msgid "Date"
 msgstr "Ajankohta"
 
-#: src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:660
 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:662 src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
+#: src/protocols/jabber/jabber.c:743
+msgid "Logged out"
+msgstr "Kirjautui ulos."
+
 #. connect to the server
-#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
-#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/zephyr/zephyr.c:865
+#: 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
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:786
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:790
+#: src/protocols/jabber/jabber.c:792
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: src/protocols/jabber/jabber.c:799
+#: src/protocols/jabber/jabber.c:801
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirta(stream)"
 
-#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
-#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
+#: 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
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: src/protocols/jabber/jabber.c:910
+#: src/protocols/jabber/jabber.c:912
 msgid "Both"
 msgstr "molemmille"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:914
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:916
 msgid "From"
 msgstr "vain sinulle"
 
-#: src/protocols/jabber/jabber.c:917
+#: src/protocols/jabber/jabber.c:919
 msgid "To"
 msgstr "vain sinulta"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:921
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: src/protocols/jabber/jabber.c:923
+#: src/protocols/jabber/jabber.c:925
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:945
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:958 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:958 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:960 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:959 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:961 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:5443
-#: src/protocols/oscar/oscar.c:6622
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:6663
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:978
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:979
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/jabber.c:1040
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
 # XXX minor editing of existing string
-#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasanaa"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1046
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: src/protocols/jabber/jabber.c:1136
+#: src/protocols/jabber/jabber.c:1138
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
 # NOTE source: gftt
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1140
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: src/protocols/jabber/jabber.c:1140
-msgid "Feature Not Implemented"
-msgstr "Ominaisuutta ei ole implementoitu."
-
 #: src/protocols/jabber/jabber.c:1142
-msgid "Forbidden"
-msgstr "Estetty"
+msgid "Feature Not Implemented"
+msgstr "Ominaisuutta ei ole implementoitu."
 
 #: src/protocols/jabber/jabber.c:1144
+msgid "Forbidden"
+msgstr "Estetty"
+
+#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr "Poistunut"
 
-#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: src/protocols/jabber/jabber.c:1148
+#: src/protocols/jabber/jabber.c:1150
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: src/protocols/jabber/jabber.c:1150
-msgid "Malformed Jabber ID"
-msgstr "Epäkelpo Jabber I.D."
-
 #: src/protocols/jabber/jabber.c:1152
-msgid "Not Acceptable"
-msgstr "Ei hyväksyttävä"
+msgid "Malformed Jabber ID"
+msgstr "Epäkelpo Jabber I.D."
 
 #: src/protocols/jabber/jabber.c:1154
+msgid "Not Acceptable"
+msgstr "Ei hyväksyttävä"
+
+#: src/protocols/jabber/jabber.c:1156
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1160
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: src/protocols/jabber/jabber.c:1164
-msgid "Registration Required"
-msgstr "Vaatii rekisteröinnin"
-
 #: src/protocols/jabber/jabber.c:1166
-msgid "Remote Server Not Found"
-msgstr "Palvelinta ei löytynyt"
+msgid "Registration Required"
+msgstr "Vaatii rekisteröinnin"
 
 #: src/protocols/jabber/jabber.c:1168
+msgid "Remote Server Not Found"
+msgstr "Palvelinta ei löytynyt"
+
+#: src/protocols/jabber/jabber.c:1170
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1174
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: src/protocols/jabber/jabber.c:1174
-msgid "Subscription Required"
-msgstr "Vaatii tilailmoitukset"
-
 #: src/protocols/jabber/jabber.c:1176
+msgid "Subscription Required"
+msgstr "Vaatii tilailmoitukset"
+
+#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1185
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä koodaus valtuutusviestissä"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1190
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1193
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1196
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1201
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Format"
 msgstr "Väärä formaatti"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1212
 msgid "Resource Conflict"
 msgstr "Lähde(resource)-konflikti"
 
-#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: src/protocols/jabber/jabber.c:1214
-msgid "Host Gone"
-msgstr "Verkkoisäntä kadonnut"
-
 #: src/protocols/jabber/jabber.c:1216
+msgid "Host Gone"
+msgstr "Verkkoisäntä kadonnut"
+
+#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1220
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
 # XXX edit of similar string
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1228
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1230
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1234
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1236
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
 # NOTE source: 0.59.8/0.60
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1238
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: src/protocols/jabber/jabber.c:1238
-msgid "Restricted XML"
-msgstr "Rajoitettu XML"
-
 #: src/protocols/jabber/jabber.c:1240
-msgid "See Other Host"
-msgstr "Etsi toinen isäntä"
+msgid "Restricted XML"
+msgstr "Rajoitettu XML"
 
 #: src/protocols/jabber/jabber.c:1242
+msgid "See Other Host"
+msgstr "Etsi toinen isäntä"
+
+#: src/protocols/jabber/jabber.c:1244
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: src/protocols/jabber/jabber.c:1244
-msgid "Undefined Condition"
-msgstr "Määrittelemätön tila"
-
 #: src/protocols/jabber/jabber.c:1246
-msgid "Unsupported Encoding"
-msgstr "Koodausta ei tuettu"
+msgid "Undefined Condition"
+msgstr "Määrittelemätön tila"
 
 #: src/protocols/jabber/jabber.c:1248
+msgid "Unsupported Encoding"
+msgstr "Koodausta ei tuettu"
+
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(Stanza type) ei tuettu"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1252
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "Huonostimuotoiltua XML:ää"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1256
 msgid "Stream Error"
 msgstr "Datavirta(stream) -virhe"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1323
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "Ei voitu kieltää käyttäjää %s."
+
+#: src/protocols/jabber/jabber.c:1375
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "Ei voitu potkaista käyttäjää %s ulos."
+
+#: src/protocols/jabber/jabber.c:1400
+msgid "config:  Configure a chat room."
+msgstr "config: Configuroi chat-huone."
+
+#: src/protocols/jabber/jabber.c:1403
+msgid "configure:  Configure a chat room."
+msgstr "configure: Configuroi chat-huone."
+
+#: src/protocols/jabber/jabber.c:1410
+msgid "part [room]:  Leave the room."
+msgstr "part [huone]: Poistu huoneesta."
+
+#: src/protocols/jabber/jabber.c:1413
+msgid "register:  Register with a chat room."
+msgstr "register: Rekisteröidy chat-huoneeseen."
+
+#: src/protocols/jabber/jabber.c:1418
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
+
+#: src/protocols/jabber/jabber.c:1422
+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
+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
+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
+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
+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
 msgid "Hide Operating System"
 msgstr "Piilota käyttöjärjestelmä"
 
@@ -5905,24 +6178,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: src/protocols/jabber/jabber.c:1388
+#: src/protocols/jabber/jabber.c:1562
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: src/protocols/jabber/jabber.c:1393
+#: src/protocols/jabber/jabber.c:1567
 msgid "Force old SSL"
 msgstr "Käytä vanhaa SSL:ää"
 
-#: src/protocols/jabber/jabber.c:1398
+#: src/protocols/jabber/jabber.c:1572
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
+#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5959,20 +6232,20 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-parsinnassa"
 
-#: src/protocols/jabber/presence.c:221
+#: src/protocols/jabber/presence.c:224
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Käyttäjä %s haluaa lisätä sinut tuttavalistalleen."
 
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: src/protocols/jabber/presence.c:279
+#: src/protocols/jabber/presence.c:282
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5980,20 +6253,20 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:284
 msgid "Configure Room"
 msgstr "Aseta huoneen asetukset"
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:286
 msgid "Accept Defaults"
 msgstr "Hyväksy oletusasetukset"
 
-#: src/protocols/jabber/presence.c:303
+#: src/protocols/jabber/presence.c:308
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe chatissä: %s"
 
-#: src/protocols/jabber/presence.c:306
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä chättiin %s"
@@ -6008,317 +6281,276 @@
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: src/protocols/msn/dispatch.c:42
-msgid "Unable to request USR\n"
-msgstr "Ei kyetty pyytämään USR:ä\n"
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
-msgid "Unable to login using MD5"
-msgstr "Ei kyetty kirjautumaan sisään MD5:llä"
-
-#: src/protocols/msn/dispatch.c:68
-msgid "Unable to send USR"
-msgstr "USR:ää ei voitu lähettää"
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
-msgid "Requesting to send password"
-msgstr "Pyydetään salasanan lähettämistä"
-
-# XXX I declined "Protokolla" and "versio", either could be wrong
-#: src/protocols/msn/dispatch.c:104
-msgid "Protocol version not supported"
-msgstr "Protokollan versiota ei tuettu"
-
-#: src/protocols/msn/dispatch.c:117
-msgid "Unable to request CVR\n"
-msgstr "Ei kyetty pyytämään CVR:ä\n"
-
-#: src/protocols/msn/dispatch.c:126
-msgid "Unable to request INF\n"
-msgstr "Ei kyetty pyytämään INF:iä\n"
-
-# XXX
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
-msgid "Got invalid XFR"
-msgstr "Epäkelpo XFR vastaanotettu"
-
-#: src/protocols/msn/dispatch.c:178
-msgid "Unable to transfer"
-msgstr "Siirto ei onnistunut"
-
-#: src/protocols/msn/dispatch.c:192
-msgid "Unable to parse message."
-msgstr "Viestin käsittely epäonnistui"
-
-#: src/protocols/msn/dispatch.c:232
-msgid "Unable to write to server"
-msgstr "Palvelimelle ei kyetty kirjoittamaan"
-
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
-msgid "Syncing with server"
-msgstr "Synkronoidaan palvelimen kanssa"
-
-#: src/protocols/msn/dispatch.c:250
-msgid "Error reading from server"
-msgstr "Virhe luettaessa palvelimelta"
-
-#: src/protocols/msn/error.c:33
+# src/prefs.c:111
+#: src/protocols/msn/cmdproc.c:336
+msgid "Miscellaneous error"
+msgstr "Sekalainen virhe"
+
+#: src/protocols/msn/cmdproc.c:338
+msgid "You have signed on from another location."
+msgstr "Olet kirjautunut sisään toisesta paikasta."
+
+#: src/protocols/msn/cmdproc.c:340
+msgid "The MSN servers are going down temporarily."
+msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
+
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Viestin parsinta epäonnistui"
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe Gaimissa)"
 
-#: src/protocols/msn/error.c:40
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Epäkelpo sähköpostiosoite"
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Käyttäjää ei ole"
 
-#: src/protocols/msn/error.c:47
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu"
 
-#: src/protocols/msn/error.c:50
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Olet jo kirjautuneena sisään"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Epäkelpo käyttäjänimi"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Epäkelpo tuttavanimi"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista täynnä"
 
 # NOTE This means "your buddy" is already there, thus "Olet" is wrong
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "On jo siellä"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Olet jo kyseisessä tilassa"
 
 # NOTE This means "your buddy" is already in opposite list, thus "Olet" is wrong
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "On jo vastakkaisessa listassa"
 
 # XXX edit of similar string
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Liian monta ryhmää"
 
 # XXX edit of similar string
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Epäkelpo ryhmä"
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Käyttäjä ei ole ryhmässä"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Ryhmän nimi liian pitkä"
 
-#: src/protocols/msn/error.c:89
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Ei voida poistaa ryhmää nolla"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "Yritettiin lisätä tuttavaa ryhmään jota ei ole"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Kytkentä epäonnistui"
 
-#: src/protocols/msn/error.c:100
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Siirrosta tiedottaminen epäonnistui"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Vaadittuja kenttiä puuttuu"
 
-#: src/protocols/msn/error.c:107
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Komento poistettu käytöstä"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Vastapään tiedottajapalvelin ei toiminnassa"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
-#: src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
-#: src/protocols/msn/error.c:153
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
-#: src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
-#: src/protocols/msn/error.c:178
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Odottamaton"
 
-#: src/protocols/msn/error.c:183
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
-#: src/protocols/msn/error.c:192
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: src/protocols/msn/error.c:199
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
-#: src/protocols/msn/error.c:207
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
-#: src/protocols/msn/error.c:211
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
-#: src/protocols/msn/error.c:218
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
-#: src/protocols/msn/error.c:222
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tuntematon virhekoodi %d"
 
-#: src/protocols/msn/error.c:234
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: src/protocols/msn/msn.c:80
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: src/protocols/msn/msn.c:189
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: src/protocols/msn/msn.c:238
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6326,92 +6558,96 @@
 "Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN-"
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Salli"
 
-#: src/protocols/msn/msn.c:243
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: src/protocols/msn/msn.c:268
+#: src/protocols/msn/msn.c:313
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: src/protocols/msn/msn.c:270
+#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "Lähetä"
 
-#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
-#: src/protocols/msn/state.c:32
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
-#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
+#: 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
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
-#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
+#: 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/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
 msgid "Busy"
 msgstr "Varattu"
 
-#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
-#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
+#: 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
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
-#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
+#: 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
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
-#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
+#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/protocols/msn/msn.c:395
+#: src/protocols/msn/msn.c:482
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: src/protocols/msn/msn.c:400
+#: src/protocols/msn/msn.c:487
 msgid "Set Home Phone Number"
 msgstr "Aseta kotipuhelinnumero"
 
-#: src/protocols/msn/msn.c:404
+#: src/protocols/msn/msn.c:491
 msgid "Set Work Phone Number"
 msgstr "Aseta työpuhelinnumero"
 
-#: src/protocols/msn/msn.c:408
+#: src/protocols/msn/msn.c:495
 msgid "Set Mobile Phone Number"
 msgstr "Aseta matkapuhelinnumero"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:501
 msgid "Enable/Disable Mobile Devices"
 msgstr "Aseta päälle/pois mobiililaitteet"
 
-#: src/protocols/msn/msn.c:419
+#: src/protocols/msn/msn.c:506
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Salli/estä mobiilihaut"
 
-#: src/protocols/msn/msn.c:439
+#: src/protocols/msn/msn.c:529
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: src/protocols/msn/msn.c:447
+#: src/protocols/msn/msn.c:539
 msgid "Initiate Chat"
 msgstr "Aloita chat"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:548
+msgid "Update Buddy Icon"
+msgstr "Päivitä tuttavakuvaketta"
+
+#: src/protocols/msn/msn.c:585
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6419,111 +6655,113 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:805
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-"MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit %"
-"s@hotmail.com. Muutoksia sallitut-listaan ei tehty."
-
-# XXX
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
-msgid "Invalid MSN screen name"
-msgstr "Epäkelpo MSN-näyttönimi"
-
-#: src/protocols/msn/msn.c:842
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-"MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit %"
-"s@hotmail.com. Muutoksia kielletyt-listalle ei tehty."
-
-#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr "<html><body><b>Virhe haettaessa profiilia</b></body></html>"
+#: 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
+#, 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
+msgid "Error retrieving profile"
+msgstr "Virhe haettaessa profiilia"
 
 #. Age
-#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
+#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3066
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Age"
 msgstr "Ikä"
 
 #. Gender
-#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
+#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3074
+#: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Gender"
 msgstr "Sukupuoli"
 
 # NOTE actual string used by msn itself; also "Siviili sääty" (2 words) there
-#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
+#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Location"
 msgstr "Paikka"
 
 # src/menus.c:311
-#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Occupation"
 msgstr "Ammatti"
 
 # NOTE actual string used by msn itself, lit. "Self description"
-#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
-#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
-#: src/protocols/msn/msn.c:1452
+#: 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
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
-#: src/protocols/msn/msn.c:1481
+#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
+#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
-#: src/protocols/msn/msn.c:1503
+#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1420
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
 # NOTE actual string used by msn itself
-#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
-#: src/protocols/yahoo/yahoo.c:3113
+#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
+#: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
+#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
-
-#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
+#. 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
+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:1618
+#: src/protocols/msn/msn.c:1616
 msgid "Display conversation closed notices"
 msgstr "Näytä keskustelu suljettu-viestit"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1621
 msgid "Display timeout notices"
 msgstr "Näytä aikakatkaisuviestit"
 
@@ -6538,80 +6776,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
+#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: src/protocols/msn/nexus.c:56
+#: src/protocols/msn/nexus.c:79
 msgid "Unable to connect to server"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "MSN:n Nexus-palvelimelle ei kyetty kirjoittamaan."
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus-palvelin palautti virheellistä edelleenohjaustietoa."
-
-#: src/protocols/msn/nexus.c:204
+#: src/protocols/msn/nexus.c:215
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 "Tuntematon virhe yritettäessä kirjautua MSN-sisäänkirjautumispalvelimeen"
 
-#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:84
+msgid "Requesting to send password"
+msgstr "Pyydetään salasanan lähettämistä"
+
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
 #: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: src/protocols/msn/notification.c:355
-msgid "Protocol not supported"
-msgstr "Protokollaa ei tuettu"
-
-#: src/protocols/msn/notification.c:386
-msgid "You have been disconnected. You have signed on from another location."
-msgstr "Yhteytesi on katkaistu. Olet kirjautunut sisään toisesta paikasta."
-
-#: src/protocols/msn/notification.c:392
-msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr "Yhteytesi on katkaistu. MSN-palvelimet ajetaan alas väliaikaisesti."
-
-#: src/protocols/msn/notification.c:527
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
-
-#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "Käyttäjä %s (%s) haluaa lisätä sinut tuttavalistalleen."
-
-#: src/protocols/msn/notification.c:1351
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-"MSN-tuttavalista käyttäjälle %s ei ole juuri nyt saatavilla. Ole hyvä, odota "
-"ja yritä uudelleen."
-
-#: src/protocols/msn/notification.c:1612
-msgid "Unable to transfer to notification server"
-msgstr "Tiedonsiirto ei onnistunut ilmoituspalvelimelle"
-
-#: src/protocols/msn/notification.c:1799
+#: src/protocols/msn/notification.c:1069
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6640,79 +6839,91 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: src/protocols/msn/servconn.c:210
+#: src/protocols/msn/notification.c:1134
+msgid "Syncing with server"
+msgstr "Synkronoidaan palvelimen kanssa"
+
+#: src/protocols/msn/servconn.c:46
 #, c-format
 msgid "Unable to connect to %s server"
 msgstr "Ei voitu muodostaa yhteyttä %s palvelimeen"
 
-#: src/protocols/msn/servconn.c:214
+#: src/protocols/msn/servconn.c:50
 #, c-format
 msgid "Error writing to %s server"
 msgstr "Virhe kirjoitettaessa %s palvelimelle"
 
-#: src/protocols/msn/servconn.c:218
-#, c-format
-msgid ""
-"Error reading from %s server. Lastcommand was:\n"
-" %s"
-msgstr ""
-"Virhe luettaessa %s palvelimelta. Edellinen komento oli:\n"
-"%s"
-
-#: src/protocols/msn/servconn.c:222
+#: src/protocols/msn/servconn.c:54
+#, c-format
+msgid "Error reading from %s server"
+msgstr "Virhe luettaessa %s palvelimelta"
+
+#: src/protocols/msn/servconn.c:58
 #, c-format
 msgid "Unknown error from %s server"
 msgstr "Tuntematon virhe %s palvelimelta."
 
-#: src/protocols/msn/servconn.c:315
+#: src/protocols/msn/servconn.c:72
+#, c-format
+msgid "MSN error for account %s"
+msgstr "MSN virhe käyttäjätilille %s"
+
+#: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
 msgstr "Saatiin HTTP-virhe. Raportoi tästä, kiitos."
 
-#: src/protocols/msn/switchboard.c:121
+#: src/protocols/msn/switchboard.c:201
 msgid "The conversation has become inactive and timed out."
 msgstr "Keskustelu on tullut inaktiiviseksi ja aikakatkaistu."
 
-#: src/protocols/msn/switchboard.c:130
+#: src/protocols/msn/switchboard.c:209
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s on sulkenut keskusteluikkunan."
 
-#: src/protocols/msn/switchboard.c:264
-msgid "An MSN message may not have been received."
-msgstr "MSN-viestiä ei ehkä ole otettu vastaan."
-
-#: src/protocols/napster/napster.c:229
+#: src/protocols/msn/userlist.c:86
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
+
+#: src/protocols/msn/userlist.c:94
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen."
+
+#: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
 msgstr "Otsikkotietoja ei kyetty lukemaan palvelimelta."
 
-#: src/protocols/napster/napster.c:243
+#: src/protocols/napster/napster.c:244
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %hd."
-
-#: src/protocols/napster/napster.c:306
+msgstr ""
+"Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %hd."
+
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "käyttäjiä: %s, tiedostoja: %s, koko: %sGt"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:317
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Ei voitu lisätä \"%s\" Napster hotlistiin"
 
-#: src/protocols/napster/napster.c:325
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:383
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s pyysi tietojasi"
 
 # NOTE source: 0.59.8 (+ "koska")
-#: src/protocols/napster/napster.c:421
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -6720,13 +6931,13 @@
 "Yhteytesi on katkennut koska olet kirjautunut sisään toisesta paikasta."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:427
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
-#: src/protocols/toc/toc.c:1274
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Ryhmä"
 
@@ -6741,173 +6952,177 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
+#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protokollaliitännäinen"
 
-#: src/protocols/novell/nmuser.c:2027
+#: src/protocols/novell/nmuser.c:2046
 msgid "Required parameters not passed in"
 msgstr "Vaadittuja parametreja ei syötetty"
 
-#: src/protocols/novell/nmuser.c:2030
+#: src/protocols/novell/nmuser.c:2049
 msgid "Unable to write to network"
 msgstr "Ei voida kirjoittaa verkkoon"
 
-#: src/protocols/novell/nmuser.c:2033
+#: src/protocols/novell/nmuser.c:2052
 msgid "Unable to read from network"
 msgstr "Ei voida lukea verkosta"
 
-#: src/protocols/novell/nmuser.c:2036
+#: src/protocols/novell/nmuser.c:2055
 msgid "Error communicating with server"
 msgstr "Virhe kommunikoitaessa palvelimelle"
 
-#: src/protocols/novell/nmuser.c:2040
+#: src/protocols/novell/nmuser.c:2059
 msgid "Conference not found"
 msgstr "Konferenssia ei löydy"
 
-#: src/protocols/novell/nmuser.c:2043
+#: src/protocols/novell/nmuser.c:2062
 msgid "Conference does not exist"
 msgstr "Konferenssia ei ole"
 
-#: src/protocols/novell/nmuser.c:2047
+#: src/protocols/novell/nmuser.c:2066
 msgid "A folder with that name already exists"
 msgstr "Sen niminen hakemisto on jo olemassa"
 
-#: src/protocols/novell/nmuser.c:2050
+#: src/protocols/novell/nmuser.c:2069
 msgid "Not supported"
 msgstr "Ei tueta"
 
-#: src/protocols/novell/nmuser.c:2054
+#: src/protocols/novell/nmuser.c:2073
 msgid "Password has expired"
 msgstr "Salasana vanhentunut"
 
-#: src/protocols/novell/nmuser.c:2057
+#: src/protocols/novell/nmuser.c:2076
 msgid "Invalid password"
 msgstr "Virheellinen salasana"
 
-#: src/protocols/novell/nmuser.c:2060
+#: src/protocols/novell/nmuser.c:2079
 msgid "User not found"
 msgstr "Käyttäjää ei löytynyt"
 
-#: src/protocols/novell/nmuser.c:2063
+#: src/protocols/novell/nmuser.c:2082
 msgid "Account has been disabled"
 msgstr "Käyttäjätili on poistettu käytöstä"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:2085
 msgid "The server could not access the directory"
 msgstr "Palvelin ei pääse hakemistoon"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:2088
 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:2072
+#: src/protocols/novell/nmuser.c:2091
 msgid "The server is unavailable; try again later"
 msgstr "Palvelin ei ole käytössä; yritä myöhemmin uudelleen"
 
-#: src/protocols/novell/nmuser.c:2075
+#: src/protocols/novell/nmuser.c:2094
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Tuttavaa ei voi lisätä samaan hakemistoon kahdesti"
 
-#: src/protocols/novell/nmuser.c:2078
+#: src/protocols/novell/nmuser.c:2097
 msgid "Cannot add yourself"
 msgstr "Et voi lisätä itseäsi"
 
-#: src/protocols/novell/nmuser.c:2081
+#: src/protocols/novell/nmuser.c:2100
 msgid "Master archive is misconfigured"
 msgstr "Pääarkisto on väärin konfiguroitu"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:2104
 msgid "Invalid username or password"
 msgstr "Epäkelpo käyttäjänimi tai salasana"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:2107
 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:2091
+#: src/protocols/novell/nmuser.c:2110
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
-msgstr "Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on syötetty"
-
-#: src/protocols/novell/nmuser.c:2094
+msgstr ""
+"Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on "
+"syötetty"
+
+#: src/protocols/novell/nmuser.c:2113
 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:2098
+#: src/protocols/novell/nmuser.c:2117
 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:2101
+#: src/protocols/novell/nmuser.c:2120
 msgid "You have entered an invalid username"
 msgstr "Olet syöttänyt epäkelvon käyttäjänimen"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:2123
 msgid "An error occurred while updating the directory"
 msgstr "Virhe tapahtui päivitettäessä hakemistoa"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:2126
 msgid "Incompatible protocol version"
 msgstr "Epäyhteensopiva protokollaversio"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:2129
 msgid "The user has blocked you"
 msgstr "Käyttäjä on estänyt sinut"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:2132
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr "Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena sisään samaan aikaan"
-
-#: src/protocols/novell/nmuser.c:2116
+msgstr ""
+"Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena "
+"sisään samaan aikaan"
+
+#: src/protocols/novell/nmuser.c:2135
 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:2119
+#: src/protocols/novell/nmuser.c:2138
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
 
-#: src/protocols/novell/novell.c:119
+#: src/protocols/novell/novell.c:116
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Kirjautuminen epäonnistui (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:229
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Viestiä ei voitu lähettää. Ei saatu yksityiskohtia käyttäjälle (%s)."
 
-#: src/protocols/novell/novell.c:378
+#: src/protocols/novell/novell.c:375
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ei voitu lisätä %s tuttavalistalle (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:404
+#: src/protocols/novell/novell.c:401
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Viestiä ei voitu lähettää (%s)."
 
-#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ei voitu kutsua käyttäjää (%s)."
 
-#: src/protocols/novell/novell.c:514
+#: src/protocols/novell/novell.c:511
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Ei voitu lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (%s)."
 
-#: src/protocols/novell/novell.c:519
+#: src/protocols/novell/novell.c:516
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Viestiä ei voitu lähettää. Ei voitu luoda konferenssia (%s)."
 
-#: src/protocols/novell/novell.c:566
+#: src/protocols/novell/novell.c:563
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -6916,7 +7131,7 @@
 "Ei voitu siirtää käyttäjää %s kansioon %s palvelinpuolen listalla. Virhe "
 "luotaessa kansiota (%s)."
 
-#: src/protocols/novell/novell.c:614
+#: src/protocols/novell/novell.c:611
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -6925,46 +7140,46 @@
 "Ei voitu lisätä %s tuttavalistalle. Virhe luotaessa kansiota palvelinpuolen "
 "listalle (%s)."
 
-#: src/protocols/novell/novell.c:686
+#: src/protocols/novell/novell.c:683
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ei saatu yksityiskohtia käyttäjälle %s (%s)."
 
-#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Ei voitu lisätä käyttäjää yksityisyys-listalle (%s)."
 
-#: src/protocols/novell/novell.c:779
+#: src/protocols/novell/novell.c:776
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Ei voitu lisätä %s kieltolistalle (%s)."
 
-#: src/protocols/novell/novell.c:832
+#: src/protocols/novell/novell.c:829
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Ei voitu lisätä %s sallitut-listalle (%s)."
 
-#: src/protocols/novell/novell.c:900
+#: src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
 
-#: src/protocols/novell/novell.c:995
+#: src/protocols/novell/novell.c:992
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ei voitu luoda konferenssia (%s)."
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: src/protocols/novell/novell.c:1428
+#: src/protocols/novell/novell.c:1425
 msgid "Userid"
 msgstr "Käyttäjätunnus"
 
@@ -6975,47 +7190,47 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1442
+#: src/protocols/novell/novell.c:1439
 msgid "Full name"
 msgstr "Koko nimi"
 
 # XXX could be wrong
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1459
 msgid "User Properties"
 msgstr "Käyttäjän valinnat"
 
-#: src/protocols/novell/novell.c:1566
+#: src/protocols/novell/novell.c:1563
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: src/protocols/novell/novell.c:1591
+#: src/protocols/novell/novell.c:1588
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: src/protocols/novell/novell.c:1621
+#: src/protocols/novell/novell.c:1618
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Virhe käsiteltäessä tapahtumaa tai vastausta. (%s)"
 
-#: src/protocols/novell/novell.c:1655
+#: src/protocols/novell/novell.c:1652
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: src/protocols/novell/novell.c:1670
+#: src/protocols/novell/novell.c:1667
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1802
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1829
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1830
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7026,16 +7241,16 @@
 "\n"
 "Lähetetty: %s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1832
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1937
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:1991
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7045,7 +7260,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2089
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7053,29 +7268,29 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2111
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2420
 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:2732 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 # src/sidebar.c:103
-#: src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2738
 msgid "Message"
 msgstr "Viesti"
 
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
+#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: src/protocols/novell/novell.c:3291
+#: src/protocols/novell/novell.c:3287
 msgid "Initiate _Chat"
 msgstr "Aloita _Chat"
 
@@ -7090,15 +7305,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
+#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GrouWise Messenger-protokollaliitännäinen"
 
-#: src/protocols/novell/novell.c:3388
+#: src/protocols/novell/novell.c:3402
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: src/protocols/novell/novell.c:3392
+#: src/protocols/novell/novell.c:3406
 msgid "Server port"
 msgstr "Palvelimen portti"
 
@@ -7207,12 +7422,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM-suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
 #: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -7286,19 +7501,19 @@
 msgstr "Kamera"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
-#: src/protocols/oscar/oscar.c:6625
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:6666
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:6664
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
-#: src/protocols/oscar/oscar.c:6624
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
+#: src/protocols/oscar/oscar.c:6665
 msgid "Occupied"
 msgstr "Varattu"
 
@@ -7362,11 +7577,11 @@
 "Haluatko jatkaa? "
 
 # NOTE source: gftt
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
@@ -7404,8 +7619,9 @@
 
 # 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:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/oscar/oscar.c:1797 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."
 
@@ -7417,7 +7633,7 @@
 msgid "Unable to establish listener socket."
 msgstr "Socketin muodostus epäonnistui."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
@@ -7471,16 +7687,16 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
 msgid "(There was an error receiving this message)"
 msgstr "(tämän viestin vastaanotossa tapahtui virhe)"
 
-#: src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:3304
 #, 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:3285
+#: src/protocols/oscar/oscar.c:3307
 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 "
@@ -7490,19 +7706,19 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3343
 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:3329
+#: src/protocols/oscar/oscar.c:3351
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: src/protocols/oscar/oscar.c:3330
+#: src/protocols/oscar/oscar.c:3352
 msgid "Please authorize me!"
 msgstr "Valtuuta minut!"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3382
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7511,23 +7727,23 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: src/protocols/oscar/oscar.c:3365 src/protocols/oscar/oscar.c:3367
+#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
-#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
-#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
-#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
-#: src/protocols/oscar/oscar.c:6097
+#: 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
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: src/protocols/oscar/oscar.c:3423
+#: src/protocols/oscar/oscar.c:3445
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3528
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7536,11 +7752,11 @@
 "Käyttäjä %u haluaa lisätä sinut tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: src/protocols/oscar/oscar.c:3526
+#: src/protocols/oscar/oscar.c:3548
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7551,17 +7767,17 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3549
 msgid "ICQ authorization denied."
 msgstr "ICQ valtuutus evätty."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3534
+#: src/protocols/oscar/oscar.c:3556
 #, 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:3542
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7574,7 +7790,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3550
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7587,7 +7803,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7600,36 +7816,36 @@
 "Viesti on:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3579
+#: src/protocols/oscar/oscar.c:3601
 #, 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:3585
+#: src/protocols/oscar/oscar.c:3607
 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:3589
+#: src/protocols/oscar/oscar.c:3611
 msgid "Decline"
 msgstr "Evää"
 
 # NOTE source: 0.59.8 (%d -> %hu)
-#: src/protocols/oscar/oscar.c:3674
+#: src/protocols/oscar/oscar.c:3696
 #, 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:3683
+#: src/protocols/oscar/oscar.c:3705
 #, 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:3692
+#: src/protocols/oscar/oscar.c:3714
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7639,7 +7855,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:3701
+#: src/protocols/oscar/oscar.c:3723
 #, 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."
@@ -7647,64 +7863,69 @@
 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:3710
+#: src/protocols/oscar/oscar.c:3732
 #, 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:3719
+#: src/protocols/oscar/oscar.c:3741
 #, 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:3780
+#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#, 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:3839
+#: src/protocols/oscar/oscar.c:3864
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3865
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3875
+#: src/protocols/oscar/oscar.c:3900
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Viestiäsi %s:lle ei lähetetty:"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3959
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:3982
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: src/protocols/oscar/oscar.c:3960
+#: src/protocols/oscar/oscar.c:3985
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
+#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4073
 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:4232
+#: src/protocols/oscar/oscar.c:4259
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7712,11 +7933,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: src/protocols/oscar/oscar.c:4450
+#: src/protocols/oscar/oscar.c:4476
 msgid "Rate limiting error."
 msgstr "Taajuusrajoitus virhe"
 
-#: src/protocols/oscar/oscar.c:4451
+#: src/protocols/oscar/oscar.c:4477
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7725,123 +7946,123 @@
 "sekuntia ja yritä uudelleen."
 
 # NOTE 0.59.8 (+ "koska")
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4540
 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:4516
+#: src/protocols/oscar/oscar.c:4542
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: src/protocols/oscar/oscar.c:4547
+#: src/protocols/oscar/oscar.c:4573
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
+#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
+#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: src/protocols/oscar/oscar.c:4830
+#: src/protocols/oscar/oscar.c:4856
 msgid "Not specified"
 msgstr "Ei määritelty"
 
-#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Nainen"
 
-#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Mies"
 
-#: src/protocols/oscar/oscar.c:4847
+#: src/protocols/oscar/oscar.c:4873
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: src/protocols/oscar/oscar.c:4851
+#: src/protocols/oscar/oscar.c:4877
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4882
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: src/protocols/oscar/oscar.c:4864
+#: src/protocols/oscar/oscar.c:4890
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:4898
 msgid "Work Information"
 msgstr "Työtiedot"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4899
 msgid "Company"
 msgstr "Yritys"
 
 # NOTE: source: gnomeicu
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4900
 msgid "Division"
 msgstr "Osasto"
 
 # XXX
-#: src/protocols/oscar/oscar.c:4875
+#: src/protocols/oscar/oscar.c:4901
 msgid "Position"
 msgstr "Paikka"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4903
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4909
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s:n ICQ-tiedot"
 
-#: src/protocols/oscar/oscar.c:4933
+#: src/protocols/oscar/oscar.c:4958
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:4979
 #, 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:4958
+#: src/protocols/oscar/oscar.c:4983
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: src/protocols/oscar/oscar.c:4975
+#: src/protocols/oscar/oscar.c:5000
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: src/protocols/oscar/oscar.c:4996
+#: src/protocols/oscar/oscar.c:5021
 #, 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:4998
+#: src/protocols/oscar/oscar.c:5023
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: src/protocols/oscar/oscar.c:5026
+#: src/protocols/oscar/oscar.c:5051
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7850,7 +8071,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: src/protocols/oscar/oscar.c:5032
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7859,7 +8080,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:5035
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7868,7 +8089,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7877,7 +8098,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:5041
+#: src/protocols/oscar/oscar.c:5066
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7886,7 +8107,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:5044
+#: src/protocols/oscar/oscar.c:5069
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7895,12 +8116,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7909,27 +8130,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: src/protocols/oscar/oscar.c:5128
+#: src/protocols/oscar/oscar.c:5153
 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:5301
+#: src/protocols/oscar/oscar.c:5326
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: src/protocols/oscar/oscar.c:5302
+#: src/protocols/oscar/oscar.c:5327
 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 "
@@ -7939,7 +8160,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: src/protocols/oscar/oscar.c:5329
+#: src/protocols/oscar/oscar.c:5354
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7952,19 +8173,19 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: src/protocols/oscar/oscar.c:5334
+#: src/protocols/oscar/oscar.c:5359
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä"
 
-#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
 msgid "Visible"
 msgstr "Näkyvä"
 
-#: src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:5393
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: src/protocols/oscar/oscar.c:5369
+#: src/protocols/oscar/oscar.c:5394
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7974,7 +8195,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7988,11 +8209,11 @@
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
 # XXX
-#: src/protocols/oscar/oscar.c:5414
+#: src/protocols/oscar/oscar.c:5439
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: src/protocols/oscar/oscar.c:5500
+#: src/protocols/oscar/oscar.c:5517
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8003,16 +8224,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:5501 src/protocols/oscar/oscar.c:5918
-#: src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:5972
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: src/protocols/oscar/oscar.c:5637
+#: src/protocols/oscar/oscar.c:5678
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: src/protocols/oscar/oscar.c:5638
+#: src/protocols/oscar/oscar.c:5679
 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 "
@@ -8021,13 +8242,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
-#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
-#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
+#: 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
 msgid "Orphans"
 msgstr "Orvot"
 
-#: src/protocols/oscar/oscar.c:5917
+#: src/protocols/oscar/oscar.c:5958
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8037,11 +8258,11 @@
 "hyvä ja poista joku ja yritä uudelleen."
 
 # NOTE: source: balsa
-#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5971
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8051,7 +8272,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:6012
+#: src/protocols/oscar/oscar.c:6053
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8061,11 +8282,11 @@
 "Haluatko lisätä heidät omalle listallesi?"
 
 # XXX
-#: src/protocols/oscar/oscar.c:6018
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6092
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8075,17 +8296,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6093
+#: src/protocols/oscar/oscar.c:6134
 #, 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:6094
+#: src/protocols/oscar/oscar.c:6135
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6097
+#: src/protocols/oscar/oscar.c:6138
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8096,74 +8317,74 @@
 "syystä:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6139
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
+#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:6198
 msgid "Invalid chat name specified."
 msgstr "Virheellinen chat nimi annettu."
 
-#: src/protocols/oscar/oscar.c:6247
+#: src/protocols/oscar/oscar.c:6288
 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:6404
+#: src/protocols/oscar/oscar.c:6445
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: src/protocols/oscar/oscar.c:6688
+#: src/protocols/oscar/oscar.c:6729
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6747
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6753
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: src/protocols/oscar/oscar.c:6724
+#: src/protocols/oscar/oscar.c:6765
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6788
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:6818
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: src/protocols/oscar/oscar.c:6778
+#: src/protocols/oscar/oscar.c:6819
 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:6785
+#: src/protocols/oscar/oscar.c:6826
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: src/protocols/oscar/oscar.c:6837
+#: src/protocols/oscar/oscar.c:6878
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: src/protocols/oscar/oscar.c:6882
+#: src/protocols/oscar/oscar.c:6923
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: src/protocols/oscar/oscar.c:6885
+#: src/protocols/oscar/oscar.c:6926
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: src/protocols/oscar/oscar.c:6886
+#: src/protocols/oscar/oscar.c:6927
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8172,76 +8393,76 @@
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
 # NOTE 0.59.8 <- TODO double-check
-#: src/protocols/oscar/oscar.c:6903
+#: src/protocols/oscar/oscar.c:6944
 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:6904
+#: src/protocols/oscar/oscar.c:6945
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:6946
 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:6922
+#: src/protocols/oscar/oscar.c:6963
 msgid "Available Message:"
 msgstr "Paikallaoloviesti:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6964
 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:7004
+#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: src/protocols/oscar/oscar.c:7009
+#: src/protocols/oscar/oscar.c:7050
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: src/protocols/oscar/oscar.c:7015
+#: src/protocols/oscar/oscar.c:7056
 msgid "Set Available Message..."
 msgstr "Uusi paikallaoloviesti..."
 
-#: src/protocols/oscar/oscar.c:7020
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: src/protocols/oscar/oscar.c:7025
+#: src/protocols/oscar/oscar.c:7066
 msgid "Change Password (URL)"
 msgstr "Vaihda salasanaa (URL)"
 
-#: src/protocols/oscar/oscar.c:7029
+#: src/protocols/oscar/oscar.c:7070
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
-#: src/protocols/oscar/oscar.c:7038
+#: src/protocols/oscar/oscar.c:7079
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: src/protocols/oscar/oscar.c:7042
+#: src/protocols/oscar/oscar.c:7083
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:7087
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7091
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7098
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: src/protocols/oscar/oscar.c:7063
+#: src/protocols/oscar/oscar.c:7104
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: src/protocols/oscar/oscar.c:7068
+#: src/protocols/oscar/oscar.c:7109
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
@@ -8256,66 +8477,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: src/protocols/oscar/oscar.c:7204
+#: src/protocols/oscar/oscar.c:7246
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: src/protocols/oscar/oscar.c:7209
+#: src/protocols/oscar/oscar.c:7251
 msgid "Auth port"
 msgstr "portti"
 
-#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
-#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
 #: src/protocols/silc/ft.c:340
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Käyttäjä %s ei ole läsnä verkossa"
 
-#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
-#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
-#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
 msgid "Key Agreement"
 msgstr "Avainsopimus"
 
-#: src/protocols/silc/buddy.c:49
+#: src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
 msgstr "Ei voida suorittaa avainsopimusta"
 
-#: src/protocols/silc/buddy.c:106
+#: src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
 msgstr "Virhe tapahtui avainsopimuksen aikana"
 
-#: src/protocols/silc/buddy.c:110
+#: src/protocols/silc/buddy.c:114
 msgid "Key Agreement failed"
 msgstr "Avainsopimus epäonnistui"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:119
 msgid "Timeout during key agreement"
 msgstr "Aikakatkaisu avainsopimuksen aikana"
 
-#: src/protocols/silc/buddy.c:120
+#: src/protocols/silc/buddy.c:124
 msgid "Key agreement was aborted"
 msgstr "Avainsopimus peruutettiin"
 
-#: src/protocols/silc/buddy.c:125
+#: src/protocols/silc/buddy.c:129
 msgid "Key agreement is already started"
 msgstr "Avainsopimus on jo aloitettu"
 
-#: src/protocols/silc/buddy.c:130
+#: src/protocols/silc/buddy.c:134
 msgid "Key agreement cannot be started with yourself"
 msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
 
-#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
-#: src/protocols/silc/buddy.c:500
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
 msgid "The remote user is not present in the network any more"
 msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
 
-#: src/protocols/silc/buddy.c:284
+#: src/protocols/silc/buddy.c:288
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8324,7 +8545,7 @@
 "Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
 "avainsopimuksen?"
 
-#: src/protocols/silc/buddy.c:288
+#: src/protocols/silc/buddy.c:292
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8335,59 +8556,59 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: src/protocols/silc/buddy.c:301
+#: src/protocols/silc/buddy.c:305
 msgid "Key Agreement Request"
 msgstr "Avainsopimuspyyntö"
 
-#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
-#: src/protocols/silc/buddy.c:451
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
 msgid "IM With Password"
 msgstr "Pikaviesti salasanalla"
 
-#: src/protocols/silc/buddy.c:410
+#: src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
 msgstr "Ei voida asettaa pikaviestiavainta"
 
-#: src/protocols/silc/buddy.c:452
+#: src/protocols/silc/buddy.c:459
 msgid "Set IM Password"
 msgstr "Aseta pikaviestin salasana"
 
-#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
 #: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
 #: src/protocols/silc/ops.c:1092
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
-#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
-#: src/protocols/silc/chat.c:218
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:219
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: 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
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
-#: src/protocols/silc/buddy.c:722
+#: src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Käyttäjä %s ei ole luotettu"
 
-#: src/protocols/silc/buddy.c:725
+#: src/protocols/silc/buddy.c:732
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8395,12 +8616,12 @@
 "Et voi saada tuttavan tiedotteita ennenkuin lisäät hänen julkisen avaimensa. "
 "Voit käyttää Hae Julkinen avain-komentoa saadaksesi julkisen avaimen."
 
-#: src/protocols/silc/buddy.c:1025
+#: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Tuttava %s ei ole kirjautuneena verkossa"
 
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1035
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8408,15 +8629,15 @@
 "Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
 "tuodaksesi julkisen avaimen."
 
-#: src/protocols/silc/buddy.c:1031
+#: src/protocols/silc/buddy.c:1038
 msgid "Import..."
 msgstr "Tuo..."
 
-#: src/protocols/silc/buddy.c:1118
+#: src/protocols/silc/buddy.c:1125
 msgid "Select correct user"
 msgstr "Valitse oikea käyttäjä"
 
-#: src/protocols/silc/buddy.c:1120
+#: src/protocols/silc/buddy.c:1127
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8424,7 +8645,7 @@
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
 "käyttäjä listalta."
 
-#: src/protocols/silc/buddy.c:1122
+#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8432,166 +8653,166 @@
 "Useammalla kuin yhdellä käyttäjällä on sama nimi. Valitse oikea käyttäjä "
 "listalta."
 
-#: src/protocols/silc/buddy.c:1396
+#: src/protocols/silc/buddy.c:1377
 msgid "Detached"
 msgstr "Irroitettu"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "Vastahakoinen"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "Herätä minut"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "Hyperaktiivinen"
 
-#: src/protocols/silc/buddy.c:1408
+#: src/protocols/silc/buddy.c:1389
 msgid "Robot"
 msgstr "Robotti"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
 #: src/protocols/silc/silc.c:606
 msgid "Happy"
 msgstr "Onnellinen"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
 #: src/protocols/silc/silc.c:608
 msgid "Sad"
 msgstr "Surullinen"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
 #: src/protocols/silc/silc.c:610
 msgid "Angry"
 msgstr "Vihainen"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
 #: src/protocols/silc/silc.c:612
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
 #: src/protocols/silc/silc.c:614
 msgid "Ashamed"
 msgstr "Häpeää"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
 #: src/protocols/silc/silc.c:616
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
 #: src/protocols/silc/silc.c:618
 msgid "In Love"
 msgstr "Rakastunut"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
 #: src/protocols/silc/silc.c:620
 msgid "Sleepy"
 msgstr "Unelias"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
 #: src/protocols/silc/silc.c:622
 msgid "Bored"
 msgstr "Tylsistynyt"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
 #: src/protocols/silc/silc.c:624
 msgid "Excited"
 msgstr "Innostunut"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
 #: src/protocols/silc/silc.c:626
 msgid "Anxious"
 msgstr "Levoton"
 
-#: src/protocols/silc/buddy.c:1471
+#: src/protocols/silc/buddy.c:1452
 msgid "Modes"
 msgstr "Tilat"
 
-#: src/protocols/silc/buddy.c:1481
+#: src/protocols/silc/buddy.c:1462
 msgid "Mood"
 msgstr "Mieliala"
 
-#: src/protocols/silc/buddy.c:1511
+#: src/protocols/silc/buddy.c:1490
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: src/protocols/silc/buddy.c:1516
+#: src/protocols/silc/buddy.c:1495
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: src/protocols/silc/buddy.c:1524
+#: src/protocols/silc/buddy.c:1503
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
 msgid "Video Conferencing"
 msgstr "Aloita videoneuvottelu"
 
-#: src/protocols/silc/buddy.c:1537
+#: src/protocols/silc/buddy.c:1515
 msgid "Preferred Language"
 msgstr "Suosittu kieli"
 
-#: src/protocols/silc/buddy.c:1542
+#: src/protocols/silc/buddy.c:1520
 msgid "Device"
 msgstr "Laite"
 
-#: src/protocols/silc/buddy.c:1544
+#: src/protocols/silc/buddy.c:1522
 msgid "Computer"
 msgstr "Tietokone"
 
-#: src/protocols/silc/buddy.c:1548
+#: src/protocols/silc/buddy.c:1526
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/buddy.c:1550
+#: src/protocols/silc/buddy.c:1528
 msgid "Terminal"
 msgstr "Pääte"
 
-#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
 #: src/protocols/silc/silc.c:676
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1545
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: src/protocols/silc/buddy.c:1626
+#: src/protocols/silc/buddy.c:1604
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: src/protocols/silc/buddy.c:1631
+#: src/protocols/silc/buddy.c:1609
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: src/protocols/silc/buddy.c:1635
+#: src/protocols/silc/buddy.c:1613
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: src/protocols/silc/buddy.c:1646
+#: src/protocols/silc/buddy.c:1624
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: src/protocols/silc/buddy.c:1651
+#: src/protocols/silc/buddy.c:1629
 msgid "Send File..."
 msgstr "Lähetä tiedosto..."
 
-#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
@@ -8613,24 +8834,88 @@
 msgid "Cannot get channel information"
 msgstr "Ei saada kanavatietoja"
 
-#: src/protocols/silc/chat.c:217
+#: src/protocols/silc/chat.c:104
+#, c-format
+msgid "Channel Name:\t\t%s\n"
+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"
+msgstr "Kanavan perustaja:      %s\n"
+
+#: src/protocols/silc/chat.c:120
+#, c-format
+msgid "Channel Cipher:\t\t%s\n"
+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"
+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"
+msgstr ""
+"\n"
+"Perustajan avain Fingerprint\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/chat.c:145
+#, c-format
+msgid ""
+"Founder Key Babbleprint:\n"
+"%s"
+msgstr ""
+"Perustajan avain Babbleprint:\n"
+"%s"
+
+#: src/protocols/silc/chat.c:218
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:272
+#: src/protocols/silc/chat.c:273
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: src/protocols/silc/chat.c:383
+#: src/protocols/silc/chat.c:382
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: src/protocols/silc/chat.c:390
+#: src/protocols/silc/chat.c:389
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: src/protocols/silc/chat.c:395
+#: src/protocols/silc/chat.c:394
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8644,120 +8929,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:404 src/protocols/silc/chat.c:405
-#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
-#: src/protocols/silc/chat.c:873
+#: 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
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: src/protocols/silc/chat.c:562
+#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+msgid "Add / Remove"
+msgstr "Lisää / Poista"
+
+#: src/protocols/silc/chat.c:560
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:575
 #, 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:579
+#: src/protocols/silc/chat.c:577
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: src/protocols/silc/chat.c:706
+#: src/protocols/silc/chat.c:704
 msgid "User Limit"
 msgstr "Käyttäjärajoitus"
 
-#: src/protocols/silc/chat.c:707
+#: src/protocols/silc/chat.c:705
 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:849
+#: src/protocols/silc/chat.c:847
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/protocols/silc/chat.c:856
+#: src/protocols/silc/chat.c:854
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: src/protocols/silc/chat.c:860
+#: src/protocols/silc/chat.c:858
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: src/protocols/silc/chat.c:867
+#: src/protocols/silc/chat.c:865
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: src/protocols/silc/chat.c:878
+#: src/protocols/silc/chat.c:876
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: src/protocols/silc/chat.c:882
+#: src/protocols/silc/chat.c:880
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: src/protocols/silc/chat.c:889
+#: src/protocols/silc/chat.c:887
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: src/protocols/silc/chat.c:894
+#: src/protocols/silc/chat.c:892
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: src/protocols/silc/chat.c:898
+#: src/protocols/silc/chat.c:896
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: src/protocols/silc/chat.c:904
+#: src/protocols/silc/chat.c:902
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: src/protocols/silc/chat.c:908
+#: src/protocols/silc/chat.c:906
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: src/protocols/silc/chat.c:914
+#: src/protocols/silc/chat.c:912
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: src/protocols/silc/chat.c:918
+#: src/protocols/silc/chat.c:916
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: src/protocols/silc/chat.c:988
+#: src/protocols/silc/chat.c:986
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: src/protocols/silc/chat.c:992
+#: src/protocols/silc/chat.c:990
 #, 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:1042
+#: src/protocols/silc/chat.c:1040
 #, 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:1044
+#: src/protocols/silc/chat.c:1042
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1045
+#: src/protocols/silc/chat.c:1043
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -8871,7 +9160,7 @@
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+#: src/protocols/silc/ops.c:802
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -8879,7 +9168,7 @@
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+#: src/protocols/silc/ops.c:825
 msgid "EMail"
 msgstr "Sähköposti"
 
@@ -8903,11 +9192,11 @@
 msgid "Channels"
 msgstr "Kanavat"
 
-#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+#: src/protocols/silc/ops.c:981
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen Fingerprint"
 
-#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+#: src/protocols/silc/ops.c:982
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen Babbleprint"
 
@@ -8915,7 +9204,7 @@
 msgid "More..."
 msgstr "Lisää..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
@@ -9139,63 +9428,112 @@
 "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
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: src/protocols/silc/silc.c:723
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
 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:724 src/protocols/silc/silc.c:1097
 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:740
+#: src/protocols/silc/silc.c:765
 msgid "Online Status"
 msgstr "Tila"
 
-#: src/protocols/silc/silc.c:749
+#: src/protocols/silc/silc.c:774
 msgid "View Message of the Day"
 msgstr "Näytä Päivän viesti"
 
-#: src/protocols/silc/silc.c:813
+#: src/protocols/silc/silc.c:846
 #, 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:907
+#: src/protocols/silc/silc.c:1159
+msgid "part:  Leave the chat"
+msgstr "part: Poistu chatistä"
+
+#: src/protocols/silc/silc.c:1162
+msgid "leave:  Leave the chat"
+msgstr "leave: Poistu chatistä"
+
+#: src/protocols/silc/silc.c:1166
+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
+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
+msgid "list:  List channels on this network"
+msgstr "list: Listaa kanavat tässä verkossa"
+
+#: src/protocols/silc/silc.c:1179
+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
+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
+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
+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
+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"
+msgstr "umode &lt;käyttäjätilat&gt;: Aseta itsellesi käyttäjätilavalinnat"
+
+#: src/protocols/silc/silc.c:1214
 msgid "Instant Messages"
 msgstr "Pikaviestit"
 
-#: src/protocols/silc/silc.c:912
+#: src/protocols/silc/silc.c:1219
 msgid "Digitally sign all IM messages"
 msgstr "Allekirjoita kaikki pikaviestit digitaalisesti"
 
-#: src/protocols/silc/silc.c:917
+#: src/protocols/silc/silc.c:1224
 msgid "Verify all IM message signatures"
 msgstr "Tarkista kaikki pikaviesti allekirjoitukset"
 
-#: src/protocols/silc/silc.c:920
+#: src/protocols/silc/silc.c:1227
 msgid "Channel Messages"
 msgstr "Kanavaviestit"
 
-#: src/protocols/silc/silc.c:925
+#: src/protocols/silc/silc.c:1232
 msgid "Digitally sign all channel messages"
 msgstr "Allekirjoita kaikki kanavaviestit digitaalisesti"
 
-#: src/protocols/silc/silc.c:930
+#: src/protocols/silc/silc.c:1237
 msgid "Verify all channel message signatures"
 msgstr "Tarkista kaikki kanavan viesti-allekirjoitukset"
 
-#: src/protocols/silc/silc.c:933
+#: src/protocols/silc/silc.c:1240
 msgid "Default SILC Key Pair"
 msgstr "Oletus SILC avainpari"
 
-#: src/protocols/silc/silc.c:938
+#: src/protocols/silc/silc.c:1245
 msgid "SILC Public Key"
 msgstr "SILC julkinen avain"
 
-#: src/protocols/silc/silc.c:943
+#: src/protocols/silc/silc.c:1250
 msgid "SILC Private Key"
 msgstr "SILC Yksityinen avain"
 
@@ -9209,175 +9547,216 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1026
+#: src/protocols/silc/silc.c:1334
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokollaplugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1028
+#: src/protocols/silc/silc.c:1336
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokolla"
 
-#: src/protocols/silc/silc.c:1058
+#: src/protocols/silc/silc.c:1366
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: src/protocols/silc/silc.c:1064
+#: src/protocols/silc/silc.c:1372
 msgid "Public Key File"
 msgstr "Julkinen avaintiedosto"
 
-#: src/protocols/silc/silc.c:1068
+#: src/protocols/silc/silc.c:1376
 msgid "Private Key File"
 msgstr "Yksityinen avaintiedosto"
 
-#: src/protocols/silc/silc.c:1073
+#: src/protocols/silc/silc.c:1381
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: src/protocols/silc/silc.c:1076
+#: src/protocols/silc/silc.c:1384
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: src/protocols/silc/silc.c:1079
+#: src/protocols/silc/silc.c:1387
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: src/protocols/silc/silc.c:1082
+#: src/protocols/silc/silc.c:1390
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolo-tilan atribuuttipyynnöt"
 
-#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari"
 
-#: src/protocols/silc/util.c:277
-msgid "Real Name"
-msgstr "Oikea nimi"
-
-#: src/protocols/silc/util.c:279
-msgid "User Name"
-msgstr "Käyttäjänimi"
-
-#: src/protocols/silc/util.c:283
-msgid "Host Name"
-msgstr "Isäntänimi"
-
-#: src/protocols/silc/util.c:288
-msgid "Algorithm"
-msgstr "Algoritmi"
-
+#. 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
-msgid "Key Length"
-msgstr "Avaimen pituus"
-
-#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "Oikea nimi: \t%s\n"
+
+#: src/protocols/silc/util.c:291
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "Käyttäjänimi: \t%s\n"
+
+#: src/protocols/silc/util.c:293
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr "Sähköposti: \t\t%s\n"
+
+#: src/protocols/silc/util.c:295
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "Etunimi: \t%s\n"
+
+#: src/protocols/silc/util.c:297
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "Organisaatio: \t%s\n"
+
+#: src/protocols/silc/util.c:299
+#, 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"
+msgstr "Algoritmi: \t\t%s\n"
+
+#: src/protocols/silc/util.c:301
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "Avaimen pituus: \t%d bits\n"
+
+#: src/protocols/silc/util.c:303
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr "Julkisen avaimen Fingerprint:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/util.c:304
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr "Julkisen avaimen Babbleprint\n"
+"%s"
+
+#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: src/protocols/toc/toc.c:166
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "Etsitään %s"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Viesti on liian pitkä, viimeiset %s tavua katkaistu."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ei ole parhaillaan kirjautuneena sisään."
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s:n varoittaminen ei ole sallittua."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s: Chat ei ole käytettävissä."
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Lähetät viestejä %s:lle liian nopeasti."
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Epäonnistuminen."
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Liian monta tulosta."
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lisää määritteitä."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei välitetty."
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "Käyttäjällä ei ole hakemistotietoja."
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "Maata ei tuettu."
 
-#: src/protocols/toc/toc.c:567
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tunnistamaton epäonnistuminen: %s."
 
-#: src/protocols/toc/toc.c:573
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
 
-#: src/protocols/toc/toc.c:579
+#: src/protocols/toc/toc.c:550
 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."
@@ -9386,37 +9765,37 @@
 "ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: src/protocols/toc/toc.c:581
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
-#: src/protocols/toc/toc.c:604
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "Yhteys suljettu"
 
-#: src/protocols/toc/toc.c:644
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/toc/toc.c:714
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
 
-#: src/protocols/toc/toc.c:902
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC on lähettänyt PAUSE-komennon."
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:895
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -9426,45 +9805,45 @@
 "voi potkaista sinut ulos jos lähetät viestin. Gaim estää kaiken läpimenon. "
 "Tämä on vain väliaikaista, ole kärsivällinen."
 
-#: src/protocols/toc/toc.c:1417
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1553
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "Aseta hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1675
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#: src/protocols/toc/toc.c:1711
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
-#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
-#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa."
 
-#: src/protocols/toc/toc.c:1953
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
 
-#: src/protocols/toc/toc.c:2053
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimellä..."
 
-#: src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
 msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2094
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
@@ -9480,15 +9859,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
+#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: src/protocols/toc/toc.c:2195
+#: src/protocols/toc/toc.c:2188
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: src/protocols/toc/toc.c:2199
+#: src/protocols/toc/toc.c:2192
 msgid "TOC port"
 msgstr "TOC-portti"
 
@@ -9540,7 +9919,7 @@
 #. Call the dialog.
 #: src/protocols/trepia/trepia.c:344
 msgid "Set your Trepia profile data."
-msgstr "Aseta trepia-profiilitietosi."
+msgstr "Aseta Trepia-profiilitietosi."
 
 #: src/protocols/trepia/trepia.c:424
 msgid "Profile"
@@ -9573,11 +9952,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokollaliitännäinen"
 
-#: src/protocols/yahoo/yahoo.c:307
+#: src/protocols/yahoo/yahoo.c:328
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -9585,27 +9964,27 @@
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta tai "
 "laitteesta."
 
-#: src/protocols/yahoo/yahoo.c:749
+#: src/protocols/yahoo/yahoo.c:798
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: src/protocols/yahoo/yahoo.c:767
+#: src/protocols/yahoo/yahoo.c:817
 msgid "Buzz!!"
 msgstr "Huomio!!"
 
-#: src/protocols/yahoo/yahoo.c:802
+#: src/protocols/yahoo/yahoo.c:860
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! järjestelmäviesti käyttäjälle %s:"
 
-#: src/protocols/yahoo/yahoo.c:868
+#: src/protocols/yahoo/yahoo.c:926
 #, 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:871
+#: src/protocols/yahoo/yahoo.c:929
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9614,11 +9993,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: src/protocols/yahoo/yahoo.c:874
+#: src/protocols/yahoo/yahoo.c:932
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: src/protocols/yahoo/yahoo.c:1601
+#: src/protocols/yahoo/yahoo.c:1688
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9630,11 +10009,11 @@
 "päivitykset osoitteesta: %s."
 
 # NOTE edit of "Authentication failed"
-#: src/protocols/yahoo/yahoo.c:1604
+#: src/protocols/yahoo/yahoo.c:1691
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: src/protocols/yahoo/yahoo.c:1677
+#: src/protocols/yahoo/yahoo.c:1763
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9644,77 +10023,77 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: src/protocols/yahoo/yahoo.c:1680
+#: src/protocols/yahoo/yahoo.c:1766
 msgid "Ignore buddy?"
 msgstr "Älä välitä?"
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1799
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: src/protocols/yahoo/yahoo.c:1716
+#: src/protocols/yahoo/yahoo.c:1802
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: src/protocols/yahoo/yahoo.c:1719
-msgid "Your account is locked, please log in to the yahoo website."
+#: src/protocols/yahoo/yahoo.c:1805
+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:1722
-#, c-format
-msgid "Unknown error number %d."
-msgstr "Tuntematon virhekoodi %d."
-
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1808
+#, 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
 #, 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:1781
+#: src/protocols/yahoo/yahoo.c:1864
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
-#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: 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
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
-#: src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
-#: src/protocols/yahoo/yahoo.c:2775
+#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
-#: src/protocols/yahoo/yahoo.c:2776
+#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
-#: src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
-#: src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: src/protocols/yahoo/yahoo.c:2426
+#: src/protocols/yahoo/yahoo.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -9723,83 +10102,30 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2682
 msgid "Join in Chat"
 msgstr "Liity chattiin"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2686
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: src/protocols/yahoo/yahoo.c:2562
+#: src/protocols/yahoo/yahoo.c:2743
 msgid "Active which ID?"
 msgstr "Minkä ID:n haluat aktivoida"
 
-#: src/protocols/yahoo/yahoo.c:2571
+#: src/protocols/yahoo/yahoo.c:2752
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään chatissä?"
 
-#: src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/yahoo/yahoo.c:2762
 msgid "Activate ID..."
 msgstr "Aktivoi ID..."
 
-#: src/protocols/yahoo/yahoo.c:2585
+#: src/protocols/yahoo/yahoo.c:2766
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan chattiin......"
 
-#: src/protocols/yahoo/yahoo.c:2973
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
-msgstr ""
-"<b>Tällä hetkellä profiileja, jotka on merkitty sisältämään aikuisviihdettä, "
-"ei tueta</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr ""
-"Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
-"selaimessasi<br>"
-
-#: src/protocols/yahoo/yahoo.c:2996
-msgid ""
-"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr ""
-"<b>Ei-englanninkieliset profiilit eivät ole tuettuja tällä hetkellä.</"
-"b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-# NOTE from msn
-#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
-#: src/protocols/yahoo/yahoo.c:3095
-msgid "Hobbies"
-msgstr "Harrastukset"
-
-#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
-msgid "Latest News"
-msgstr "Uutiset"
-
-#: src/protocols/yahoo/yahoo.c:3121
-msgid "Home Page"
-msgstr "Kotisivu"
-
-#: src/protocols/yahoo/yahoo.c:3133
-msgid "Cool Link 1"
-msgstr "Linkki 1"
-
-#: src/protocols/yahoo/yahoo.c:3137
-msgid "Cool Link 2"
-msgstr "Linkki 2"
-
-#: src/protocols/yahoo/yahoo.c:3139
-msgid "Cool Link 3"
-msgstr "Linkki 3"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -9811,34 +10137,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
+#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokollaliitännäinen"
 
+#: src/protocols/yahoo/yahoo.c:3307
+msgid "Yahoo Japan"
+msgstr "Yahoo Japan"
+
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3310
 msgid "Pager host"
 msgstr "Isäntä"
 
 # XXX dropped "Pager" from the translation, it's not needed in the context
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3313
+msgid "Japan Pager host"
+msgstr "Isäntä (Japani)"
+
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager port"
 msgstr "Portti"
 
-# NOTE source: gnomeicu
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3319
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3322
+msgid "Japan File transfer host"
+msgstr "Tiedostosiirtopalvelin (Japani)"
+
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3328
 msgid "Chat Room List Url"
 msgstr "Chathuonelista Url"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
@@ -9846,6 +10183,68 @@
 "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
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP-osoite:</b> %s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:779
+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
+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
+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
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -9863,73 +10262,73 @@
 msgid "Maybe the room is full?"
 msgstr "Ehkä huone on täynnä?"
 
-#: src/protocols/yahoo/yahoochat.c:426
+#: src/protocols/yahoo/yahoochat.c:424
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:578
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan chat-huoneeseen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole chatissä?"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1299
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1299
 msgid "Fetching the room list failed."
 msgstr "Huonelistan haku epäonnistui."
 
-#: src/protocols/yahoo/yahoochat.c:1346
+#: src/protocols/yahoo/yahoochat.c:1344
 msgid "Voices"
 msgstr "Äänet"
 
-#: src/protocols/yahoo/yahoochat.c:1349
+#: src/protocols/yahoo/yahoochat.c:1347
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
 msgid "Unable to fetch room list."
 msgstr "Huonelistaa ei voida hakea."
 
-#: src/protocols/yahoo/yahoochat.c:1414
+#: src/protocols/yahoo/yahoochat.c:1412
 msgid "User Rooms"
 msgstr "Käyttäjän Huoneet"
 
-#: src/protocols/zephyr/zephyr.c:558
+#: src/protocols/zephyr/zephyr.c:566
+#, 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
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:560
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:562
+#: src/protocols/zephyr/zephyr.c:604
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
 # TODO
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:608
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
 # Context unclear.
-#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
+#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: src/protocols/zephyr/zephyr.c:859
+#: src/protocols/zephyr/zephyr.c:900
 msgid "Already logged in with Zephyr"
 msgstr "Zephyriin jo kirjauduttu"
 
-#: src/protocols/zephyr/zephyr.c:859
+#: src/protocols/zephyr/zephyr.c:900
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -9937,15 +10336,15 @@
 "Koska Zephyr käyttää järjestelmäsi käyttäjänimeä, et voi käyttää kuin yhtä "
 "tiliä."
 
-#: src/protocols/zephyr/zephyr.c:1191
+#: src/protocols/zephyr/zephyr.c:1232
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:1197
+#: src/protocols/zephyr/zephyr.c:1238
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:1203
+#: src/protocols/zephyr/zephyr.c:1244
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
@@ -9960,40 +10359,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
+#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
-#: src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1433
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1436
 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:1380
+#: src/protocols/zephyr/zephyr.c:1439
 msgid "Exposure"
 msgstr "Altistus"
 
+#. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:853
+#: src/proxy.c:845
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Pääsy evätty: proxy-palvelin estää portin %d tunneloinnin."
 
-#: src/proxy.c:857
+#: src/proxy.c:849
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy-yhteysvirhe %d"
 
 # XXX relatively minor editing
-#: src/proxy.c:1596
+#: src/proxy.c:1495
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välityspalvelinvalinnat"
 
-#: src/proxy.c:1596
+#: src/proxy.c:1495
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10001,7 +10401,7 @@
 "Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle. "
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:205
 msgid "Custom"
 msgstr "Oma"
 
@@ -10012,62 +10412,67 @@
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: src/server.c:60
+#: src/server.c:63
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:917
+#: src/server.c:528
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s on nyt nimeltään %s.\n"
+
+#: src/server.c:938
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d viesti)"
 msgstr[1] "(%d viestiä)"
 
-#: src/server.c:931
+#: src/server.c:952
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:1111 src/server.c:1121
+#: src/server.c:1176 src/server.c:1186
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/server.c:1134
+#: src/server.c:1199
 #, c-format
 msgid "%s signed on"
 msgstr "%s kirjautui sisään"
 
-#: src/server.c:1150
+#: src/server.c:1215
 #, c-format
 msgid "%s came back"
 msgstr "%s palasi"
 
-#: src/server.c:1152
+#: src/server.c:1217
 #, c-format
 msgid "%s went away"
 msgstr "%s on poissa"
 
-#: src/server.c:1167
+#: src/server.c:1231
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: src/server.c:1181
+#: src/server.c:1243
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: src/server.c:1192 src/server.c:1200
+#: src/server.c:1254 src/server.c:1262
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/server.c:1214
+#: src/server.c:1276
 #, c-format
 msgid "%s signed off"
 msgstr "%s on kirjautui ulos"
 
-#: src/server.c:1264
+#: src/server.c:1338
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10076,11 +10481,11 @@
 "Tiliä %s on juuri varoittanut %s.\n"
 "Uusi varoitustasosi on %d%%"
 
-#: src/server.c:1267
+#: src/server.c:1341
 msgid "an anonymous person"
 msgstr "nimetön käyttäjä"
 
-#: src/server.c:1377
+#: src/server.c:1451
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10089,12 +10494,12 @@
 "Käyttäjä '%s' kutsuu %s:n chattiin '%s'\n"
 "%s"
 
-#: src/server.c:1381
+#: src/server.c:1455
 #, 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:1387
+#: src/server.c:1461
 msgid "Accept chat invitation?"
 msgstr "Hyväksy kutsu?"
 
@@ -10122,54 +10527,201 @@
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: src/util.c:2132
+#: src/util.c:2363
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: src/util.c:2135
+#: src/util.c:2366
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
+#: src/util.c:2399
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
+#: src/util.c:2407
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
+#: src/util.c:2415
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: src/util.c:2527
+#: src/util.c:2824
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
-#: src/win32/win32dep.c:272
+#: src/win32/win32dep.c:273
 msgid "Moving Gaim Settings.."
 msgstr "Siirretään Gaimin asetuksia..."
 
-#: src/win32/win32dep.c:275
+#: src/win32/win32dep.c:276
 msgid "Moving Gaim user settings to: "
 msgstr "Siirretään Gaimin asetuksia:"
 
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "Ilmoitus"
 
+#~ msgid "Buddy icon file:"
+#~ msgstr "Tuttavakuvaketiedosto:"
+
+#~ msgid "_Browse"
+#~ msgstr "_Selaa"
+
+#~ msgid "_Reset"
+#~ msgstr "_Nollaa"
+
+# NOTE difference from above from 0.59.8/0.60
+#~ msgid "Show IMs and chats in _same tabbed window"
+#~ msgstr "Näytä pikaviestit ja ryhmäkeskustelut _samassa jaetussa ikkunassa"
+
+#~ msgid "Window"
+#~ msgstr "Ikkuna"
+
+#~ msgid "Buddy Icons"
+#~ msgstr "Tuttavakuvakkeet"
+
+#~ msgid "Typing Notification"
+#~ msgstr "Kirjoitusilmoitus"
+
+#~ msgid "Co_lorize screen names"
+#~ msgstr "_Väritä näyttönimet"
+
+#~ msgid "Proxy Type"
+#~ msgstr "Välityspalvelimen tyyppi"
+
+#~ msgid "IMs"
+#~ msgstr "Pikaviestit"
+
+#~ msgid "Proxy"
+#~ msgstr "Välityspalvelin"
+
+#~ msgid "Protocols"
+#~ msgstr "Protokollat"
+
+#~ msgid ""
+#~ "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
+#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
+#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+#~ msgstr ""
+#~ "<B>Tuetut IRC-komennot:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
+#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
+#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+
+#~ msgid ""
+#~ "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
+#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+#~ msgstr ""
+#~ "<B>Tuetut IRC-komennot:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
+#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+
+#~ msgid "Unable to request USR\n"
+#~ msgstr "Ei kyetty pyytämään USR:ä\n"
+
+#~ msgid "Unable to login using MD5"
+#~ msgstr "Ei kyetty kirjautumaan sisään MD5:llä"
+
+#~ msgid "Unable to send USR"
+#~ msgstr "USR:ää ei voitu lähettää"
+
+# XXX I declined "Protokolla" and "versio", either could be wrong
+#~ msgid "Protocol version not supported"
+#~ msgstr "Protokollan versiota ei tuettu"
+
+#~ msgid "Unable to request CVR\n"
+#~ msgstr "Ei kyetty pyytämään CVR:ä\n"
+
+#~ msgid "Unable to request INF\n"
+#~ msgstr "Ei kyetty pyytämään INF:iä\n"
+
+# XXX
+#~ msgid "Got invalid XFR"
+#~ msgstr "Epäkelpo XFR vastaanotettu"
+
+#~ msgid "Unable to transfer"
+#~ msgstr "Siirto ei onnistunut"
+
+#~ msgid "Unable to parse message."
+#~ msgstr "Viestin käsittely epäonnistui"
+
+#~ msgid "Unable to write to server"
+#~ msgstr "Palvelimelle ei kyetty kirjoittamaan"
+
+#~ msgid ""
+#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+#~ "meant %s@hotmail.com. No changes were made to your allow list."
+#~ msgstr ""
+#~ "MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit "
+#~ "%s@hotmail.com. Muutoksia sallitut-listaan ei tehty."
+
+# XXX
+#~ msgid "Invalid MSN screen name"
+#~ msgstr "Epäkelpo MSN-näyttönimi"
+
+#~ msgid ""
+#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+#~ "meant %s@hotmail.com. No changes were made to your block list."
+#~ msgstr ""
+#~ "MSN-näyttönimen tulee olla muodossa \"user@server.com\". Ehkäpä tarkoitit "
+#~ "%s@hotmail.com. Muutoksia kielletyt-listalle ei tehty."
+
+#~ msgid "<html><body><b>Error retrieving profile</b></body></html>"
+#~ msgstr "<html><body><b>Virhe haettaessa profiilia</b></body></html>"
+
+#~ msgid "Unable to write to MSN Nexus server."
+#~ msgstr "MSN:n Nexus-palvelimelle ei kyetty kirjoittamaan."
+
+#~ msgid "MSN Nexus server returned invalid redirect information."
+#~ msgstr "MSN Nexus-palvelin palautti virheellistä edelleenohjaustietoa."
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protokollaa ei tuettu"
+
+#~ msgid "The user %s (%s) wants to add you to their buddy list."
+#~ msgstr "Käyttäjä %s (%s) haluaa lisätä sinut tuttavalistalleen."
+
+#~ msgid ""
+#~ "Your MSN buddy list for %s is temporarily unavailable. Please wait and "
+#~ "try again."
+#~ msgstr ""
+#~ "MSN-tuttavalista käyttäjälle %s ei ole juuri nyt saatavilla. Ole hyvä, "
+#~ "odota ja yritä uudelleen."
+
+#~ msgid "Unable to transfer to notification server"
+#~ msgstr "Tiedonsiirto ei onnistunut ilmoituspalvelimelle"
+
+#~ msgid ""
+#~ "Error reading from %s server. Lastcommand was:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Virhe luettaessa %s palvelimelta. Edellinen komento oli:\n"
+#~ "%s"
+
+#~ msgid "An MSN message may not have been received."
+#~ msgstr "MSN-viestiä ei ehkä ole otettu vastaan."
+
+#~ msgid "Real Name"
+#~ msgstr "Oikea nimi"
+
+#~ msgid "User Name"
+#~ msgstr "Käyttäjänimi"
+
+#~ msgid "Host Name"
+#~ msgstr "Isäntänimi"
+
+#~ msgid "Unknown error number %d."
+#~ msgstr "Tuntematon virhekoodi %d."
+
 #~ msgid "Full Name:\t\t%s\n"
 #~ msgstr "Koko nimi:              %s\n"
 
-#~ msgid "First Name:\t%s\n"
-#~ msgstr "Etunimi:        %s\n"
-
 #~ msgid "Middle Names:\t%s\n"
 #~ msgstr "Muut etunimet:  %s\n"
 
@@ -10194,9 +10746,6 @@
 #~ msgid "Tel:\t\t\t%s\n"
 #~ msgstr "Puhelin:                       %s\n"
 
-#~ msgid "EMail:\t\t%s\n"
-#~ msgstr "Sähköposti:             %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Note:\t\t%s\n"
@@ -10204,12 +10753,6 @@
 #~ "\n"
 #~ "Huom:           %s\n"
 
-#~ msgid "Real Name:\t%s\n"
-#~ msgstr "Oikea nimi:     %s\n"
-
-#~ msgid "Username:\t\t%s\n"
-#~ msgstr "Käyttäjänimi:           %s\n"
-
 #~ msgid "Server:\t\t%s\n"
 #~ msgstr "Palvelin:               %s\n"
 
@@ -10391,9 +10934,6 @@
 #~ msgid "Invalid User"
 #~ msgstr "Epäkelpo käyttäjä"
 
-#~ msgid "<b>IP Address:</b> "
-#~ msgstr "<b>IP-osoite:</b> "
-
 #~ msgid "<b>Capabilities:</b> "
 #~ msgstr "<b>Kyvyt:</b> "
 
@@ -10761,9 +11301,6 @@
 #~ msgid "Jabber Error %s"
 #~ msgstr "Jabber-virhe %s"
 
-#~ msgid "Error %s: %s"
-#~ msgstr "Virhe %s: %s"
-
 #~ msgid "No such user."
 #~ msgstr "Käyttäjää ei ole olemassa."
 
@@ -10907,9 +11444,6 @@
 #~ msgid "Refresh"
 #~ msgstr "Päivitä"
 
-#~ msgid "List of available chats"
-#~ msgstr "Saatavilla olevien ryhmäkeskustelujen lista"
-
 #~ msgid "List of subscribed chats"
 #~ msgstr "Tilattujen ryhmäkeskustelujen lista"
 
@@ -11496,10 +12030,6 @@
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "Kaikki muutokset tapahtuvat välittömästi ellei muuta ole mainittu."
 
-# src/prefs.c:111
-#~ msgid "Miscellaneous"
-#~ msgstr "Sekalaiset"
-
 #~ msgid "GNOME URL Handler"
 #~ msgstr "Gnomen URL-käsittelijä"