diff po/fi.po @ 13734:760528340ee3

[gaim-migrate @ 16145] a gaggle of translation updates and such committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 07 May 2006 19:50:27 +0000
parents cfc2f7fcb3dd
children 98e65e6a5c32
line wrap: on
line diff
--- a/po/fi.po	Sun May 07 19:45:02 2006 +0000
+++ b/po/fi.po	Sun May 07 19:50:27 2006 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-14 19:15+0200\n"
-"PO-Revision-Date: 2006-03-14 19:16+0200\n"
+"POT-Creation-Date: 2006-04-18 20:07+0300\n"
+"PO-Revision-Date: 2006-04-18 20:16+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@
 msgstr "Piirteiden tarkistus"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2253
 #: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Käytössä"
@@ -173,7 +173,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:152
 msgid "DBus"
 msgstr "DBus"
 
@@ -181,7 +181,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
 msgid "DBus Plugin Example"
 msgstr "DBus-esimerkkiliitännäinen"
 
@@ -189,7 +189,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Näytä lisää viestejä hiiren oikealla painikkeella...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3230
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -201,35 +201,39 @@
 msgstr "Vaihda tila"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../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:2845
-#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1101
+#: ../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:2845 ../src/protocols/yahoo/yahoo.c:2735
+#: ../src/status.c:155
 msgid "Available"
 msgstr "Tavoitettavissa"
 
 #. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6836 ../src/protocols/oscar/oscar.c:7879
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
+#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
+#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1105 ../src/protocols/novell/novell.c:2848
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4390
+#: ../src/protocols/oscar/oscar.c:5431 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3189 ../src/protocols/yahoo/yahoo.c:3262
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Poissa"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
-#: ../src/status.c:154
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2960
+#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/novell/novell.c:2857
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5403
+#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:154
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
@@ -245,7 +249,7 @@
 msgid "Show Buddy List"
 msgstr "Näytä tuttavalista"
 
-#: ../plugins/docklet/docklet.c:489
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
@@ -253,7 +257,7 @@
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2469
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
@@ -597,10 +601,14 @@
 "Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1534
+#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1606
 msgid "Name"
 msgstr "Nimi"
 
@@ -616,14 +624,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8399
-#: ../src/protocols/sametime/sametime.c:5532
+#: ../src/protocols/jabber/buddy.c:1457 ../src/protocols/oscar/oscar.c:6011
+#: ../src/protocols/sametime/sametime.c:5531
 msgid "Search"
 msgstr "Etsi"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4615
-#: ../src/gtkblist.c:4979
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4610
+#: ../src/gtkblist.c:4974
 msgid "Group:"
 msgstr "Ryhmä:"
 
@@ -664,7 +672,7 @@
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
 #: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4424 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4419 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Tuttavat"
 
@@ -700,7 +708,7 @@
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
+#: ../plugins/idle.c:183 ../src/gtknotify.c:399 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "Tili"
 
@@ -736,6 +744,7 @@
 msgstr "Käyttäjätilin tyyppi:"
 
 #: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4572
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
@@ -746,7 +755,7 @@
 
 #. Label
 #: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
@@ -1134,7 +1143,7 @@
 msgstr "_Ryhmäkeskusteluikkunoille"
 
 #: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
+msgid "\t_Only when someone says your screen name"
 msgstr "\t_Vain kun joku sanoo kutsumanimesi"
 
 #: ../plugins/notify.c:667
@@ -1755,7 +1764,7 @@
 msgstr "_Käynnistä Gaim Windowsin käynnistyessä."
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3668
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3663
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1820,59 +1829,62 @@
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3552
-#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
-#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3546
+#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:801
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
 #: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8130
-#: ../src/protocols/oscar/oscar.c:8253 ../src/protocols/oscar/oscar.c:8278
-#: ../src/protocols/oscar/oscar.c:8330 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:1409 ../src/protocols/oscar/oscar.c:2166
+#: ../src/protocols/oscar/oscar.c:2259 ../src/protocols/oscar/oscar.c:5681
+#: ../src/protocols/oscar/oscar.c:5861 ../src/protocols/oscar/oscar.c:5886
+#: ../src/protocols/oscar/oscar.c:5942 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
 #: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
 #: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/yahoo/yahoo.c:3072 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5020
-#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkaccount.c:2173 ../src/gtkaccount.c:2640 ../src/gtkblist.c:5015
+#: ../src/gtkdialogs.c:601 ../src/gtkdialogs.c:738 ../src/gtkdialogs.c:802
+#: ../src/gtkdialogs.c:821 ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:863
+#: ../src/gtkdialogs.c:907 ../src/gtkdialogs.c:962 ../src/gtkdialogs.c:999
+#: ../src/gtkdialogs.c:1024 ../src/gtkimhtmltoolbar.c:419
 #: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:811
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1458
+#: ../src/protocols/jabber/buddy.c:1492 ../src/protocols/jabber/chat.c:780
 #: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8131 ../src/protocols/oscar/oscar.c:8254
-#: ../src/protocols/oscar/oscar.c:8279 ../src/protocols/oscar/oscar.c:8331
-#: ../src/protocols/oscar/oscar.c:8400
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:1410 ../src/protocols/oscar/oscar.c:2167
+#: ../src/protocols/oscar/oscar.c:2208 ../src/protocols/oscar/oscar.c:2260
+#: ../src/protocols/oscar/oscar.c:5682 ../src/protocols/oscar/oscar.c:5734
+#: ../src/protocols/oscar/oscar.c:5862 ../src/protocols/oscar/oscar.c:5887
+#: ../src/protocols/oscar/oscar.c:5943 ../src/protocols/oscar/oscar.c:6012
+#: ../src/protocols/sametime/sametime.c:3375
+#: ../src/protocols/sametime/sametime.c:3460
+#: ../src/protocols/sametime/sametime.c:3630
+#: ../src/protocols/sametime/sametime.c:5319
+#: ../src/protocols/sametime/sametime.c:5408
+#: ../src/protocols/sametime/sametime.c:5532 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
 #: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073
+#: ../src/protocols/yahoo/yahoo.c:3073 ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Peru"
 
@@ -1881,12 +1893,12 @@
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3544
-#: ../src/gtkblist.c:3550
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3538
+#: ../src/gtkblist.c:3544
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:696
 #: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
@@ -1926,7 +1938,7 @@
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/account.c:1679 ../src/gtkft.c:157
+#: ../src/account.c:1679 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
 #: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
 #: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
@@ -2097,55 +2109,55 @@
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../src/ft.c:442
+#: ../src/ft.c:443
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../src/ft.c:463
+#: ../src/ft.c:464
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
 
-#: ../src/ft.c:474
+#: ../src/ft.c:476
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
-#: ../src/ft.c:628
+#: ../src/ft.c:630
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../src/ft.c:631
+#: ../src/ft.c:633
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../src/ft.c:1022
+#: ../src/ft.c:1028
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../src/ft.c:1027
+#: ../src/ft.c:1033
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
-#: ../src/ft.c:1084
+#: ../src/ft.c:1091
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../src/ft.c:1089
+#: ../src/ft.c:1096
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostonsiirron"
 
-#: ../src/ft.c:1146
+#: ../src/ft.c:1153
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
 
-#: ../src/ft.c:1148
+#: ../src/ft.c:1155
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
@@ -2166,7 +2178,7 @@
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
@@ -2174,7 +2186,7 @@
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4598 ../src/gtkblist.c:4964
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4593 ../src/gtkblist.c:4959
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2257,153 +2269,153 @@
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../src/gtkaccount.c:1736
+#: ../src/gtkaccount.c:1738
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3553
+#: ../src/gtkaccount.c:1740 ../src/gtkblist.c:3547
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
-#: ../src/gtkaccount.c:1760
+#: ../src/gtkaccount.c:1762
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../src/gtkaccount.c:1771
+#: ../src/gtkaccount.c:1773
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1788 ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2167 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2172 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5252
+#: ../src/gtkaccount.c:2230 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:2822
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../src/gtkaccount.c:2259
+#: ../src/gtkaccount.c:2261
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../src/gtkaccount.c:2586
+#: ../src/gtkaccount.c:2588
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../src/gtkaccount.c:2635
+#: ../src/gtkaccount.c:2637
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5019 ../src/gtkconv.c:1625
-#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:810
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
+#: ../src/gtkaccount.c:2639 ../src/gtkblist.c:5014 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
+#: ../src/protocols/oscar/oscar.c:2452
+#: ../src/protocols/sametime/sametime.c:5407 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/gtkblist.c:672
+#: ../src/gtkblist.c:664
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/gtkblist.c:693
+#: ../src/gtkblist.c:685
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../src/gtkblist.c:704 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:696 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../src/gtkblist.c:948
+#: ../src/gtkblist.c:940
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../src/gtkblist.c:951 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:943 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../src/gtkblist.c:957
+#: ../src/gtkblist.c:949
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../src/gtkblist.c:964
+#: ../src/gtkblist.c:956
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../src/gtkblist.c:968 ../src/gtkblist.c:972 ../src/gtkblist.c:1071
-#: ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:960 ../src/gtkblist.c:964 ../src/gtkblist.c:1063
+#: ../src/gtkblist.c:1086
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../src/gtkblist.c:983
+#: ../src/gtkblist.c:975
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:986 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:978 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
+#: ../src/gtkblist.c:984 ../src/gtkblist.c:1071 ../src/gtkblist.c:1092
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:994 ../src/gtkblist.c:1081 ../src/gtkblist.c:1102
+#: ../src/gtkblist.c:986 ../src/gtkblist.c:1073 ../src/gtkblist.c:1094
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/gtkblist.c:1042
+#: ../src/gtkblist.c:1034
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../src/gtkblist.c:1044
+#: ../src/gtkblist.c:1036
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:1047
+#: ../src/gtkblist.c:1039
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkblist.c:1049
+#: ../src/gtkblist.c:1041
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../src/gtkblist.c:1067 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1059 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/gtkblist.c:1069
+#: ../src/gtkblist.c:1061
 msgid "Auto-Join"
 msgstr "Kirjaudu sisään automaattisesti"
 
-#: ../src/gtkblist.c:1107 ../src/gtkblist.c:1130
+#: ../src/gtkblist.c:1099 ../src/gtkblist.c:1122
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../src/gtkblist.c:1135
+#: ../src/gtkblist.c:1127
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3813
-#: ../src/gtkblist.c:3823
+#: ../src/gtkblist.c:1373 ../src/gtkblist.c:1385 ../src/gtkblist.c:3808
+#: ../src/gtkblist.c:3818
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../src/gtkblist.c:1856 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1845 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2411,126 +2423,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2430
+#: ../src/gtkblist.c:2419
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2420
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2421
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2422
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../src/gtkblist.c:2434
+#: ../src/gtkblist.c:2423
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../src/gtkblist.c:2436
+#: ../src/gtkblist.c:2425
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:2437
+#: ../src/gtkblist.c:2426
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2427
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:2439
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../src/gtkblist.c:2440
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2438
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../src/gtkblist.c:2450 ../src/gtkblist.c:5598
+#: ../src/gtkblist.c:2439 ../src/gtkblist.c:5593
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/Muokkaa"
 
 #. Tools
-#: ../src/gtkblist.c:2453
+#: ../src/gtkblist.c:2442
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: ../src/gtkblist.c:2454
+#: ../src/gtkblist.c:2443
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2444
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2445
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2446
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../src/gtkblist.c:2459
+#: ../src/gtkblist.c:2448
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../src/gtkblist.c:2460
+#: ../src/gtkblist.c:2449
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
-#: ../src/gtkblist.c:2461
+#: ../src/gtkblist.c:2450
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2455
 msgid "/_Help"
 msgstr "/_Ohje"
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2456
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Ohjeita verkossa"
 
-#: ../src/gtkblist.c:2468
+#: ../src/gtkblist.c:2457
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2458
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../src/gtkblist.c:2501 ../src/gtkblist.c:2570
+#: ../src/gtkblist.c:2490 ../src/gtkblist.c:2559
 #, c-format
 msgid ""
 "\n"
@@ -2539,7 +2551,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../src/gtkblist.c:2582
+#: ../src/gtkblist.c:2571
 #, c-format
 msgid ""
 "\n"
@@ -2548,7 +2560,7 @@
 "\n"
 "<b>Tuttavan lempinimi:</b> %s"
 
-#: ../src/gtkblist.c:2594
+#: ../src/gtkblist.c:2583
 #, c-format
 msgid ""
 "\n"
@@ -2557,7 +2569,7 @@
 "\n"
 "<b>Kutsumanimi:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2566,7 +2578,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> %s"
 
-#: ../src/gtkblist.c:2614
+#: ../src/gtkblist.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -2575,7 +2587,7 @@
 "\n"
 "<b>Jouten:</b> %s"
 
-#: ../src/gtkblist.c:2649
+#: ../src/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -2584,7 +2596,7 @@
 "\n"
 "<b>Viimeksi nähty:</b> %s sitten"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2647
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2592,7 +2604,7 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: ../src/gtkblist.c:2669
+#: ../src/gtkblist.c:2658
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2600,7 +2612,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: ../src/gtkblist.c:2671
+#: ../src/gtkblist.c:2660
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2608,7 +2620,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: ../src/gtkblist.c:2673
+#: ../src/gtkblist.c:2662
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2616,125 +2628,125 @@
 "\n"
 "<b>Tila</b>: Rokkaava"
 
-#: ../src/gtkblist.c:2962
+#: ../src/gtkblist.c:2951
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../src/gtkblist.c:2964
+#: ../src/gtkblist.c:2953
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2956 ../src/gtkprefs.c:1745
 #: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/protocols/oscar/oscar.c:2843 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../src/gtkblist.c:3099
+#: ../src/gtkblist.c:3088
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
+#: ../src/gtkblist.c:3089 ../src/gtkblist.c:3122
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:3101
+#: ../src/gtkblist.c:3090
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../src/gtkblist.c:3102
+#: ../src/gtkblist.c:3091
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
+#: ../src/gtkblist.c:3092 ../src/gtkblist.c:3125
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:3104
+#: ../src/gtkblist.c:3093
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../src/gtkblist.c:3139
+#: ../src/gtkblist.c:3128
 msgid "/Tools/Buddy Pounces"
 msgstr "/Työkalut/Tuttavailmoittimet"
 
-#: ../src/gtkblist.c:3142
+#: ../src/gtkblist.c:3131
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../src/gtkblist.c:3145
+#: ../src/gtkblist.c:3134
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../src/gtkblist.c:3339
+#: ../src/gtkblist.c:3328
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../src/gtkblist.c:3341
+#: ../src/gtkblist.c:3330
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../src/gtkblist.c:3342
+#: ../src/gtkblist.c:3331
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../src/gtkblist.c:3343
+#: ../src/gtkblist.c:3332
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../src/gtkblist.c:3538 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3532 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../src/gtkblist.c:3554 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3548 ../src/protocols/sametime/sametime.c:3629
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/gtkblist.c:3554 ../src/gtkblist.c:5697
-msgid "Enable Account"
-msgstr "Ota tili käyttöön"
-
-#: ../src/gtkblist.c:3575
+#: ../src/gtkblist.c:3548
+msgid "Re-enable Account"
+msgstr "Ota tili uudelleen käyttöön"
+
+#: ../src/gtkblist.c:3570
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../src/gtkblist.c:3702
+#: ../src/gtkblist.c:3697
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3807
+#: ../src/gtkblist.c:3802
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3805
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:3816
+#: ../src/gtkblist.c:3811
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:3819
+#: ../src/gtkblist.c:3814
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../src/gtkblist.c:4531 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4526 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
 #: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4550
 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. "
@@ -2744,20 +2756,16 @@
 "myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 "aina kuin mahdollista.\n"
 
-#: ../src/gtkblist.c:4577
-msgid "Screen Name:"
-msgstr "Näyttönimi:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4625 ../src/gtkblist.c:4944
+#: ../src/gtkblist.c:4620 ../src/gtkblist.c:4939
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../src/gtkblist.c:4877
+#: ../src/gtkblist.c:4872
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../src/gtkblist.c:4893
+#: ../src/gtkblist.c:4888
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2765,11 +2773,11 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../src/gtkblist.c:4910
+#: ../src/gtkblist.c:4905
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:4934
+#: ../src/gtkblist.c:4929
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2777,32 +2785,36 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../src/gtkblist.c:5016 ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/gtkblist.c:5011 ../src/protocols/sametime/sametime.c:5318
+#: ../src/protocols/sametime/sametime.c:5405
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../src/gtkblist.c:5017
+#: ../src/gtkblist.c:5012
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../src/gtkblist.c:5638
+#: ../src/gtkblist.c:5633
 msgid "_Edit Account"
 msgstr "_Muokaa käyttäjätiliä"
 
-#: ../src/gtkblist.c:5671 ../src/gtkblist.c:5677
+#: ../src/gtkblist.c:5666 ../src/gtkblist.c:5672
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../src/gtkblist.c:5685
+#: ../src/gtkblist.c:5680
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../src/gtkblist.c:5750
+#: ../src/gtkblist.c:5692
+msgid "Enable Account"
+msgstr "Ota tili käyttöön"
+
+#: ../src/gtkblist.c:5745
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../src/gtkblist.c:5836
+#: ../src/gtkblist.c:5831
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -2890,7 +2902,7 @@
 msgstr "_Viesti:"
 
 #: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
@@ -2927,7 +2939,7 @@
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
@@ -3146,7 +3158,7 @@
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3571
 msgid "Topic:"
 msgstr "Aihe:"
 
@@ -3174,7 +3186,23 @@
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../src/gtkconv.c:6540
+#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "Kirjoittaa"
+
+#: ../src/gtkconv.c:5630
+msgid "Stopped Typing"
+msgstr "Lopetti kirjoittamisen"
+
+#: ../src/gtkconv.c:5635
+msgid "Nick Said"
+msgstr "Sanoi"
+
+#: ../src/gtkconv.c:5645
+msgid "New Event"
+msgstr "Uusi tapahtuma"
+
+#: ../src/gtkconv.c:6547
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3182,73 +3210,73 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../src/gtkconv.c:6543
+#: ../src/gtkconv.c:6550
 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 "
 "keskusteluun."
 
-#: ../src/gtkconv.c:6546
+#: ../src/gtkconv.c:6553
 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:6549
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../src/gtkconv.c:6552
+#: ../src/gtkconv.c:6559
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../src/gtkconv.c:6711
+#: ../src/gtkconv.c:6718
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../src/gtkconv.c:6743
+#: ../src/gtkconv.c:6750
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../src/gtkconv.c:7265
+#: ../src/gtkconv.c:7272
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../src/gtkconv.c:7271
+#: ../src/gtkconv.c:7278
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../src/gtkconv.c:7279
+#: ../src/gtkconv.c:7286
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../src/gtkconv.c:7285
+#: ../src/gtkconv.c:7292
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../src/gtkconv.c:7547
+#: ../src/gtkconv.c:7554
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../src/gtkconv.c:8011
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../src/gtkconv.c:8013
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../src/gtkconv.c:8015 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../src/gtkconv.c:8017
+#: ../src/gtkconv.c:8024
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../src/gtkconv.c:8019
+#: ../src/gtkconv.c:8026
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -3332,7 +3360,7 @@
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:168
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -3344,182 +3372,186 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:115
+msgid "Valencian"
+msgstr "valencia"
+
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:171
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:117
 msgid "Danish"
 msgstr "tanska"
 
-#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:172
 msgid "German"
 msgstr "saksa"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:122
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:123
 msgid "Canadian English"
 msgstr "kanadan englanti"
 
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:124
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127
 msgid "Persian"
 msgstr "persia"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
-#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "French"
 msgstr "ranska"
 
-#: ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:130
+msgid "Galician"
+msgstr "galego"
+
+#: ../src/gtkdialogs.c:131
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../src/gtkdialogs.c:129
+#: ../src/gtkdialogs.c:132
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:133
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
 msgid "Italian"
 msgstr "italia"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:186
 msgid "Japanese"
 msgstr "japani"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:187
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:188
 msgid "Korean"
 msgstr "korea"
 
-#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:140
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:189 ../src/gtkdialogs.c:190
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../src/gtkdialogs.c:137
+#: ../src/gtkdialogs.c:142
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../src/gtkdialogs.c:138
-msgid "Dutch, Flemish"
-msgstr "hollanti, flaami"
-
-#: ../src/gtkdialogs.c:139
-msgid "Norwegian"
-msgstr "norja"
-
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:187
-msgid "Polish"
-msgstr "puola"
-
-#: ../src/gtkdialogs.c:142
-msgid "Portuguese"
-msgstr "portugali"
-
 #: ../src/gtkdialogs.c:143
-msgid "Portuguese-Brazil"
-msgstr "portugali (brasilialainen)"
+msgid "Dutch, Flemish"
+msgstr "hollanti, flaami"
 
 #: ../src/gtkdialogs.c:144
+msgid "Norwegian"
+msgstr "norja"
+
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:191
+msgid "Polish"
+msgstr "puola"
+
+#: ../src/gtkdialogs.c:147
+msgid "Portuguese"
+msgstr "portugali"
+
+#: ../src/gtkdialogs.c:148
+msgid "Portuguese-Brazil"
+msgstr "portugali (brasilialainen)"
+
+#: ../src/gtkdialogs.c:149
 msgid "Romanian"
 msgstr "romania"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:192 ../src/gtkdialogs.c:193
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:153
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:195
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:155
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:156
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:157
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../src/gtkdialogs.c:153
-msgid "Valencian"
-msgstr "valencia"
-
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:158
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:158
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:196
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:160 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:197
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:167
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../src/gtkdialogs.c:190
+#: ../src/gtkdialogs.c:194
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../src/gtkdialogs.c:234
+#: ../src/gtkdialogs.c:238
 msgid "About Gaim"
 msgstr "Tietoja Gaimista"
 
-#: ../src/gtkdialogs.c:258
+#: ../src/gtkdialogs.c:262
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3540,111 +3572,111 @@
 "osallistuneista löytyy 'COPYRIGHT'-tiedostosta. Emme anna ohjelmalle "
 "minkäänlaista takuuta.<BR><BR>"
 
-#: ../src/gtkdialogs.c:272
+#: ../src/gtkdialogs.c:276
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #wingaim palvelimella irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:275
+#: ../src/gtkdialogs.c:279
 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>"
 
-#: ../src/gtkdialogs.c:281
+#: ../src/gtkdialogs.c:285
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../src/gtkdialogs.c:296
+#: ../src/gtkdialogs.c:300
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../src/gtkdialogs.c:311
+#: ../src/gtkdialogs.c:315
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../src/gtkdialogs.c:326
+#: ../src/gtkdialogs.c:330
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:346
+#: ../src/gtkdialogs.c:350
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:364
+#: ../src/gtkdialogs.c:368
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:582 ../src/gtkdialogs.c:719 ../src/gtkdialogs.c:782
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:587 ../src/gtkdialogs.c:724 ../src/gtkdialogs.c:787
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../src/gtkdialogs.c:583
+#: ../src/gtkdialogs.c:595
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../src/gtkdialogs.c:585
+#: ../src/gtkdialogs.c:597
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:732
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkdialogs.c:722
+#: ../src/gtkdialogs.c:734
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:796
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:798
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../src/gtkdialogs.c:805
+#: ../src/gtkdialogs.c:817
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../src/gtkdialogs.c:806
+#: ../src/gtkdialogs.c:818
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
+#: ../src/gtkdialogs.c:820 ../src/gtkdialogs.c:842 ../src/gtkdialogs.c:862
 #: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:826
+#: ../src/gtkdialogs.c:838
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../src/gtkdialogs.c:828
+#: ../src/gtkdialogs.c:840
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:859
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../src/gtkdialogs.c:848
+#: ../src/gtkdialogs.c:860
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../src/gtkdialogs.c:885
+#: ../src/gtkdialogs.c:897
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3659,15 +3691,15 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:893
+#: ../src/gtkdialogs.c:905
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../src/gtkdialogs.c:894
+#: ../src/gtkdialogs.c:906
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:957
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3675,29 +3707,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:948
+#: ../src/gtkdialogs.c:960
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../src/gtkdialogs.c:949
+#: ../src/gtkdialogs.c:961
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:994
 #, 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/gtkdialogs.c:985
+#: ../src/gtkdialogs.c:997
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../src/gtkdialogs.c:986
+#: ../src/gtkdialogs.c:998
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1019
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3706,134 +3738,138 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../src/gtkdialogs.c:1010
+#: ../src/gtkdialogs.c:1022
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../src/gtkdialogs.c:1011
+#: ../src/gtkdialogs.c:1023
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
-#: ../src/gtkft.c:139
+#: ../src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
+#: ../src/gtkft.c:153
+msgid "Not started"
+msgstr "Ei aloitettu"
+
+#: ../src/gtkft.c:162 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
+#: ../src/gtkft.c:165 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
+#: ../src/gtkft.c:168 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: ../src/gtkft.c:219
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Otetaan vastaan käyttäjänä:</b>"
 
-#: ../src/gtkft.c:221
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan käyttäjältä:</b>"
 
-#: ../src/gtkft.c:225
+#: ../src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: ../src/gtkft.c:227
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Lähetetään käyttäjänä:</b>"
 
-#: ../src/gtkft.c:443
+#: ../src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "Ohjelmaa tämän tiedostotyypin avaamiseen ei ole asetettu."
 
-#: ../src/gtkft.c:448
+#: ../src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "Virhe tapahtui avattaessa tiedostoa."
 
-#: ../src/gtkft.c:485
+#: ../src/gtkft.c:487
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Virhe käynnistettäessä %s: %s"
 
-#: ../src/gtkft.c:494
+#: ../src/gtkft.c:496
 #, c-format
 msgid "Error running %s"
 msgstr "Virhe ajettaessa %s"
 
-#: ../src/gtkft.c:495
+#: ../src/gtkft.c:497
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Käsittele palautettu virhekoodi %d"
 
-#: ../src/gtkft.c:589
+#: ../src/gtkft.c:591
 msgid "Progress"
 msgstr "Valmiina"
 
-#: ../src/gtkft.c:596
+#: ../src/gtkft.c:598
 msgid "Filename"
 msgstr "Tiedoston nimi"
 
-#: ../src/gtkft.c:603
+#: ../src/gtkft.c:605
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/gtkft.c:610
+#: ../src/gtkft.c:612
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: ../src/gtkft.c:641
-msgid "Filename:"
-msgstr "Tiedostonimi:"
-
-#: ../src/gtkft.c:642
-msgid "Local File:"
-msgstr "Paikallinen tiedosto:"
-
 #: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "Tila:"
+msgid "Filename:"
+msgstr "Tiedostonimi:"
 
 #: ../src/gtkft.c:644
-msgid "Speed:"
-msgstr "Nopeus:"
+msgid "Local File:"
+msgstr "Paikallinen tiedosto:"
 
 #: ../src/gtkft.c:645
-msgid "Time Elapsed:"
-msgstr "Aikaa kulunut:"
+msgid "Status:"
+msgstr "Tila:"
 
 #: ../src/gtkft.c:646
+msgid "Speed:"
+msgstr "Nopeus:"
+
+#: ../src/gtkft.c:647
+msgid "Time Elapsed:"
+msgstr "Aikaa kulunut:"
+
+#: ../src/gtkft.c:648
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: ../src/gtkft.c:708
+#: ../src/gtkft.c:710
 msgid "File Transfers"
 msgstr "Tiedostonsiirrot"
 
-#: ../src/gtkft.c:731
+#: ../src/gtkft.c:733
 msgid "Close this window when all transfers _finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat _valmiita"
 
-#: ../src/gtkft.c:741
+#: ../src/gtkft.c:743
 msgid "C_lear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../src/gtkft.c:752
 msgid "File transfer _details"
 msgstr "Tiedostonsiirron yksityiskohdat"
 
 #. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
+#: ../src/gtkft.c:782 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: ../src/gtkft.c:790
+#: ../src/gtkft.c:792
 msgid "_Resume"
 msgstr "_Jatka"
 
@@ -3845,40 +3881,39 @@
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Poista muotoilu"
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "_Poista muotoilu"
+
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "Hyperlinkin väri"
 
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "Hyperlinkin väri"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../src/gtkimhtml.c:1333
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3888,7 +3923,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3898,7 +3933,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3909,7 +3944,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3920,11 +3955,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -4018,6 +4053,10 @@
 msgid "Background color"
 msgstr "Taustaväri"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "Poista muotoilu"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Lisää linkki"
@@ -4030,22 +4069,22 @@
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: ../src/gtklog.c:188
+#: ../src/gtklog.c:207
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Keskustelu huoneessa %s: %s</span>"
 
-#: ../src/gtklog.c:193
+#: ../src/gtklog.c:212
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 "<span size='larger' weight='bold'>Keskustelu käyttäjän %s kanssa %s</span>"
 
-#: ../src/gtklog.c:242
+#: ../src/gtklog.c:261
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:295
+#: ../src/gtklog.c:308
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4053,7 +4092,7 @@
 "Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
 "tilamuutokset järjestelmälokiin\" on asetettu."
 
-#: ../src/gtklog.c:299
+#: ../src/gtklog.c:312
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4061,41 +4100,41 @@
 "Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
 "on asetettu."
 
-#: ../src/gtklog.c:302
+#: ../src/gtklog.c:315
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
 "lokiin\" on asetettu."
 
-#: ../src/gtklog.c:306
+#: ../src/gtklog.c:319
 msgid "No logs were found"
 msgstr "Lokeja ei löytynyt"
 
-#: ../src/gtklog.c:382
+#: ../src/gtklog.c:398
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../src/gtklog.c:458
+#: ../src/gtklog.c:464
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../src/gtklog.c:466 ../src/gtklog.c:517
+#: ../src/gtklog.c:472 ../src/gtklog.c:523
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut käyttäjän %s kanssa"
 
-#: ../src/gtklog.c:542
+#: ../src/gtklog.c:548
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
-#: ../src/gtkmain.c:308
+#: ../src/gtkmain.c:307
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../src/gtkmain.c:310
+#: ../src/gtkmain.c:309
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4120,7 +4159,7 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../src/gtkmain.c:493
+#: ../src/gtkmain.c:492
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4159,34 +4198,34 @@
 "ovat osoitteessa\n"
 "%scontactinfo.php.\n"
 
-#: ../src/gtknotify.c:327
+#: ../src/gtknotify.c:329
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../src/gtknotify.c:343
+#: ../src/gtknotify.c:345
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1115
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../src/gtknotify.c:418
+#: ../src/gtknotify.c:420
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../src/gtknotify.c:427
+#: ../src/gtknotify.c:429
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../src/gtknotify.c:493
+#: ../src/gtknotify.c:495
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../src/gtknotify.c:498
+#: ../src/gtknotify.c:500
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4197,38 +4236,38 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5458
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:845 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Selainkomento <b>%s</b> on virheellinen."
-
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#: ../src/gtknotify.c:884
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Selainkomento \"%s\" on virheellinen."
+
+#: ../src/gtknotify.c:886 ../src/gtknotify.c:898 ../src/gtknotify.c:911
 #: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Virhe käynnistettäessä <b>%s</b>: %s"
+#: ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Virhe käynnistettäessä \"%s\": %s"
 
 #: ../src/gtknotify.c:1035
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
+msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
 
 #: ../src/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
@@ -4564,8 +4603,8 @@
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
-#: ../src/protocols/oscar/oscar.c:6172
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:3630
 msgid "IP Address"
 msgstr "IP-osoite"
 
@@ -4865,7 +4904,7 @@
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1850
 msgid "Network"
 msgstr "Verkko"
 
@@ -4962,10 +5001,14 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
 
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
 #: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#: ../src/request.h:1335
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -4973,6 +5016,7 @@
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: ../src/request.h:1335
 msgid "No"
 msgstr "Ei"
 
@@ -4991,7 +5035,15 @@
 
 #: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
-msgstr "Haluatko ylikirjoittaa sen?"
+msgstr "Haluatko korvata sen?"
+
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Korvaa"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Valitse uusi nimi"
 
 #: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
@@ -5001,6 +5053,10 @@
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Valitse kansio..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Lisää"
@@ -5028,26 +5084,25 @@
 msgid "Type"
 msgstr "Tyyppi"
 
-#. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1416
-#: ../src/protocols/gg/gg.c:1426 ../src/protocols/gg/gg.c:1432
-#: ../src/protocols/gg/gg.c:1441 ../src/protocols/gg/gg.c:1446
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
+#: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
 #: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
 #: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
 #: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
 #: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7801
-#: ../src/protocols/oscar/oscar.c:7816 ../src/protocols/oscar/oscar.c:7821
-#: ../src/protocols/oscar/oscar.c:8030 ../src/protocols/oscar/oscar.c:8042
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:5353
+#: ../src/protocols/oscar/oscar.c:5368 ../src/protocols/oscar/oscar.c:5373
+#: ../src/protocols/oscar/oscar.c:5581 ../src/protocols/oscar/oscar.c:5593
+#: ../src/protocols/sametime/sametime.c:3273
+#: ../src/protocols/sametime/sametime.c:3279
+#: ../src/protocols/sametime/sametime.c:3285
+#: ../src/protocols/sametime/sametime.c:3364
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/yahoo/yahoo.c:3286 ../src/protocols/yahoo/yahoo.c:3292
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Viesti"
@@ -5070,13 +5125,13 @@
 msgstr "Eriävyys"
 
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1399 ../src/protocols/gg/gg.c:1403
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2882
+#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
+#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:623
+#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/jabber.c:1153 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/novell/novell.c:2867 ../src/protocols/novell/novell.c:2871
+#: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2882
 msgid "Status"
 msgstr "Tila"
 
@@ -5140,15 +5195,15 @@
 msgstr "Muut puhuvat ryhmäkeskustelussa"
 
 #: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
-msgstr "Joku sanoo nimesi ryhmäkeskustelussa"
-
-#: ../src/gtksound.c:489
+msgid "Someone says your screen name in chat"
+msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
+
+#: ../src/gtksound.c:485
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
 
-#: ../src/gtksound.c:505
+#: ../src/gtksound.c:501
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5156,7 +5211,7 @@
 "Äänen soito ei onnistu. \"Komento\"-metodi on valittu mutta komentoa ei ole "
 "asetettu."
 
-#: ../src/gtksound.c:517
+#: ../src/gtksound.c:513
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5164,17 +5219,13 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "Kirjoittaa"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
+#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:351
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1251
+#: ../src/protocols/sametime/sametime.c:3692
+#: ../src/protocols/simple/simple.c:1606 ../src/protocols/yahoo/yahoo.c:2572
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Yhdistetään"
@@ -5286,31 +5337,39 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../src/log.c:167
+#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Tallenna tiedosto"
+
+#: ../src/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Valitse väri"
+
+#: ../src/log.c:177
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: ../src/log.c:549
+#: ../src/log.c:558
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:560
+#: ../src/log.c:569
 msgid "Plain text"
 msgstr "Teksti"
 
-#: ../src/log.c:571
+#: ../src/log.c:580
 msgid "Old Gaim"
 msgstr "Vanha Gaim"
 
-#: ../src/log.c:666
+#: ../src/log.c:675
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../src/log.c:1009
+#: ../src/log.c:1025
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1081
+#: ../src/log.c:1099
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5319,7 +5378,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1083
+#: ../src/log.c:1101
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5328,22 +5387,23 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1140 ../src/log.c:1271
+#: ../src/log.c:1159 ../src/log.c:1291
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: ../src/log.c:1152 ../src/log.c:1285
+#: ../src/log.c:1171 ../src/log.c:1305
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
 
-#: ../src/log.c:1214
+#: ../src/log.c:1233
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1382
+#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:328
+#: ../src/protocols/oscar/oscar.c:2700
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -5403,7 +5463,7 @@
 "Ei voitu luoda yhteyttä paikalliseen mDNS-palvelimeen. Onko se käynnissä?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../src/protocols/sametime/sametime.c:3250
 #, c-format
 msgid ""
 "\n"
@@ -5450,28 +5510,31 @@
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2074 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
+#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5642 ../src/protocols/silc/silc.c:1858
 msgid "Port"
 msgstr "Portti"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:970
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
-msgid "Email"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "Sähköposti"
 
+#: ../src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
+
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
 msgid "%s has closed the conversation."
@@ -5497,306 +5560,315 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+msgid "Invalid proxy settings"
+msgstr "Epäkelvot välipalvelinvalinnat"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle."
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Vastamerkkivirhe"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Ei voitu hakea vastamerkkiä.\n"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:227
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Tuttavalistasi on tyhjä, mitään ei kirjoitettu tiedostoon."
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Tiedoston avaus ei onnistunut"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Tuttavalista tallennettiin onnistuneesti!"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Tuttavalistan lataus ei onnistunut"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Avaa tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:282
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Tuttavalista avattiin onnistuneesti!"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:337
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Täytä rekisteröitymiskentät."
 
-#: ../src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
 
-#: ../src/protocols/gg/gg.c:364
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Rekisteröinti onnistui!"
 
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "Sähköposti"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
 #: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
 msgstr "Salasana"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Syötä nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Täytä seuraavat kentät"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1605
-msgid "Unable to initiate a new search"
-msgstr "Ei voida aloittaa uutta hakua"
-
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1606
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "Sinulla on jo meneillään oleva haku. Odota sen päättymistä."
-
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:973
-#: ../src/protocols/gg/gg.c:1996 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
+#. General
+#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
+#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
+#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:695
+#: ../src/protocols/jabber/buddy.c:1259 ../src/protocols/jabber/buddy.c:1441
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:976
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:785
+#: ../src/protocols/oscar/oscar.c:3676 ../src/protocols/oscar/oscar.c:3684
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1541
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1537
+#: ../src/protocols/oscar/oscar.c:3650
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3650
 msgid "Male"
 msgstr "Mies"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3650
 msgid "Female"
 msgstr "Nainen"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Täytä kentät."
 
-#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Nykyinen salasanasi ei ole se jonka kirjoitit."
 
-#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occured.\n"
 msgstr "Ei kyetty muuttamaan salasanaa virheen takia.\n"
 
-#: ../src/protocols/gg/gg.c:665
+#: ../src/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
 
-#: ../src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../src/protocols/gg/gg.c:803
+#: ../src/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 
-#: ../src/protocols/gg/gg.c:806 ../src/protocols/gg/gg.c:807
+#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../src/protocols/gg/gg.c:949
-msgid "No matching users found"
-msgstr "Käyttäjistä ei löytynyt osumia"
-
-#: ../src/protocols/gg/gg.c:950
-msgid "There are no users matching your search criteria."
-msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
-
-#: ../src/protocols/gg/gg.c:961 ../src/protocols/gg/gg.c:1028
-#: ../src/protocols/oscar/oscar.c:6329
-msgid "Unable to display the search results."
-msgstr "Ei voida näyttää hakutuloksia."
-
-#: ../src/protocols/gg/gg.c:967 ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
+#: ../src/protocols/oscar/oscar.c:3622
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:979
-msgid "Birth year"
+#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
+#: ../src/protocols/jabber/buddy.c:1255 ../src/protocols/jabber/buddy.c:1431
+#: ../src/protocols/oscar/oscar.c:3633 ../src/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "Etunimi"
+
+#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:1019
+#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
+#: ../src/protocols/oscar/oscar.c:3787
+msgid "Unable to display the search results."
+msgstr "Ei voida näyttää hakutuloksia."
+
+#: ../src/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../src/protocols/gg/gg.c:1117 ../src/protocols/gg/gg.c:1264
+#: ../src/protocols/gg/gg.c:1197
+msgid "No matching users found"
+msgstr "Käyttäjistä ei löytynyt osumia"
+
+#: ../src/protocols/gg/gg.c:1198
+msgid "There are no users matching your search criteria."
+msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
+
+#: ../src/protocols/gg/gg.c:1292 ../src/protocols/gg/gg.c:1439
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../src/protocols/gg/gg.c:1200
+#: ../src/protocols/gg/gg.c:1375
 msgid "Buddy list downloaded"
 msgstr "Tuttavalista ladattu"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1376
 msgid "Your buddy list was downloaded from the server."
 msgstr "Tuttavalistasi ladattiin palvelimelta."
 
-#: ../src/protocols/gg/gg.c:1208
+#: ../src/protocols/gg/gg.c:1383
 msgid "Buddy list uploaded"
 msgstr "Tuttavalista lähetettiin"
 
-#: ../src/protocols/gg/gg.c:1209
+#: ../src/protocols/gg/gg.c:1384
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavalistasi tallennettiin palvelimelle."
 
-#: ../src/protocols/gg/gg.c:1310 ../src/protocols/gg/gg.c:1527
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/gg/gg.c:1709
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../src/protocols/gg/gg.c:1440 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../src/protocols/gg/gg.c:1463
+#: ../src/protocols/gg/gg.c:1638
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../src/protocols/gg/gg.c:1472
+#: ../src/protocols/gg/gg.c:1647
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../src/protocols/gg/gg.c:1476
+#: ../src/protocols/gg/gg.c:1651
 msgid "Block"
 msgstr "Estä"
 
-#: ../src/protocols/gg/gg.c:1493
+#: ../src/protocols/gg/gg.c:1668
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../src/protocols/gg/gg.c:1717
+#: ../src/protocols/gg/gg.c:1896
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../src/protocols/gg/gg.c:1718
+#: ../src/protocols/gg/gg.c:1897
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../src/protocols/gg/gg.c:1801
+#: ../src/protocols/gg/gg.c:1980
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../src/protocols/gg/gg.c:1824
+#: ../src/protocols/gg/gg.c:2003
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../src/protocols/gg/gg.c:1830
+#: ../src/protocols/gg/gg.c:2009
 msgid "Change password..."
 msgstr "Vaihda salasana..."
 
-#: ../src/protocols/gg/gg.c:1836
+#: ../src/protocols/gg/gg.c:2015
 msgid "Upload buddylist to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: ../src/protocols/gg/gg.c:1840
+#: ../src/protocols/gg/gg.c:2019
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:1844
+#: ../src/protocols/gg/gg.c:2023
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:1848
+#: ../src/protocols/gg/gg.c:2027
 msgid "Save buddylist to file..."
 msgstr "Vie tuttavalista tiedostoon..."
 
-#: ../src/protocols/gg/gg.c:1852
+#: ../src/protocols/gg/gg.c:2031
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavalista tiedostosta..."
 
@@ -5811,32 +5883,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1948
+#: ../src/protocols/gg/gg.c:2127
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-yhteyskäytäntöliitännäinen"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1949
+#: ../src/protocols/gg/gg.c:2128
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../src/protocols/gg/gg.c:1997
+#: ../src/protocols/gg/gg.c:2176
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
 #: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
 #: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
+#: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -5894,13 +5966,13 @@
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:451
+#: ../src/protocols/simple/simple.c:1519
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
 #: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
+#: ../src/protocols/oscar/oscar.c:1247
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
@@ -5921,7 +5993,7 @@
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3361
 #: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
@@ -5945,11 +6017,11 @@
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
 #: ../src/protocols/jabber/jabber.c:1905
 #: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
+#: ../src/protocols/sametime/sametime.c:5637 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1766
 msgid "Server"
 msgstr "Palvelin"
 
@@ -5957,7 +6029,7 @@
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
 #: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
@@ -5965,7 +6037,8 @@
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -5977,160 +6050,159 @@
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Väärä tila"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sinut on kielletty kanavalta %s."
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Kielletty"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Ei voida estää käyttäjää %s: estolista on täynnä"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3623
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Realname"
-msgstr "Oikea nimi"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Jouten:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Kuvaava adjektiivi</b> Kunniakas<br>"
 
-#: ../src/protocols/irc/msgs.c:318
+#: ../src/protocols/irc/msgs.c:328
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../src/protocols/irc/msgs.c:325
+#: ../src/protocols/irc/msgs.c:330
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s on poistanut aiheen."
+
+#: ../src/protocols/irc/msgs.c:338
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:356
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:357
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:357
 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:367
+#: ../src/protocols/irc/msgs.c:380
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../src/protocols/irc/msgs.c:495
+#: ../src/protocols/irc/msgs.c:508
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../src/protocols/irc/msgs.c:496
+#: ../src/protocols/irc/msgs.c:509
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../src/protocols/irc/msgs.c:507
+#: ../src/protocols/irc/msgs.c:520
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:518
+#: ../src/protocols/irc/msgs.c:531
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:534
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../src/protocols/irc/msgs.c:526
+#: ../src/protocols/irc/msgs.c:539
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../src/protocols/irc/msgs.c:546
+#: ../src/protocols/irc/msgs.c:559
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../src/protocols/irc/msgs.c:602
+#: ../src/protocols/irc/msgs.c:615
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../src/protocols/irc/msgs.c:603
+#: ../src/protocols/irc/msgs.c:616
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../src/protocols/irc/msgs.c:704
+#: ../src/protocols/irc/msgs.c:717
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:722 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../src/protocols/irc/msgs.c:732
+#: ../src/protocols/irc/msgs.c:745
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:830 ../src/protocols/irc/msgs.c:831
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../src/protocols/irc/msgs.c:819
+#: ../src/protocols/irc/msgs.c:832
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6138,7 +6210,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../src/protocols/irc/msgs.c:836
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6146,42 +6218,42 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../src/protocols/irc/msgs.c:875
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../src/protocols/irc/msgs.c:875
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../src/protocols/irc/msgs.c:896
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../src/protocols/irc/msgs.c:926
+#: ../src/protocols/irc/msgs.c:938
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../src/protocols/irc/msgs.c:928
+#: ../src/protocols/irc/msgs.c:940
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../src/protocols/irc/msgs.c:1003
+#: ../src/protocols/irc/msgs.c:1021
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1022 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../src/protocols/irc/msgs.c:1038
+#: ../src/protocols/irc/msgs.c:1056
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/irc/msgs.c:1050
+#: ../src/protocols/irc/msgs.c:1068
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -6402,9 +6474,8 @@
 msgstr "CTCP PING:n vastaus"
 
 #: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
-#: ../src/protocols/toc/toc.c:780
+#: ../src/protocols/toc/toc.c:190 ../src/protocols/toc/toc.c:688
+#: ../src/protocols/toc/toc.c:704 ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
@@ -6500,7 +6571,6 @@
 msgstr "Seutu"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "Postinumero"
 
@@ -6514,6 +6584,13 @@
 msgid "Telephone"
 msgstr "Puhelin"
 
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/jabber/buddy.c:1261
+#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "Sähköposti"
+
 #: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Organisaation nimi"
@@ -6527,7 +6604,7 @@
 msgstr "Asema"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:3656
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -6552,7 +6629,7 @@
 msgstr "Muut etunimet"
 
 #: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:3675 ../src/protocols/oscar/oscar.c:3683
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
@@ -6608,54 +6685,78 @@
 msgstr "Pidennetty poissaolo"
 
 #: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8059
-#: ../src/protocols/sametime/sametime.c:3285
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5610
+#: ../src/protocols/sametime/sametime.c:3284
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
+#: ../src/protocols/jabber/buddy.c:1253
+msgid "JID"
+msgstr "JID"
+
+#: ../src/protocols/jabber/buddy.c:1257 ../src/protocols/jabber/buddy.c:1436
+#: ../src/protocols/oscar/oscar.c:3634
+msgid "Last Name"
+msgstr "Sukunimi"
+
 #: ../src/protocols/jabber/buddy.c:1289
 msgid "The following are the results of your search"
 msgstr "Seuraavat ovat hakusi tuloksia"
 
-#: ../src/protocols/jabber/buddy.c:1388
+#. current comment from Jabber User Directory users.jabber.org
+#: ../src/protocols/jabber/buddy.c:1364
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
+"tukee jokerimerkkejä (%)"
+
+#: ../src/protocols/jabber/buddy.c:1384
+msgid "Directory Query Failed"
+msgstr "Hakemistohaku epäonnistui"
+
+#: ../src/protocols/jabber/buddy.c:1385
+msgid "Could not query the directory server."
+msgstr "Ei voitu hakea hakemistopalvelimelta."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../src/protocols/jabber/buddy.c:1419
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Palvelimen ohjeet: %s"
+
+#: ../src/protocols/jabber/buddy.c:1426
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi Jabber-käyttäjiä."
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "Etunimi"
-
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
-msgid "Last Name"
-msgstr "Sukunimi"
-
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:3636 ../src/protocols/oscar/oscar.c:3643
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
+#: ../src/protocols/jabber/buddy.c:1455 ../src/protocols/jabber/buddy.c:1456
 msgid "Search for Jabber users"
 msgstr "Etsi Jabber-käyttäjiä"
 
-#: ../src/protocols/jabber/buddy.c:1431
+#: ../src/protocols/jabber/buddy.c:1470
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../src/protocols/jabber/buddy.c:1448
+#: ../src/protocols/jabber/buddy.c:1487
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../src/protocols/jabber/buddy.c:1449
+#: ../src/protocols/jabber/buddy.c:1488
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../src/protocols/jabber/buddy.c:1452
+#: ../src/protocols/jabber/buddy.c:1491
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7552
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5099
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Huone:"
@@ -6782,11 +6883,15 @@
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
-#: ../src/protocols/oscar/oscar.c:6227
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:3677
+#: ../src/protocols/oscar/oscar.c:3685
 msgid "State"
 msgstr "Lääni"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "Postinumero"
+
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
@@ -6808,7 +6913,7 @@
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:357
 msgid "Authenticating"
 msgstr "Todennetaan"
 
@@ -6818,7 +6923,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
 #: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7849
+#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5401
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
@@ -6872,13 +6977,13 @@
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:6171
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:6182
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
@@ -7203,12 +7308,12 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1760
+#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1772
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -7254,13 +7359,13 @@
 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/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7482
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2380
+#: ../src/protocols/oscar/oscar.c:5030
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7483
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2382
+#: ../src/protocols/oscar/oscar.c:5031
 msgid "_Deny"
 msgstr "_Kiellä"
 
@@ -7424,7 +7529,7 @@
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
@@ -7517,7 +7622,7 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1332
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
@@ -7613,7 +7718,7 @@
 msgstr "Lähetä"
 
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
+#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3246
 #: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
 #, c-format
 msgid ""
@@ -7628,24 +7733,24 @@
 msgstr "Olet hänen listallaan"
 
 #: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3296
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
 #: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
 #: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3299
 msgid "Busy"
 msgstr "Varattu"
 
 #: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3305
+#: ../src/protocols/yahoo/yahoo.c:3311
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
 #: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../src/protocols/yahoo/yahoo.c:3317
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
@@ -7704,74 +7809,219 @@
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1825
-#: ../src/protocols/yahoo/yahoo_profile.c:1208 ../src/util.c:1055
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1465
+#: ../src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "MSN-profiili"
 
-#: ../src/protocols/msn/msn.c:1470 ../src/protocols/msn/msn.c:1809
+#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../src/protocols/msn/msn.c:1540 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:3662
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Ikä"
 
-#: ../src/protocols/msn/msn.c:1542 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../src/protocols/msn/msn.c:1543 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/protocols/msn/msn.c:1548 ../src/protocols/msn/msn.c:1738
-#: ../src/protocols/msn/msn.c:1744 ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
+#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/msn/msn.c:1672
+#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
+#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
 #: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
-#: ../src/protocols/msn/msn.c:1693 ../src/protocols/msn/msn.c:1700
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
+#: ../src/protocols/msn/msn.c:1556
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>Yleinen</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1572 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../src/protocols/msn/msn.c:1582 ../src/protocols/msn/msn.c:1760
-#: ../src/protocols/msn/msn.c:1766 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../src/protocols/msn/msn.c:1566
+msgid "Interests"
+msgstr "Kiinnostukset"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Pets"
+msgstr "Lemmikit"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Hometown"
+msgstr "Kotikunta"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Places Lived"
+msgstr "Asumispaikat"
+
+#: ../src/protocols/msn/msn.c:1570
+msgid "Fashion"
+msgstr "Tyyli"
+
+#: ../src/protocols/msn/msn.c:1571
+msgid "Humor"
+msgstr "Huumorintaju"
+
+#: ../src/protocols/msn/msn.c:1572
+msgid "Music"
+msgstr "Musiikki"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
+#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../src/protocols/msn/msn.c:1709 ../src/protocols/msn/msn.c:1715
-#: ../src/protocols/msn/msn.c:1722 ../src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1577
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Vapaa-aika</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Significant Other"
+msgstr "Elämänkumppani"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Home Phone"
+msgstr "Kotipuhelin"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Phone 2"
+msgstr "Kotipuhelin 2"
+
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3674
+msgid "Home Address"
+msgstr "Kotiosoite"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal Mobile"
+msgstr "Oma matkapuhelin"
+
+#: ../src/protocols/msn/msn.c:1591
+msgid "Home Fax"
+msgstr "Kotifaksi"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Personal E-Mail"
+msgstr "Oma sähköposti"
+
+#: ../src/protocols/msn/msn.c:1593
+msgid "Personal IM"
+msgstr "Oma pikaviestin"
+
+#: ../src/protocols/msn/msn.c:1595
+msgid "Anniversary"
+msgstr "Vuosipäivä"
+
+#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+msgid "Notes"
+msgstr "Huomautuksia"
+
+#: ../src/protocols/msn/msn.c:1600
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Koti</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Tehtävänimike"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3691
+msgid "Company"
+msgstr "Yritys"
+
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+msgid "Department"
+msgstr "Osasto"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Profession"
+msgstr "Asmatti"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Phone"
+msgstr "Työpuhelin"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Phone 2"
+msgstr "Työpuhelin 2"
+
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:3682
+msgid "Work Address"
+msgstr "Työosoite"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work Mobile"
+msgstr "Työmatkapuhelin"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work Pager"
+msgstr "Työhakulaite"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Work Fax"
+msgstr "Työfaksi"
+
+#: ../src/protocols/msn/msn.c:1617
+msgid "Work E-Mail"
+msgstr "Työsähköposti"
+
+#: ../src/protocols/msn/msn.c:1618
+msgid "Work IM"
+msgstr "Työ pikaviestin"
+
+#: ../src/protocols/msn/msn.c:1619
+msgid "Start Date"
+msgstr "Aloituspäivä"
+
+#: ../src/protocols/msn/msn.c:1624
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Työ</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1635
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Yhteystiedot</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../src/protocols/msn/msn.c:1774
+#: ../src/protocols/msn/msn.c:1759
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../src/protocols/msn/msn.c:1786 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../src/protocols/msn/msn.c:1811
+#: ../src/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1812
+#: ../src/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7780,7 +8030,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/msn/msn.c:1801
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7788,8 +8038,13 @@
 "Gaim ei löytänyt mitään tietoja käyttäjän profiilista. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../src/protocols/msn/msn.c:1822 ../src/protocols/msn/msn.c:1825
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1806
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -7803,23 +8058,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/msn/msn.c:2050
+#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/msn/msn.c:2069
+#: ../src/protocols/msn/msn.c:2049
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: ../src/protocols/msn/msn.c:2078
+#: ../src/protocols/msn/msn.c:2058
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../src/protocols/msn/msn.c:2083
+#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../src/protocols/msn/msn.c:2091
+#: ../src/protocols/msn/msn.c:2071
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -7835,7 +8090,7 @@
 msgstr "%s ei ole kelvollinen ryhmä"
 
 #: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:336
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -7927,63 +8182,63 @@
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:304
+#: ../src/protocols/msn/session.c:306
 msgid "Our protocol is not supported by the server."
 msgstr "Palvelin ei tue yhteyskäytäntöä."
 
-#: ../src/protocols/msn/session.c:308
+#: ../src/protocols/msn/session.c:310
 msgid "Error parsing HTTP."
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:314 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3415 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
-#: ../src/protocols/msn/session.c:315
+#: ../src/protocols/msn/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
-#: ../src/protocols/msn/session.c:320
+#: ../src/protocols/msn/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../src/protocols/msn/session.c:324
+#: ../src/protocols/msn/session.c:326
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../src/protocols/msn/session.c:329
+#: ../src/protocols/msn/session.c:331
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tuttavalistaa ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: ../src/protocols/msn/session.c:352 ../src/protocols/msn/session.c:354
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../src/protocols/msn/session.c:351
+#: ../src/protocols/msn/session.c:353
 msgid "Transferring"
 msgstr "Siirtää"
 
-#: ../src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:355
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:356
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:358
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../src/protocols/msn/session.c:357
+#: ../src/protocols/msn/session.c:359
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
@@ -8359,10 +8614,6 @@
 msgid "Telephone Number"
 msgstr "Puhelinnumero"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Osasto"
-
 #: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Titteli"
@@ -8371,11 +8622,6 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Sähköpostiosoite"
-
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "Käyttäjän ID"
@@ -8489,103 +8735,115 @@
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
-#: ../src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:145
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-#: ../src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:146
 msgid "Rate to host"
 msgstr "Nopeus isäntään"
 
-#: ../src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:147
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: ../src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:149
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
-#: ../src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:150
 msgid "Service not defined"
 msgstr "Palvelua ei määritelty"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:151
 msgid "Obsolete SNAC"
 msgstr "Vanhentunut SNAC"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:152
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkoisännässä"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:153
 msgid "Not supported by client"
 msgstr "Ei tuettu asiakasohjelmassa"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:154
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: ../src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:155
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
-#: ../src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:156
 msgid "Responses lost"
 msgstr "Vastaukset menetetty"
 
-#: ../src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:157
 msgid "Request denied"
 msgstr "Pyyntö evätty"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:158
 msgid "Busted SNAC payload"
 msgstr "Rikkoutunut SNAC-data"
 
-#: ../src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:159
 msgid "Insufficient rights"
 msgstr "Liian vähän oikeuksia"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:160
 msgid "In local permit/deny"
 msgstr "Paikallisessa sallittujen/estettyjen listassa"
 
-#: ../src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:161
 msgid "Too evil (sender)"
 msgstr "Lähettäjä liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:162
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
 msgstr "Käyttäjä ei tilapäisesti saatavilla."
 
-#: ../src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:165
 msgid "List overflow"
 msgstr "Lista-ylivuoto"
 
-#: ../src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:166
 msgid "Request ambiguous"
 msgstr "Pyyntö ei ole yksiselitteinen"
 
-#: ../src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:167
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: ../src/protocols/oscar/oscar.c:227
+#: ../src/protocols/oscar/oscar.c:168
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
+#: ../src/protocols/oscar/oscar.c:346
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(Viestiä vastaanotettaessa tapahtui virhe. Tuttava jonka kanssa puhut "
+"käyttää luultavasti eri merkistöä kuin mitä odotettiin. Jos tiedät mitä "
+"merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
+"lisäasetuksissa.)"
+
+#: ../src/protocols/oscar/oscar.c:449
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8593,184 +8851,141 @@
 "(Tämän viestin vastaanotossa oli virhe. Henkilö jonka kanssa keskustelet "
 "käyttää todennäköisesti virheellistä asiakasohjelmaa.)"
 
-#: ../src/protocols/oscar/oscar.c:702
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../src/protocols/oscar/oscar.c:705
+#: ../src/protocols/oscar/oscar.c:631
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5780
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../src/protocols/oscar/oscar.c:718
+#: ../src/protocols/oscar/oscar.c:644
 msgid "Games"
 msgstr "Pelit"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../src/protocols/oscar/oscar.c:647
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../src/protocols/oscar/oscar.c:724
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: ../src/protocols/oscar/oscar.c:727
+#: ../src/protocols/oscar/oscar.c:653
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../src/protocols/oscar/oscar.c:730
+#: ../src/protocols/oscar/oscar.c:656
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../src/protocols/oscar/oscar.c:733
+#: ../src/protocols/oscar/oscar.c:659
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:736
+#: ../src/protocols/oscar/oscar.c:662
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/oscar/oscar.c:665
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
-#: ../src/protocols/oscar/oscar.c:742
+#: ../src/protocols/oscar/oscar.c:668
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:745
+#: ../src/protocols/oscar/oscar.c:671
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../src/protocols/oscar/oscar.c:748
+#: ../src/protocols/oscar/oscar.c:674
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:751
+#: ../src/protocols/oscar/oscar.c:677
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:754
+#: ../src/protocols/oscar/oscar.c:680
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: ../src/protocols/oscar/oscar.c:757
+#: ../src/protocols/oscar/oscar.c:683
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/protocols/oscar/oscar.c:761
+#: ../src/protocols/oscar/oscar.c:687
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:764
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../src/protocols/oscar/oscar.c:767
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8036
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5587
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8064
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5615
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8054
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5605
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../src/protocols/oscar/oscar.c:799
+#: ../src/protocols/oscar/oscar.c:725
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
+#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2823
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../src/protocols/oscar/oscar.c:885
+#: ../src/protocols/oscar/oscar.c:811
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../src/protocols/oscar/oscar.c:1034
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "Suora pikaviesti %s:n kanssa suljettu"
-
-#: ../src/protocols/oscar/oscar.c:1036
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
-
-#: ../src/protocols/oscar/oscar.c:1044
-msgid "Direct Connect failed"
-msgstr "Suorayhteys epäonnistui"
-
-#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
-
-#: ../src/protocols/oscar/oscar.c:1205
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Yritetään yhdistää %s at %s:%hu suoraa pikaviestiä varten."
-
-#: ../src/protocols/oscar/oscar.c:1608
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-"Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä varten."
-
-#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
-msgid "Unable to open Direct IM"
-msgstr "Ei voitu avata suoraa pikaviestiyhteyttä"
-
-#: ../src/protocols/oscar/oscar.c:1696
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
-
-#: ../src/protocols/oscar/oscar.c:1700
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Koska tämä paljastaa IP-osoitteesi, se voidaan ajatella yksityisyysriskiksi. "
-"Haluatko jatkaa?"
-
-#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
-msgid "_Connect"
-msgstr "_Yhdistä"
-
-#: ../src/protocols/oscar/oscar.c:1782
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
-
-#: ../src/protocols/oscar/oscar.c:1805
-msgid "Chat is currently unavailable"
-msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
-
-#: ../src/protocols/oscar/oscar.c:1877
+#: ../src/protocols/oscar/oscar.c:966
+msgid "Could not connect to authentication server"
+msgstr "Ei saatu yhteyttä todentamispalvelimeen"
+
+#: ../src/protocols/oscar/oscar.c:968
+msgid "Could not connect to BOS server"
+msgstr "Ei saatu yhteyttä BOS-palvelimeen"
+
+#: ../src/protocols/oscar/oscar.c:998
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:1893
+#: ../src/protocols/oscar/oscar.c:1003
+msgid "Connection established, cookie sent"
+msgstr "Yhteys muodostettu, eväste lähetetty"
+
+#. TODO: Don't call this with ssi
+#: ../src/protocols/oscar/oscar.c:1034
+msgid "Finalizing connection"
+msgstr "Viimeistellään yhteyttä"
+
+#: ../src/protocols/oscar/oscar.c:1220
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8781,78 +8996,20 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:1921
-msgid "Unable to login to AIM"
-msgstr "Ei kyetty kirjautumaan AIM:iin"
-
-#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
-msgid "Could Not Connect"
-msgstr "Yhteyttä ei voitu muodostaa"
-
-#: ../src/protocols/oscar/oscar.c:2035
-msgid "Connection established, cookie sent"
-msgstr "Yhteys muodostettu, eväste lähetetty"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2194
-msgid "Attempting connection redirect..."
-msgstr "Yritetään yhteyden uudelleenreititystä..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2240
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-"Tiedoston %s siirto aikakatkaistiin.\n"
-" Kokeile välipalvelimien käyttöönottoa tiedostonsiirroille kohdassa "
-"Käyttäjätilit->%s->Muokkaa käyttäjätiliä->Lisäasetukset."
-
-#: ../src/protocols/oscar/oscar.c:2338
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "Ei kyetty muodostamaan tiedostokahvaa."
-
-#: ../src/protocols/oscar/oscar.c:2343
-msgid "Unable to create new connection."
-msgstr "Uuden yhteyden luominen epäonnistui."
-
-#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
-msgid "Unable to log into file transfer proxy."
-msgstr "Ei kyetty kirjautumaan tiedostonsiirtovälipalvelimeen."
-
-#: ../src/protocols/oscar/oscar.c:2668
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Pistokkeen muodostus epäonnistui, tai AOL-välipalvelinyhteyttä ei ole."
-
-#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1309 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: ../src/protocols/oscar/oscar.c:2911
+#: ../src/protocols/oscar/oscar.c:1314
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2915
+#: ../src/protocols/oscar/oscar.c:1318
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/oscar/oscar.c:2920
+#: ../src/protocols/oscar/oscar.c:1323
 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."
@@ -8861,33 +9018,32 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/oscar/oscar.c:2925
+#: ../src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../src/protocols/oscar/oscar.c:2953
-msgid "Internal Error"
-msgstr "Sisäinen virhe"
-
-#: ../src/protocols/oscar/oscar.c:3023
+#: ../src/protocols/oscar/oscar.c:1364
+msgid "Could Not Connect"
+msgstr "Yhteyttä ei voitu muodostaa"
+
+#: ../src/protocols/oscar/oscar.c:1369
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../src/protocols/oscar/oscar.c:3047
+#: ../src/protocols/oscar/oscar.c:1392
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3061
+#: ../src/protocols/oscar/oscar.c:1406
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../src/protocols/oscar/oscar.c:3062
+#: ../src/protocols/oscar/oscar.c:1407
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
-#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
-#: ../src/protocols/oscar/oscar.c:3223
+#: ../src/protocols/oscar/oscar.c:1447 ../src/protocols/oscar/oscar.c:1477
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8896,46 +9052,36 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
+#: ../src/protocols/oscar/oscar.c:1450 ../src/protocols/oscar/oscar.c:1480
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ei saanut kelvollista AIM-sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:3226
+#: ../src/protocols/oscar/oscar.c:1566
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
+
+#: ../src/protocols/oscar/oscar.c:1569
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:3247
+#: ../src/protocols/oscar/oscar.c:1595
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:4555
-#, 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:4558
-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 "
-"considered a privacy risk."
-msgstr ""
-"Tämä toiminto vaatiin suoran yhteyden koneiden välillä mutta on tarpeellinen "
-"lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
-"yksityisyysriskinä."
-
-#: ../src/protocols/oscar/oscar.c:4597
+#: ../src/protocols/oscar/oscar.c:2155
 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:4605
+#: ../src/protocols/oscar/oscar.c:2164
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../src/protocols/oscar/oscar.c:4606
+#: ../src/protocols/oscar/oscar.c:2165
 msgid "Please authorize me!"
 msgstr "Valtuuta minut."
 
-#: ../src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:2199
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8944,25 +9090,25 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: ../src/protocols/oscar/oscar.c:4641
+#: ../src/protocols/oscar/oscar.c:2204
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:4643
+#: ../src/protocols/oscar/oscar.c:2206
 msgid "_Request Authorization"
 msgstr "_Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7468 ../src/protocols/oscar/oscar.c:7520
+#: ../src/protocols/oscar/oscar.c:2250 ../src/protocols/oscar/oscar.c:2258
+#: ../src/protocols/oscar/oscar.c:2366 ../src/protocols/oscar/oscar.c:2390
+#: ../src/protocols/oscar/oscar.c:5016 ../src/protocols/oscar/oscar.c:5068
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../src/protocols/oscar/oscar.c:4686
+#: ../src/protocols/oscar/oscar.c:2257
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../src/protocols/oscar/oscar.c:4793
+#: ../src/protocols/oscar/oscar.c:2368
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8971,11 +9117,11 @@
 "Käyttäjä %u haluaa lisätä %s:n tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7480
+#: ../src/protocols/oscar/oscar.c:2378 ../src/protocols/oscar/oscar.c:5028
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:2390
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8986,17 +9132,17 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4816
+#: ../src/protocols/oscar/oscar.c:2391
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4823
+#: ../src/protocols/oscar/oscar.c:2398
 #, 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:4831
+#: ../src/protocols/oscar/oscar.c:2406
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9009,7 +9155,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4839
+#: ../src/protocols/oscar/oscar.c:2414
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9022,7 +9168,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4847
+#: ../src/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9035,34 +9181,34 @@
 "Viesti on:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4868
+#: ../src/protocols/oscar/oscar.c:2443
 #, 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:4874
+#: ../src/protocols/oscar/oscar.c:2449
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../src/protocols/oscar/oscar.c:4878
+#: ../src/protocols/oscar/oscar.c:2453
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/protocols/oscar/oscar.c:4962
+#: ../src/protocols/oscar/oscar.c:2537
 #, 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:4971
+#: ../src/protocols/oscar/oscar.c:2546
 #, 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:4980
+#: ../src/protocols/oscar/oscar.c:2555
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9071,87 +9217,87 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../src/protocols/oscar/oscar.c:4989
+#: ../src/protocols/oscar/oscar.c:2564
 #, 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."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../src/protocols/oscar/oscar.c:4998
+#: ../src/protocols/oscar/oscar.c:2573
 #, 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:5007
+#: ../src/protocols/oscar/oscar.c:2582
 #, 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:5066
+#: ../src/protocols/oscar/oscar.c:2638
 #, 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:5127
+#: ../src/protocols/oscar/oscar.c:2699
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC antoi virheen: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5164
+#: ../src/protocols/oscar/oscar.c:2735
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
+#: ../src/protocols/oscar/oscar.c:2735 ../src/protocols/oscar/oscar.c:2740
+#: ../src/protocols/oscar/oscar.c:2798 ../src/protocols/oscar/oscar.c:2802
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../src/protocols/oscar/oscar.c:5167
-#: ../src/protocols/sametime/sametime.c:2373
+#: ../src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/sametime/sametime.c:2370
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../src/protocols/oscar/oscar.c:5227
+#: ../src/protocols/oscar/oscar.c:2798
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../src/protocols/oscar/oscar.c:5230
+#: ../src/protocols/oscar/oscar.c:2801
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/oscar/oscar.c:5257
+#: ../src/protocols/oscar/oscar.c:2827
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../src/protocols/oscar/oscar.c:5262
+#: ../src/protocols/oscar/oscar.c:2832
 #: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../src/protocols/oscar/oscar.c:5267
+#: ../src/protocols/oscar/oscar.c:2837
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../src/protocols/oscar/oscar.c:5285
+#: ../src/protocols/oscar/oscar.c:2855
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../src/protocols/oscar/oscar.c:5402
+#: ../src/protocols/oscar/oscar.c:2944
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5588
+#: ../src/protocols/oscar/oscar.c:3125
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9159,11 +9305,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../src/protocols/oscar/oscar.c:5809
+#: ../src/protocols/oscar/oscar.c:3344
 msgid "Rate limiting error."
 msgstr "Määrärajoitusvirhe"
 
-#: ../src/protocols/oscar/oscar.c:5810
+#: ../src/protocols/oscar/oscar.c:3345
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9171,94 +9317,81 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:5883
+#: ../src/protocols/oscar/oscar.c:3417
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3430 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5925
-msgid "Finalizing connection"
-msgstr "Viimeistellään yhteyttä"
-
-#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:3648 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/protocols/oscar/oscar.c:6207
+#: ../src/protocols/oscar/oscar.c:3665
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:6211
+#: ../src/protocols/oscar/oscar.c:3669
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Kotiosoite"
-
-#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
+#: ../src/protocols/oscar/oscar.c:3678 ../src/protocols/oscar/oscar.c:3686
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Työosoite"
-
-#: ../src/protocols/oscar/oscar.c:6232
+#: ../src/protocols/oscar/oscar.c:3690
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Yritys"
-
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../src/protocols/oscar/oscar.c:3692
 msgid "Division"
 msgstr "Osasto"
 
-#: ../src/protocols/oscar/oscar.c:6235
+#: ../src/protocols/oscar/oscar.c:3693
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../src/protocols/oscar/oscar.c:3695
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:6295
+#: ../src/protocols/oscar/oscar.c:3753
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../src/protocols/oscar/oscar.c:6335
+#: ../src/protocols/oscar/oscar.c:3793
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../src/protocols/oscar/oscar.c:6366
+#: ../src/protocols/oscar/oscar.c:3798
+msgid "Screen name"
+msgstr "Näyttönimi"
+
+#: ../src/protocols/oscar/oscar.c:3824
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../src/protocols/oscar/oscar.c:6387
+#: ../src/protocols/oscar/oscar.c:3845
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../src/protocols/oscar/oscar.c:6389
+#: ../src/protocols/oscar/oscar.c:3847
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../src/protocols/oscar/oscar.c:6420
+#: ../src/protocols/oscar/oscar.c:3878
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../src/protocols/oscar/oscar.c:6423
+#: ../src/protocols/oscar/oscar.c:3881
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9267,14 +9400,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../src/protocols/oscar/oscar.c:6426
+#: ../src/protocols/oscar/oscar.c:3884
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:6429
+#: ../src/protocols/oscar/oscar.c:3887
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9283,7 +9416,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:6432
+#: ../src/protocols/oscar/oscar.c:3890
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9292,7 +9425,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:6435
+#: ../src/protocols/oscar/oscar.c:3893
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9301,7 +9434,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:6438
+#: ../src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9310,12 +9443,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:6441
+#: ../src/protocols/oscar/oscar.c:3899
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../src/protocols/oscar/oscar.c:6451
+#: ../src/protocols/oscar/oscar.c:3909
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9324,27 +9457,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
+#: ../src/protocols/oscar/oscar.c:3910 ../src/protocols/oscar/oscar.c:3917
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../src/protocols/oscar/oscar.c:6457
+#: ../src/protocols/oscar/oscar.c:3915
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../src/protocols/oscar/oscar.c:6535
+#: ../src/protocols/oscar/oscar.c:4090
 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:6775
+#: ../src/protocols/oscar/oscar.c:4330
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../src/protocols/oscar/oscar.c:6776
+#: ../src/protocols/oscar/oscar.c:4331
 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 "
@@ -9354,7 +9487,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../src/protocols/oscar/oscar.c:6790
+#: ../src/protocols/oscar/oscar.c:4345
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9367,11 +9500,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:6795
+#: ../src/protocols/oscar/oscar.c:4350
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:6843
+#: ../src/protocols/oscar/oscar.c:4397
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9384,11 +9517,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:6848
+#: ../src/protocols/oscar/oscar.c:4402
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:6917
+#: ../src/protocols/oscar/oscar.c:4471
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9399,16 +9532,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:6919 ../src/protocols/oscar/oscar.c:7326
-#: ../src/protocols/oscar/oscar.c:7340
+#: ../src/protocols/oscar/oscar.c:4473 ../src/protocols/oscar/oscar.c:4874
+#: ../src/protocols/oscar/oscar.c:4888
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:7026
+#: ../src/protocols/oscar/oscar.c:4577
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../src/protocols/oscar/oscar.c:7027
+#: ../src/protocols/oscar/oscar.c:4578
 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 "
@@ -9417,13 +9550,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7225
-#: ../src/protocols/oscar/oscar.c:7230 ../src/protocols/oscar/oscar.c:7384
-#: ../src/protocols/oscar/oscar.c:7385 ../src/protocols/oscar/oscar.c:7390
+#: ../src/protocols/oscar/oscar.c:4772 ../src/protocols/oscar/oscar.c:4773
+#: ../src/protocols/oscar/oscar.c:4778 ../src/protocols/oscar/oscar.c:4932
+#: ../src/protocols/oscar/oscar.c:4933 ../src/protocols/oscar/oscar.c:4938
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../src/protocols/oscar/oscar.c:7324
+#: ../src/protocols/oscar/oscar.c:4872
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9432,11 +9565,11 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/oscar/oscar.c:7338
+#: ../src/protocols/oscar/oscar.c:4872 ../src/protocols/oscar/oscar.c:4886
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../src/protocols/oscar/oscar.c:7338
+#: ../src/protocols/oscar/oscar.c:4886
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9446,7 +9579,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:7421
+#: ../src/protocols/oscar/oscar.c:4969
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9455,11 +9588,11 @@
 "Käyttäjälle %s on annettu lupa lisätä sinut heidän tuttavalistalleen. "
 "Haluatko lisätä heidät omalle listallesi?"
 
-#: ../src/protocols/oscar/oscar.c:7427
+#: ../src/protocols/oscar/oscar.c:4975
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: ../src/protocols/oscar/oscar.c:7471
+#: ../src/protocols/oscar/oscar.c:5019
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9470,17 +9603,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7516
+#: ../src/protocols/oscar/oscar.c:5064
 #, 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:7517
+#: ../src/protocols/oscar/oscar.c:5065
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7520
+#: ../src/protocols/oscar/oscar.c:5068
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9491,92 +9624,109 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7521
+#: ../src/protocols/oscar/oscar.c:5069
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../src/protocols/oscar/oscar.c:7558 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5105 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../src/protocols/oscar/oscar.c:7594
+#: ../src/protocols/oscar/oscar.c:5145
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../src/protocols/oscar/oscar.c:7664
+#: ../src/protocols/oscar/oscar.c:5215
 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- "
 "ryhmäkeskustelussa."
 
-#: ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:5373
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8127
+#: ../src/protocols/oscar/oscar.c:5678
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../src/protocols/oscar/oscar.c:8128
+#: ../src/protocols/oscar/oscar.c:5679
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../src/protocols/oscar/oscar.c:8147
+#: ../src/protocols/oscar/oscar.c:5725
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
+
+#: ../src/protocols/oscar/oscar.c:5729
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
+"Haluatko jatkaa?"
+
+#: ../src/protocols/oscar/oscar.c:5733
+msgid "_Connect"
+msgstr "_Yhdistä"
+
+#: ../src/protocols/oscar/oscar.c:5751
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../src/protocols/oscar/oscar.c:8154
+#: ../src/protocols/oscar/oscar.c:5759
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../src/protocols/oscar/oscar.c:8167
+#: ../src/protocols/oscar/oscar.c:5772
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:8186
+#: ../src/protocols/oscar/oscar.c:5794
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../src/protocols/oscar/oscar.c:5851
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:8246
+#: ../src/protocols/oscar/oscar.c:5854
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/oscar/oscar.c:5859
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../src/protocols/oscar/oscar.c:5876
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:5877
 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:8276
+#: ../src/protocols/oscar/oscar.c:5884
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: ../src/protocols/oscar/oscar.c:8328
+#: ../src/protocols/oscar/oscar.c:5940
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../src/protocols/oscar/oscar.c:8373
+#: ../src/protocols/oscar/oscar.c:5985
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../src/protocols/oscar/oscar.c:8376
+#: ../src/protocols/oscar/oscar.c:5988
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../src/protocols/oscar/oscar.c:8377
+#: ../src/protocols/oscar/oscar.c:5989
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9584,64 +9734,72 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../src/protocols/oscar/oscar.c:8394
+#: ../src/protocols/oscar/oscar.c:6006
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8395
+#: ../src/protocols/oscar/oscar.c:6007
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8396
+#: ../src/protocols/oscar/oscar.c:6008
 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:8489
+#: ../src/protocols/oscar/oscar.c:6177
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:6188
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8504
+#: ../src/protocols/oscar/oscar.c:6192
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8514
+#: ../src/protocols/oscar/oscar.c:6202
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8521
+#: ../src/protocols/oscar/oscar.c:6209
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: ../src/protocols/oscar/oscar.c:8525
+#: ../src/protocols/oscar/oscar.c:6213
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../src/protocols/oscar/oscar.c:8529
-msgid "Display Currently Registered Address"
-msgstr "Näytä rekisteröity osoite"
-
-#: ../src/protocols/oscar/oscar.c:8533
-msgid "Change Currently Registered Address..."
-msgstr "Muuta rekisteröityä osoitetta"
-
-#: ../src/protocols/oscar/oscar.c:8540
+#: ../src/protocols/oscar/oscar.c:6217
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
+
+#: ../src/protocols/oscar/oscar.c:6221
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
+
+#: ../src/protocols/oscar/oscar.c:6228
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by E-Mail..."
-msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
-
-#: ../src/protocols/oscar/oscar.c:8551
+#: ../src/protocols/oscar/oscar.c:6234
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
+
+#: ../src/protocols/oscar/oscar.c:6239
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
+#: ../src/protocols/oscar/oscar.c:6305
+msgid "Use recent buddies group"
+msgstr "Käytä viimeaikaisten tuttavien ryhmää"
+
+#: ../src/protocols/oscar/oscar.c:6308
+msgid "Show how long you have been idle"
+msgstr "Näyttää kuinka kauan olet ollut jouten."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9652,156 +9810,156 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8729 ../src/protocols/oscar/oscar.c:8731
+#: ../src/protocols/oscar/oscar.c:6433 ../src/protocols/oscar/oscar.c:6435
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/oscar/oscar.c:8750
+#: ../src/protocols/oscar/oscar.c:6454
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: ../src/protocols/oscar/oscar.c:8753
+#: ../src/protocols/oscar/oscar.c:6457
 msgid "Auth port"
 msgstr "Portti"
 
-#: ../src/protocols/oscar/oscar.c:8756 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:6460 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Merkistö"
 
-#: ../src/protocols/oscar/oscar.c:8760
-msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-msgstr ""
-"Käytä AIM/ICQ-välipalvelinta\n"
-"(hitaampi, mutta toimii useimmiten)"
+#: ../src/protocols/oscar/oscar.c:6465
+msgid ""
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Käytä aina AIM/ICQ-välipalvelinta\n"
+"(hitaampi, mutta ei paljasta IP-osoitettasi)"
 
 #: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1268
+#: ../src/protocols/sametime/sametime.c:1265
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notesin ryhmä-ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1270
+#: ../src/protocols/sametime/sametime.c:1267
 #, c-format
 msgid "Info for Group %s"
 msgstr "Tietoja ryhmästä %s"
 
-#: ../src/protocols/sametime/sametime.c:1272
+#: ../src/protocols/sametime/sametime.c:1269
 msgid "Notes Address Book Information"
 msgstr "Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1304
+#: ../src/protocols/sametime/sametime.c:1301
 msgid "Invite Group to Conference..."
 msgstr "Kutsu ryhmä neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:1314
+#: ../src/protocols/sametime/sametime.c:1311
 msgid "Get Notes Address Book Info"
 msgstr "Hae Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1467
+#: ../src/protocols/sametime/sametime.c:1464
 msgid "Sending Handshake"
 msgstr "Lähetetään kättelyä"
 
-#: ../src/protocols/sametime/sametime.c:1472
+#: ../src/protocols/sametime/sametime.c:1469
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Odotetaan kättelyn vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1477
+#: ../src/protocols/sametime/sametime.c:1474
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Kättely vahvistettu, kirjaudutaan"
 
-#: ../src/protocols/sametime/sametime.c:1482
+#: ../src/protocols/sametime/sametime.c:1479
 msgid "Waiting for Login Acknowledgement"
 msgstr "Odotetaan kirjautumisen vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../src/protocols/sametime/sametime.c:1484
 msgid "Login Redirected"
 msgstr "Sisäänkirjautuminen uudelleenohjattu"
 
-#: ../src/protocols/sametime/sametime.c:1493
+#: ../src/protocols/sametime/sametime.c:1490
 msgid "Forcing Login"
 msgstr "Pakotetaan sisäänkirjautuminen"
 
-#: ../src/protocols/sametime/sametime.c:1497
+#: ../src/protocols/sametime/sametime.c:1494
 msgid "Login Acknowledged"
 msgstr "Kirjautuminen vahvistettu"
 
-#: ../src/protocols/sametime/sametime.c:1502
+#: ../src/protocols/sametime/sametime.c:1499
 msgid "Starting Services"
 msgstr "Käynnistetään palveluja"
 
-#: ../src/protocols/sametime/sametime.c:1507
+#: ../src/protocols/sametime/sametime.c:1504
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../src/protocols/sametime/sametime.c:1602
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %s"
 
-#: ../src/protocols/sametime/sametime.c:1610
+#: ../src/protocols/sametime/sametime.c:1607
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-#: ../src/protocols/sametime/sametime.c:1662
+#: ../src/protocols/sametime/sametime.c:1659
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../src/protocols/sametime/sametime.c:1669
+#: ../src/protocols/sametime/sametime.c:1666
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Virhe luettaessa socketista: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
+#: ../src/protocols/sametime/sametime.c:1695
+#: ../src/protocols/sametime/sametime.c:3695
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: ../src/protocols/sametime/sametime.c:1736
+#: ../src/protocols/sametime/sametime.c:1733
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
 
-#: ../src/protocols/sametime/sametime.c:1910
+#: ../src/protocols/sametime/sametime.c:1907
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../src/protocols/sametime/sametime.c:2364
 msgid "Unable to send message: "
 msgstr "Viestiä ei voitu lähettää: "
 
-#: ../src/protocols/sametime/sametime.c:2926
+#: ../src/protocols/sametime/sametime.c:2925
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../src/protocols/sametime/sametime.c:3216
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3217
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../src/protocols/sametime/sametime.c:3219
+#: ../src/protocols/sametime/sametime.c:3218
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3223
+#: ../src/protocols/sametime/sametime.c:3222
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../src/protocols/sametime/sametime.c:3256
 #, c-format
 msgid ""
 "\n"
@@ -9810,7 +9968,7 @@
 "\n"
 "<b>Tukee</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3262
+#: ../src/protocols/sametime/sametime.c:3261
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9818,11 +9976,11 @@
 "\n"
 "<b>Ulkoinen käyttäjä</b>"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../src/protocols/sametime/sametime.c:3368
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9831,27 +9989,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../src/protocols/sametime/sametime.c:3373
+#: ../src/protocols/sametime/sametime.c:3372
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/sametime/sametime.c:3375
+#: ../src/protocols/sametime/sametime.c:3374
 msgid "Create"
 msgstr "Aloita"
 
-#: ../src/protocols/sametime/sametime.c:3439
+#: ../src/protocols/sametime/sametime.c:3438
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
+#: ../src/protocols/sametime/sametime.c:3451
+msgid "Invite user to a conference"
+msgstr "Kutsu käyttäjä neuvotteluun"
+
 #: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite user to a conference"
-msgstr "Kutsu käyttäjä neuvotteluun"
-
-#: ../src/protocols/sametime/sametime.c:3453
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9862,27 +10020,27 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../src/protocols/sametime/sametime.c:3458
+#: ../src/protocols/sametime/sametime.c:3457
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3460
+#: ../src/protocols/sametime/sametime.c:3459
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/protocols/sametime/sametime.c:3548
+#: ../src/protocols/sametime/sametime.c:3547
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../src/protocols/sametime/sametime.c:3552
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../src/protocols/sametime/sametime.c:3600
+#: ../src/protocols/sametime/sametime.c:3599
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../src/protocols/sametime/sametime.c:3621
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -9891,62 +10049,62 @@
 "Isäntää tai IP-osoitetta ei ole astetettu Meanwhile-käyttäjätilille %s. "
 "Lisää sellainen alle ennen kirjautumista sisään."
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../src/protocols/sametime/sametime.c:3626
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../src/protocols/sametime/sametime.c:3628
+#: ../src/protocols/sametime/sametime.c:3627
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../src/protocols/sametime/sametime.c:4084
 msgid "<b>External User</b><br>"
 msgstr "<b>Ulkoinen käyttäjä</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4088
+#: ../src/protocols/sametime/sametime.c:4087
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Käyttäjän ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4094
+#: ../src/protocols/sametime/sametime.c:4093
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Koko nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../src/protocols/sametime/sametime.c:4099
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Viimeksi nähty asiakas:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4108
+#: ../src/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4115
+#: ../src/protocols/sametime/sametime.c:4114
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Tukee:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4121
+#: ../src/protocols/sametime/sametime.c:4120
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../src/protocols/sametime/sametime.c:4263
+#: ../src/protocols/sametime/sametime.c:5426
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
+#: ../src/protocols/sametime/sametime.c:4266
+#: ../src/protocols/sametime/sametime.c:5429
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../src/protocols/sametime/sametime.c:4290
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../src/protocols/sametime/sametime.c:4292
+#: ../src/protocols/sametime/sametime.c:4291
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -9955,15 +10113,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:4297
+#: ../src/protocols/sametime/sametime.c:4296
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../src/protocols/sametime/sametime.c:4367
+#: ../src/protocols/sametime/sametime.c:4366
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
 
-#: ../src/protocols/sametime/sametime.c:4369
+#: ../src/protocols/sametime/sametime.c:4368
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -9972,11 +10130,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../src/protocols/sametime/sametime.c:4374
+#: ../src/protocols/sametime/sametime.c:4373
 msgid "Unable to add user"
 msgstr "Ei voitu lisätä käyttäjää"
 
-#: ../src/protocols/sametime/sametime.c:4946
+#: ../src/protocols/sametime/sametime.c:4945
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9985,64 +10143,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../src/protocols/sametime/sametime.c:5076
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../src/protocols/sametime/sametime.c:5081
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../src/protocols/sametime/sametime.c:5085
+#: ../src/protocols/sametime/sametime.c:5084
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../src/protocols/sametime/sametime.c:5087
+#: ../src/protocols/sametime/sametime.c:5086
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavalista palvelimelta"
 
-#: ../src/protocols/sametime/sametime.c:5089
+#: ../src/protocols/sametime/sametime.c:5088
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna lista palvelimelle"
 
-#: ../src/protocols/sametime/sametime.c:5091
+#: ../src/protocols/sametime/sametime.c:5090
 msgid "Synchronize List with Server"
 msgstr "Täsmää lista palvelimen kanssa"
 
-#: ../src/protocols/sametime/sametime.c:5140
+#: ../src/protocols/sametime/sametime.c:5139
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista käyttäjätililtä %s"
 
-#: ../src/protocols/sametime/sametime.c:5179
+#: ../src/protocols/sametime/sametime.c:5178
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista käyttäjätilille %s"
 
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../src/protocols/sametime/sametime.c:5231
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
 
-#: ../src/protocols/sametime/sametime.c:5233
+#: ../src/protocols/sametime/sametime.c:5232
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavalistallasi."
 
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
+#: ../src/protocols/sametime/sametime.c:5235
+#: ../src/protocols/sametime/sametime.c:5364
 msgid "Unable to add group"
 msgstr "Ryhmää ei voitu lisätä"
 
-#: ../src/protocols/sametime/sametime.c:5295
+#: ../src/protocols/sametime/sametime.c:5294
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
+#: ../src/protocols/sametime/sametime.c:5310
+msgid "Notes Address Book group results"
+msgstr "Notesin osoitekirjan ryhmätulokset"
+
 #: ../src/protocols/sametime/sametime.c:5311
-msgid "Notes Address Book group results"
-msgstr "Notesin osoitekirjan ryhmätulokset"
-
-#: ../src/protocols/sametime/sametime.c:5312
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10053,15 +10211,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5316
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../src/protocols/sametime/sametime.c:5359
+#: ../src/protocols/sametime/sametime.c:5358
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
 
-#: ../src/protocols/sametime/sametime.c:5361
+#: ../src/protocols/sametime/sametime.c:5360
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10070,11 +10228,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../src/protocols/sametime/sametime.c:5401
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../src/protocols/sametime/sametime.c:5403
+#: ../src/protocols/sametime/sametime.c:5402
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10082,12 +10240,12 @@
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../src/protocols/sametime/sametime.c:5450
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5452
+#: ../src/protocols/sametime/sametime.c:5451
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10098,24 +10256,24 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../src/protocols/sametime/sametime.c:5483
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../src/protocols/sametime/sametime.c:5484
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5489
+#: ../src/protocols/sametime/sametime.c:5488
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
+#: ../src/protocols/sametime/sametime.c:5525
+msgid "Search for a user"
+msgstr "Etsi käyttäjiä"
+
 #: ../src/protocols/sametime/sametime.c:5526
-msgid "Search for a user"
-msgstr "Etsi käyttäjiä"
-
-#: ../src/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10123,32 +10281,32 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5530
+#: ../src/protocols/sametime/sametime.c:5529
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../src/protocols/sametime/sametime.c:5542
+#: ../src/protocols/sametime/sametime.c:5541
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5546
+#: ../src/protocols/sametime/sametime.c:5545
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5550
+#: ../src/protocols/sametime/sametime.c:5549
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../src/protocols/sametime/sametime.c:5554
+#: ../src/protocols/sametime/sametime.c:5553
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../src/protocols/sametime/sametime.c:5651
+#: ../src/protocols/sametime/sametime.c:5650
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
+#: ../src/protocols/sametime/sametime.c:5660
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10371,8 +10529,7 @@
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Rakastunut"
 
@@ -10768,10 +10925,6 @@
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Tehtävänimike"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Asema työssä"
@@ -10784,10 +10937,6 @@
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "Sähköposti"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Huomautus"
@@ -10796,6 +10945,11 @@
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "Oikea nimi"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Tilateksti"
@@ -11072,6 +11226,10 @@
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Rakastunut"
+
 #: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
@@ -11088,8 +11246,8 @@
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
 #: ../src/protocols/silc/silc.c:712
@@ -11127,7 +11285,7 @@
 "itsestäsi."
 
 #: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
+#: ../src/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
@@ -11135,7 +11293,7 @@
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1429
 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."
 
@@ -11164,13 +11322,9 @@
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "Oikea nimi"
-
 #: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "Kirjoita salasana uudelleen"
+msgid "Passphrase (retype)"
+msgstr "Salasana (uudelleen)"
 
 #: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
@@ -11193,100 +11347,100 @@
 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:1306
+#: ../src/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../src/protocols/silc/silc.c:1387
+#: ../src/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../src/protocols/silc/silc.c:1489
+#: ../src/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../src/protocols/silc/silc.c:1494
+#: ../src/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../src/protocols/silc/silc.c:1496
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../src/protocols/silc/silc.c:1509
+#: ../src/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../src/protocols/silc/silc.c:1539
+#: ../src/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti Gaimin virhe)"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1610
+#: ../src/protocols/silc/silc.c:1609
 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:1615
+#: ../src/protocols/silc/silc.c:1614
 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:1619
+#: ../src/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1623
+#: ../src/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
 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:1631
+#: ../src/protocols/silc/silc.c:1630
 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:1635
+#: ../src/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../src/protocols/silc/silc.c:1647
+#: ../src/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11294,7 +11448,7 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11302,15 +11456,15 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11318,37 +11472,37 @@
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
 "kanavan kutsu- listalta"
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../src/protocols/silc/silc.c:1705
+#: ../src/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../src/protocols/silc/silc.c:1714
+#: ../src/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11365,60 +11519,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1823
+#: ../src/protocols/silc/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1825
+#: ../src/protocols/silc/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1861
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1866
+#: ../src/protocols/silc/silc.c:1865
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1876
+#: ../src/protocols/silc/silc.c:1875
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../src/protocols/silc/silc.c:1886
+#: ../src/protocols/silc/silc.c:1885
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1889
+#: ../src/protocols/silc/silc.c:1888
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../src/protocols/silc/silc.c:1892
+#: ../src/protocols/silc/silc.c:1891
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: ../src/protocols/silc/silc.c:1895
+#: ../src/protocols/silc/silc.c:1894
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: ../src/protocols/silc/silc.c:1898
+#: ../src/protocols/silc/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../src/protocols/silc/silc.c:1901
+#: ../src/protocols/silc/silc.c:1900
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolotilan pyynnöt"
 
-#: ../src/protocols/silc/silc.c:1904
+#: ../src/protocols/silc/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../src/protocols/silc/silc.c:1907
+#: ../src/protocols/silc/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "_Avaa kirjoitustaulu automaattisesti"
 
-#: ../src/protocols/silc/silc.c:1910
+#: ../src/protocols/silc/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
@@ -11432,42 +11586,42 @@
 #: ../src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "Oikea nimi:\t%s\n"
+msgstr "Oikea nimi: \t%s\n"
 
 #: ../src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "Käyttäjänimi:\t%s\n"
+msgstr "Käyttäjänimi: \t%s\n"
 
 #: ../src/protocols/silc/util.c:318
 #, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "Sähköposti:\t%s\n"
+msgid "E-Mail: \t\t%s\n"
+msgstr "Sähköposti: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "Palvelin:\t%s\n"
+msgstr "Palvelin: \t%s\n"
 
 #: ../src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "Organisaatio:\t%s\n"
+msgstr "Organisaatio: \t%s\n"
 
 #: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
-msgstr "Maa:\t%s\n"
+msgstr "Maa: \t%s\n"
 
 #: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "Algoritmi:\t%s\n"
+msgstr "Algoritmi: \t%s\n"
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key length: \t%d bits\n"
-msgstr "Avaimen pituus:\t%d bits\n"
+msgid "Key Length: \t%d bits\n"
+msgstr "Avaimen pituus: \t%d bittiä\n"
 
 #: ../src/protocols/silc/util.c:328
 #, c-format
@@ -11497,6 +11651,10 @@
 msgid "Paging"
 msgstr "Kaukohaku"
 
+#: ../src/protocols/silc/util.c:522
+msgid "Video Conferencing"
+msgstr "Videoneuvottelu"
+
 #: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Tietokone"
@@ -11529,28 +11687,28 @@
 msgstr "Kirjoitustaulu"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
+#: ../src/protocols/simple/simple.c:410
 msgid "Could not write"
 msgstr "Ei voitu kirjoittaa"
 
-#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+#: ../src/protocols/simple/simple.c:425 ../src/protocols/simple/simple.c:1423
 msgid "Could not connect"
 msgstr "Ei voitu yhdistää"
 
-#: ../src/protocols/simple/simple.c:994
+#: ../src/protocols/simple/simple.c:995
 msgid "Wrong Password"
 msgstr "Väärä salasana"
 
-#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
+#: ../src/protocols/simple/simple.c:1454 ../src/protocols/simple/simple.c:1493
+#: ../src/protocols/simple/simple.c:1505 ../src/protocols/simple/simple.c:1563
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../src/protocols/simple/simple.c:1474
+#: ../src/protocols/simple/simple.c:1475
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voitu löytää"
 
-#: ../src/protocols/simple/simple.c:1572
+#: ../src/protocols/simple/simple.c:1584
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -11562,36 +11720,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1734
+#: ../src/protocols/simple/simple.c:1746
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1735
+#: ../src/protocols/simple/simple.c:1747
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/simple/simple.c:1757
+#: ../src/protocols/simple/simple.c:1769
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../src/protocols/simple/simple.c:1763
+#: ../src/protocols/simple/simple.c:1775
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../src/protocols/simple/simple.c:1765
+#: ../src/protocols/simple/simple.c:1777
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../src/protocols/simple/simple.c:1767
+#: ../src/protocols/simple/simple.c:1779
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/simple/simple.c:1781
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../src/protocols/simple/simple.c:1771
+#: ../src/protocols/simple/simple.c:1783
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -11838,7 +11996,7 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
+#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3569
 msgid "Buzz!!"
 msgstr "Huomio!"
 
@@ -11970,23 +12128,23 @@
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3302
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3305
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3308
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3314
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
+#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3320
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
@@ -12046,19 +12204,19 @@
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../src/protocols/yahoo/yahoo.c:3622
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3627
+#: ../src/protocols/yahoo/yahoo.c:3633
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3631
+#: ../src/protocols/yahoo/yahoo.c:3637
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../src/protocols/yahoo/yahoo.c:3635
+#: ../src/protocols/yahoo/yahoo.c:3641
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -12072,55 +12230,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
+#: ../src/protocols/yahoo/yahoo.c:3734 ../src/protocols/yahoo/yahoo.c:3736
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:3747
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3750
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager host"
 msgstr "Isäntä"
 
-#: ../src/protocols/yahoo/yahoo.c:3753
+#: ../src/protocols/yahoo/yahoo.c:3759
 msgid "Japan Pager host"
 msgstr "Isäntä (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3756
-msgid "Pager port"
-msgstr "Portti"
-
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "File transfer host"
-msgstr "Tiedostonsiirtopalvelin"
-
 #: ../src/protocols/yahoo/yahoo.c:3762
-msgid "Japan file transfer host"
-msgstr "Tiedostonsiirtopalvelin (Japani)"
+msgid "Pager port"
+msgstr "Portti"
 
 #: ../src/protocols/yahoo/yahoo.c:3765
-msgid "File transfer port"
-msgstr "Tiedostonsiirtoportti"
+msgid "File transfer host"
+msgstr "Tiedostonsiirtopalvelin"
 
 #: ../src/protocols/yahoo/yahoo.c:3768
-msgid "Chat room locale"
-msgstr "Keskusteluhuoneen paikallisasetus"
+msgid "Japan file transfer host"
+msgstr "Tiedostonsiirtopalvelin (Japani)"
 
 #: ../src/protocols/yahoo/yahoo.c:3771
+msgid "File transfer port"
+msgstr "Tiedostonsiirtoportti"
+
+#: ../src/protocols/yahoo/yahoo.c:3774
+msgid "Chat room locale"
+msgstr "Keskusteluhuoneen paikallisasetus"
+
+#: ../src/protocols/yahoo/yahoo.c:3777
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../src/protocols/yahoo/yahoo.c:3775
+#: ../src/protocols/yahoo/yahoo.c:3781
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3778
+#: ../src/protocols/yahoo/yahoo.c:3784
 msgid "YCHT host"
 msgstr "YCHT-isäntä"
 
-#: ../src/protocols/yahoo/yahoo.c:3781
+#: ../src/protocols/yahoo/yahoo.c:3787
 msgid "YCHT port"
 msgstr "YCHT-portti"
 
@@ -12131,6 +12289,12 @@
 msgid "Sent Doodle request."
 msgstr "Lähetä piirtelypyyntö (doodle)."
 
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+msgid "Unable to establish file descriptor."
+msgstr "Ei kyetty muodostamaan tiedostokahvaa."
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -12441,6 +12605,14 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-yhteyskäytäntöliitännäinen"
 
+#: ../src/protocols/zephyr/zephyr.c:2896
+msgid "Use tzc"
+msgstr "Käytä tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2899
+msgid "tzc command"
+msgstr "tzc-komento"
+
 #: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
@@ -12465,28 +12637,24 @@
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
+#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
+#: ../src/proxy.c:1347
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Välipalvelimen yhteysvirhe %d"
 
 #. Forbidden
-#: ../src/proxy.c:1327
+#: ../src/proxy.c:1336
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Pääsy evätty: välipalvelin estää portin %d tunneloinnin."
 
-#: ../src/proxy.c:2327
-msgid "Invalid proxy settings"
-msgstr "Epäkelvot välipalvelinvalinnat"
-
-#: ../src/proxy.c:2327
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Joko isäntä tai porttinumero on virheellinen annetulle proxy-asetukselle."
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "_Hyväksy"
 
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
@@ -12531,43 +12699,37 @@
 msgid "Mobile"
 msgstr "Liikkeellä"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s kirjautui sisään"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s palasi"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s kirjautui ulos"
-
-#. XXX: Make this "%s is away" when strings thaw.
-#: ../src/status.c:638 ../src/status.c:644
-#, c-format
-msgid "%s went away"
-msgstr "%s on poissa"
-
-#: ../src/status.c:1329
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s on vaihtanut tilasta %s tilaan %s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s on nyt %s"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s ei ole enää %s"
+
+#: ../src/status.c:1320
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../src/status.c:1346
+#: ../src/status.c:1337
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../src/status.c:1412
+#: ../src/status.c:1403
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../src/status.c:1414
+#: ../src/status.c:1405
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
@@ -12577,12 +12739,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2455
+#: ../src/util.c:2453
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../src/util.c:2456
+#: ../src/util.c:2454
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12591,50 +12753,50 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../src/util.c:2895
+#: ../src/util.c:2903
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../src/util.c:2898
+#: ../src/util.c:2906
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../src/util.c:2924
+#: ../src/util.c:2932
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../src/util.c:2936
+#: ../src/util.c:2944
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../src/util.c:2944
+#: ../src/util.c:2952
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../src/util.c:2950
+#: ../src/util.c:2958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../src/util.c:2958
+#: ../src/util.c:2966
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../src/util.c:2964
+#: ../src/util.c:2972
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -12645,6 +12807,119 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "Ei voida aloittaa uutta hakua"
+
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "Sinulla on jo meneillään oleva haku. Odota sen päättymistä."
+
+#~ msgid ""
+#~ "Could not query the directory server. Either the Jabber user directory "
+#~ "specified is invalid or directory server could not be reached."
+#~ msgstr ""
+#~ "Ei voitu tehdä hakua hakemistopalvelimelle. Joko määritelty Jabber-"
+#~ "käyttäjähakemisto on virheellinen, tai hakemistopalvelimelle ei päästy."
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "Suora pikaviesti %s:n kanssa suljettu"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
+
+#~ msgid "Direct IM with %s established"
+#~ msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
+
+#~ msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+#~ msgstr "Yritetään yhdistää %s at %s:%hu suoraa pikaviestiä varten."
+
+#~ msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+#~ msgstr ""
+#~ "Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä "
+#~ "varten."
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "Ei voitu avata suoraa pikaviestiyhteyttä"
+
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
+
+#~ msgid "Unable to login to AIM"
+#~ msgstr "Ei kyetty kirjautumaan AIM:iin"
+
+#~ msgid "Attempting connection redirect..."
+#~ msgstr "Yritetään yhteyden uudelleenreititystä..."
+
+#~ msgid ""
+#~ "Transfer of file %s timed out.\n"
+#~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
+#~ "Account -> Advanced."
+#~ msgstr ""
+#~ "Tiedoston %s siirto aikakatkaistiin.\n"
+#~ " Kokeile välipalvelimien käyttöönottoa tiedostonsiirroille kohdassa "
+#~ "Käyttäjätilit -> %s -> Muokkaa käyttäjätiliä -> Lisäasetukset."
+
+#~ msgid "Unable to create new connection."
+#~ msgstr "Uuden yhteyden luominen epäonnistui."
+
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "Ei kyetty kirjautumaan tiedostonsiirtovälipalvelimeen."
+
+#~ msgid ""
+#~ "Unable to establish listener socket or no AOL proxy connection present."
+#~ msgstr ""
+#~ "Pistokkeen muodostus epäonnistui, tai AOL-välipalvelinyhteyttä ei ole."
+
+#~ msgid "Internal Error"
+#~ msgstr "Sisäinen virhe"
+
+#~ msgid "%s has just asked to directly connect to %s"
+#~ msgstr "%s on juuri pyytänyt suoraa yhteyttä %s:n"
+
+#~ 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 considered a privacy risk."
+#~ msgstr ""
+#~ "Tämä toiminto vaatiin suoran yhteyden koneiden välillä mutta on "
+#~ "tarpeellinen lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi "
+#~ "pitää yksityisyysriskinä."
+
+#~ msgid "Screen Name:"
+#~ msgstr "Näyttönimi:"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "Virhe käynnistettäessä <b>%s</b>: %s"
+
+#~ msgid "Email"
+#~ msgstr "Sähköposti"
+
+#~ msgid "Realname"
+#~ msgstr "Oikea nimi"
+
+#~ msgid "Email Address"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "EMail"
+#~ msgstr "Sähköposti"
+
+#~ msgid "Re-type Passphrase"
+#~ msgstr "Kirjoita salasana uudelleen"
+
+#~ msgid "%s signed on"
+#~ msgstr "%s kirjautui sisään"
+
+#~ msgid "%s came back"
+#~ msgstr "%s palasi"
+
+#~ msgid "%s signed off"
+#~ msgstr "%s kirjautui ulos"
+
+#~ msgid "%s went away"
+#~ msgstr "%s on poissa"
+
 #~ msgid "%s logged out."
 #~ msgstr "%s kirjautui ulos."
 
@@ -12732,12 +13007,6 @@
 #~ msgid "e-Mail"
 #~ msgstr "Sähköposti"
 
-#~ msgid "Use recent buddies group"
-#~ msgstr "Käytä viimeaikaisten tuttavien ryhmää"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "Näyttää kuinka kauan olet ollut jouten."
-
 #~ msgid "Use AIM/ICQ proxy server (slower, but usually works)"
 #~ msgstr "Käytä AIM/ICQ-välipalvelinta (hitaampi, mutta toimii useimmiten)"
 
@@ -12747,12 +13016,6 @@
 #~ msgid "Saved Status..."
 #~ msgstr "Tallennettu tila..."
 
-#~ msgid "Bonjour"
-#~ msgstr "Bonjour"
-
-#~ msgid "_Accept"
-#~ msgstr "_Hyväksy"
-
 #~ msgid "Custom Status..."
 #~ msgstr "Mukautettu tila..."
 
@@ -12833,13 +13096,6 @@
 #~ msgid "NotesBuddy encoding"
 #~ msgstr "NotesBuddy-koodaustapa"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Kontaktin Alias:</b> %s"
-
 #~ msgid "Away Message"
 #~ msgstr "Poissaoloviesti"
 
@@ -12898,9 +13154,6 @@
 #~ msgid "Host name"
 #~ msgstr "Isäntä"
 
-#~ msgid "Nick name"
-#~ msgstr "Kutsumanimi"
-
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber ID"
 
@@ -13703,9 +13956,6 @@
 #~ msgid "_Edit"
 #~ msgstr "_Muokkaa"
 
-#~ msgid "Interface"
-#~ msgstr "Käyttöliittymä"
-
 #~ msgid "Message Text"
 #~ msgstr "Viestin teksti"