diff po/fi.po @ 11861:83e2fa10df1c

[gaim-migrate @ 14152] (16:18:11) rlaager: LSchiere2: make[2]: *** No rule to make target `el.po', needed by `el.gmo'. Stop. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 27 Oct 2005 20:22:27 +0000
parents f244cd5647af
children ac18b43b0495
line wrap: on
line diff
--- a/po/fi.po	Thu Oct 27 20:19:24 2005 +0000
+++ b/po/fi.po	Thu Oct 27 20:22:27 2005 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-04 17:06+0300\n"
+"POT-Creation-Date: 2005-10-27 16:12-0400\n"
 "PO-Revision-Date: 2005-10-04 17:33+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
@@ -19,19 +19,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../plugins/autorecon.c:291
+#: plugins/autorecon.c:301
 msgid "Error Message Suppression"
 msgstr "Virheilmoitusten vaimennus"
 
-#: ../plugins/autorecon.c:295
+#: plugins/autorecon.c:305
 msgid "Hide Disconnect Errors"
 msgstr "Piilota yhteydenkatkaisuvirheilmoitukset"
 
-#: ../plugins/autorecon.c:299
+#: plugins/autorecon.c:309
 msgid "Hide Login Errors"
 msgstr "Piilota sisäänkirjautumisvirheet"
 
-#: ../plugins/autorecon.c:303
+#: plugins/autorecon.c:313
 msgid "Hide Reconnecting Dialog"
 msgstr "Piilota uudelleenyhdistämisvirheilmoitukset"
 
@@ -41,7 +41,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/autorecon.c:327
+#: plugins/autorecon.c:337
 msgid "Auto-Reconnect"
 msgstr "Uudelleenyhdistin"
 
@@ -49,32 +49,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/autorecon.c:330 ../plugins/autorecon.c:332
+#: plugins/autorecon.c:340 plugins/autorecon.c:342
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kun yhteys palvelimelle katkeaa, tämä luo yhteyden uudelleen."
 
-#: ../plugins/contact_priority.c:84
+#: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Pistearvoja käytetään kun..."
 
-#: ../plugins/contact_priority.c:93
+#: plugins/contact_priority.c:93
 msgid "Buddy is offline:"
 msgstr "Tuttava on poissa linjoilta:"
 
-#: ../plugins/contact_priority.c:107
+#: plugins/contact_priority.c:107
 msgid "Buddy is away:"
 msgstr "Tuttava on poissa:"
 
-#: ../plugins/contact_priority.c:121
+#: plugins/contact_priority.c:121
 msgid "Buddy is idle:"
 msgstr "Tuttava on jouten:"
 
-#: ../plugins/contact_priority.c:135
+#: plugins/contact_priority.c:135
 msgid "Use last matching buddy"
 msgstr "Käytä viimeistä sopivaa tuttavaa"
 
 #. Explanation
-#: ../plugins/contact_priority.c:141
+#: plugins/contact_priority.c:141
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -87,7 +87,7 @@
 "käyttävät aikaisempaa sisäänrakennettua järjestystä: aktiivinen->jouten-"
 ">poissa->poissa+jouten->poissa linjoilta."
 
-#: ../plugins/contact_priority.c:144
+#: plugins/contact_priority.c:144
 msgid "Point values to use for account..."
 msgstr "Käytettävät pistearvot käyttäjätilille..."
 
@@ -97,20 +97,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/contact_priority.c:195
+#: plugins/contact_priority.c:195
 msgid "Contact Priority"
 msgstr "Kontaktin tärkeys"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../plugins/contact_priority.c:198
+#: plugins/contact_priority.c:198
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "Mahdollistaa tuttavan tila-arvojen hallinnan"
 
 #. *< description
-#: ../plugins/contact_priority.c:200
+#: plugins/contact_priority.c:200
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -121,96 +121,74 @@
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: ../plugins/docklet/docklet-win32.c:44
+#: plugins/docklet/docklet-win32.c:44
 msgid "Gaim"
 msgstr "Gaim"
 
-#: ../plugins/docklet/docklet-win32.c:45
+#: plugins/docklet/docklet-win32.c:45
 msgid "Gaim - Signed off"
 msgstr "Gaim - Kirjauduttu ulos"
 
-#: ../plugins/docklet/docklet-win32.c:46
+#: plugins/docklet/docklet-win32.c:46
 msgid "Gaim - Away"
 msgstr "Gaim - Poissa"
 
-#: ../plugins/docklet/docklet.c:136
+#: plugins/docklet/docklet.c:383
+#, fuzzy
+msgid "Show Buddy List"
+msgstr "Tuttavalista"
+
+#: plugins/docklet/docklet.c:390
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../plugins/docklet/docklet.c:137
+#: plugins/docklet/docklet.c:394
 msgid "Join A Chat..."
 msgstr "Liity ryhmäkeskusteluun..."
 
-#: ../plugins/docklet/docklet.c:172
-msgid "New..."
-msgstr "Uusi..."
-
-#: ../plugins/docklet/docklet.c:176 ../src/gtkprefs.c:1814
-#: ../src/gtkstatusbox.c:306 ../src/protocols/irc/irc.c:176
-#: ../src/protocols/irc/msgs.c:221 ../src/protocols/jabber/buddy.c:1092
-#: ../src/protocols/jabber/jabber.c:1028 ../src/protocols/msn/msn.c:577
-#: ../src/protocols/novell/novell.c:2825 ../src/protocols/novell/novell.c:2959
-#: ../src/protocols/novell/novell.c:3047 ../src/protocols/oscar/oscar.c:705
-#: ../src/protocols/oscar/oscar.c:6507 ../src/protocols/oscar/oscar.c:6576
-#: ../src/protocols/oscar/oscar.c:7610 ../src/protocols/oscar/oscar.c:7764
-#: ../src/protocols/silc/buddy.c:1417 ../src/protocols/silc/silc.c:52
-#: ../src/protocols/yahoo/yahoo.c:3249 ../src/protocols/zephyr/zephyr.c:2259
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Poissa"
-
-#: ../plugins/docklet/docklet.c:184
-msgid "Back"
-msgstr "Palaa"
-
-#: ../plugins/docklet/docklet.c:191
+#: plugins/docklet/docklet.c:399
 msgid "Mute Sounds"
 msgstr "Vaimenna äänet"
 
-#: ../plugins/docklet/docklet.c:198 ../src/gtkft.c:691
-#: ../src/protocols/oscar/oscar.c:8357
+#: plugins/docklet/docklet.c:406 src/gtkft.c:691
+#: src/protocols/oscar/oscar.c:8357
 msgid "File Transfers"
 msgstr "Tiedostosiirrot"
 
-#: ../plugins/docklet/docklet.c:199 ../src/gtkaccount.c:2380
+#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: ../plugins/docklet/docklet.c:200 ../src/gtkprefs.c:2208
+#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../plugins/docklet/docklet.c:204
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: plugins/docklet/docklet.c:416
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../plugins/docklet/docklet.c:529
-msgid "Tray Icon Configuration"
-msgstr "Tarjotinkuvakeasetukset"
-
-#: ../plugins/docklet/docklet.c:533
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "_Piilota uudet viestit kunnes tarjotinkuvaketta on napsautettu"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:556
 msgid "System Tray Icon"
 msgstr "Tarjotinkuvake"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/docklet/docklet.c:562
+#: plugins/docklet/docklet.c:559
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Näyttää Gaim-kuvakkeen järjestelmän kuvaketarjottimella."
 
 #. *  description
-#: ../plugins/docklet/docklet.c:564
+#: plugins/docklet/docklet.c:561
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -223,19 +201,19 @@
 "kirjautumisikkunan välillä. Myöskin mahdollistaa ICQ-tyylisen viestien "
 "varastoinnin kunnes ne näytetään painamalla kuvaketta."
 
-#: ../plugins/extplacement.c:79
+#: plugins/extplacement.c:79
 msgid "By conversation count"
 msgstr "Keskustelujen määrän mukaan"
 
-#: ../plugins/extplacement.c:100
+#: plugins/extplacement.c:100
 msgid "Conversation Placement"
 msgstr "Keskustelun asettelu"
 
-#: ../plugins/extplacement.c:105
+#: plugins/extplacement.c:105
 msgid "Number of conversations per window"
 msgstr "Keskustelujen määrä per ikkuna"
 
-#: ../plugins/extplacement.c:111
+#: plugins/extplacement.c:111
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Erota pikaviesti- ja ryhmäkeskusteluikkunat aseteltaessa määrän mukaan"
 
@@ -245,19 +223,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/extplacement.c:132
+#: plugins/extplacement.c:132
 msgid "ExtPlacement"
 msgstr "Lisäasettelu"
 
 #. *< name
 #. *< version
-#: ../plugins/extplacement.c:134
+#: plugins/extplacement.c:134
 msgid "Extra conversation placement options."
 msgstr "Keskustelun lisäasetteluvalinnat."
 
 #. *< summary
 #. *  description
-#: ../plugins/extplacement.c:136
+#: plugins/extplacement.c:136
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -271,7 +249,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/filectl.c:245
+#: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Gaimin tiedostohallinta"
 
@@ -279,7 +257,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: plugins/filectl.c:248 plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Mahdollistaa Gaimin hallinnan komentotiedostolla."
 
@@ -289,19 +267,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/gaiminc.c:91
+#: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim-esittelyliitännäinen"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/gaiminc.c:94
+#: plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Esimerkkiliitännäinen joka tekee jotain - katso kuvaus."
 
 #. *  description
-#: ../plugins/gaiminc.c:96
+#: plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -314,91 +292,91 @@
 "- Lähettää viestin listallaoleville tuttavillesi aina kun he kirjautuvat "
 "sisään"
 
-#: ../plugins/gaimrc.c:40
+#: plugins/gaimrc.c:40
 msgid "Cursor Color"
 msgstr "Kohdistimen väri"
 
-#: ../plugins/gaimrc.c:41
+#: plugins/gaimrc.c:41
 msgid "Secondary Cursor Color"
 msgstr "Toissijainen kohdistimen väri"
 
-#: ../plugins/gaimrc.c:42
+#: plugins/gaimrc.c:42
 msgid "Hyperlink Color"
 msgstr "Hyperlinkin väri"
 
-#: ../plugins/gaimrc.c:53
+#: plugins/gaimrc.c:53
 msgid "GtkTreeView Expander Size"
 msgstr "Laajentajan koko"
 
-#: ../plugins/gaimrc.c:72
+#: plugins/gaimrc.c:72
 msgid "Conversation Entry"
 msgstr "Keskustelumerkintä"
 
-#: ../plugins/gaimrc.c:73
+#: plugins/gaimrc.c:73
 msgid "Conversation History"
 msgstr "Keskusteluhistoria"
 
-#: ../plugins/gaimrc.c:74
+#: plugins/gaimrc.c:74
 msgid "Log Viewer"
 msgstr "Lokikatselin"
 
-#: ../plugins/gaimrc.c:75
+#: plugins/gaimrc.c:75
 msgid "Request Dialog"
 msgstr "Pyyntövalintaikkuna"
 
-#: ../plugins/gaimrc.c:76
+#: plugins/gaimrc.c:76
 msgid "Notify Dialog"
 msgstr "Huomautusvalintaikunna"
 
-#: ../plugins/gaimrc.c:209
+#: plugins/gaimrc.c:209
 #, c-format
 msgid "Select Color for %s"
 msgstr "Valitse %s:n väri"
 
-#: ../plugins/gaimrc.c:211
+#: plugins/gaimrc.c:211
 msgid "Select Color"
 msgstr "Valitse väri"
 
-#: ../plugins/gaimrc.c:246
+#: plugins/gaimrc.c:246
 #, c-format
 msgid "Select Font for %s"
 msgstr "Valitse %s:n kirjasin"
 
-#: ../plugins/gaimrc.c:284
+#: plugins/gaimrc.c:284
 msgid "Select Interface Font"
 msgstr "Valitse käyttöliittymän kirjasin"
 
-#: ../plugins/gaimrc.c:343
+#: plugins/gaimrc.c:343
 msgid "GTK+ Interface Font"
 msgstr "GTK+-käyttöliittymän kirjasin"
 
-#: ../plugins/gaimrc.c:362
+#: plugins/gaimrc.c:362
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
-#: ../plugins/gaimrc.c:460
+#: plugins/gaimrc.c:460
 msgid "Gaim GTK+ Theme Control"
 msgstr "Gaimin GTK+-teemanhallinta"
 
-#: ../plugins/gaimrc.c:462 ../plugins/gaimrc.c:463
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
 
 #. Configuration frame
-#: ../plugins/gestures/gestures.c:243
+#: plugins/gestures/gestures.c:243
 msgid "Mouse Gestures Configuration"
 msgstr "Hiirieleasetukset"
 
-#: ../plugins/gestures/gestures.c:250
+#: plugins/gestures/gestures.c:250
 msgid "Middle mouse button"
 msgstr "Keskimmäinen hiiren painike"
 
-#: ../plugins/gestures/gestures.c:255
+#: plugins/gestures/gestures.c:255
 msgid "Right mouse button"
 msgstr "Oikea hiiren painike"
 
 #. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:267
+#: plugins/gestures/gestures.c:267
 msgid "_Visual gesture display"
 msgstr "_Visuaalinen ele -näyttö"
 
@@ -408,19 +386,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/gestures/gestures.c:296
+#: plugins/gestures/gestures.c:296
 msgid "Mouse Gestures"
 msgstr "Hiirieleet"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/gestures/gestures.c:299
+#: plugins/gestures/gestures.c:299
 msgid "Provides support for mouse gestures"
 msgstr "Lisää tuen hiirieleille"
 
 #. *  description
-#: ../plugins/gestures/gestures.c:301
+#: plugins/gestures/gestures.c:301
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -436,47 +414,47 @@
 "Liikuta ylös ja sitten vasemmalle vaihtaaksesi edelliseen keskusteluun.\n"
 "Liikuta ylös ja sitten oikealle vaihtaaksesi seuraavaan keskusteluun."
 
-#: ../plugins/gevolution/add_buddy_dialog.c:132
-#: ../plugins/gevolution/assoc-buddy.c:120 ../src/gtkprefs.c:2062
-#: ../src/gtkroomlist.c:572 ../src/protocols/jabber/jabber.c:638
-#: ../src/protocols/msn/msn.c:1547 ../src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/add_buddy_dialog.c:131
+#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
 msgid "Name"
 msgstr "Nimi"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:459
+#: plugins/gevolution/add_buddy_dialog.c:458
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
 
 #. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:472
-#: ../plugins/gevolution/assoc-buddy.c:354 ../src/protocols/oscar/oscar.c:8128
+#: plugins/gevolution/add_buddy_dialog.c:471
+#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
+#: src/protocols/oscar/oscar.c:8128
 msgid "Search"
 msgstr "Etsi"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:553
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4402
-#: ../src/gtkblist.c:4779
+#: plugins/gevolution/add_buddy_dialog.c:552
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
+#: src/gtkblist.c:4459
 msgid "Group:"
 msgstr "Ryhmä:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:579
-#: ../plugins/gevolution/assoc-buddy.c:466
+#: plugins/gevolution/add_buddy_dialog.c:578
+#: plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Uusi henkilö"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:596
+#: plugins/gevolution/add_buddy_dialog.c:595
 msgid "Select Buddy"
 msgstr "Valitse tuttava"
 
 #. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:341
+#: plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -484,59 +462,54 @@
 "Valitse henkilö osoitekirjasta johon lisäät tämän tuttavan, tai luo uusi "
 "henkilö."
 
-#. Add the disclosure
-#: ../plugins/gevolution/assoc-buddy.c:429
-msgid "Show user details"
-msgstr "Näytä käyttäjän yksityiskohdat"
-
-#: ../plugins/gevolution/assoc-buddy.c:430
-msgid "Hide user details"
+#. Add the expander
+#: plugins/gevolution/assoc-buddy.c:428
+#, fuzzy
+msgid "User _details"
 msgstr "Piilota käyttäjän yksityiskohdat"
 
 #. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Yhdistä tuttava"
 
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:518 ../src/blist.c:1259 ../src/blist.c:1480
-#: ../src/gtkblist.c:4219 ../src/protocols/jabber/roster.c:66
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
+#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
 msgstr "Sähköpostia ei voitu lähettää."
 
-#: ../plugins/gevolution/gevolution.c:263
+#: plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
 msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
 
-#: ../plugins/gevolution/gevolution.c:269
+#: plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
 msgstr "Määriteltyä tuttavaa ei löydetty Evolutionin yhteystiedoista."
 
-#: ../plugins/gevolution/gevolution.c:286
+#: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
 
-#: ../plugins/gevolution/gevolution.c:290
+#: plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
 msgstr "Lähetä sähköposti"
 
 #. Configuration frame
-#: ../plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution-integraatioasetukset"
 
 #. Label
-#: ../plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
-#: ../plugins/gevolution/gevolution.c:447 ../plugins/idle.c:111
-#: ../plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
 msgid "Account"
 msgstr "Tili"
 
@@ -546,7 +519,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Evolution-integrointi"
 
@@ -554,55 +527,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/gevolution/gevolution.c:533
-#: ../plugins/gevolution/gevolution.c:535
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Syötä henkilön tiedot alle."
 
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Syötä tuttavan näyttönimi ja käyttäjätilin tyyppi alle."
 
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Käyttäjätilin tyyppi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:294
 msgid "Screenname:"
 msgstr "Näyttönimi:"
 
 #. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Valinnaisia tietoja:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:413
-#: ../src/gtkaccount.c:435 ../src/protocols/oscar/oscar.c:611
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
+#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Sukunimi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
-#: ../plugins/history.c:138
+#: plugins/history.c:146
 msgid "History Plugin Requires Logging"
 msgstr "Historia-liitännäinen vaatii lokiinkirjauksen käyttöä"
 
-#: ../plugins/history.c:139
+#: plugins/history.c:147
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -615,15 +587,15 @@
 "Lokien käyttöönotto pikaviesteille ja/tai ryhmäkeskusteluille ottaa käyttöön "
 "historiatoiminnon vastaaville keskustelutyypeille."
 
-#: ../plugins/history.c:178
+#: plugins/history.c:186
 msgid "History"
 msgstr "Historia"
 
-#: ../plugins/history.c:180
+#: plugins/history.c:188
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Näyttää osan edellistä keskustelua uudessa keskustelussa."
 
-#: ../plugins/history.c:181
+#: plugins/history.c:189
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation.\n"
@@ -646,7 +618,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/iconaway.c:101
+#: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "Pienennä poissaollessa"
 
@@ -654,43 +626,43 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/iconaway.c:104 ../plugins/iconaway.c:106
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
 
-#: ../plugins/idle.c:115
+#: plugins/idle.c:115
 msgid "Minutes"
 msgstr "Minuuttia"
 
-#: ../plugins/idle.c:122 ../plugins/idle.c:149 ../plugins/idle.c:217
+#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
 msgid "I'dle Mak'er"
 msgstr "Joutenoloajan säätö"
 
-#: ../plugins/idle.c:123 ../plugins/idle.c:178
+#: plugins/idle.c:123 plugins/idle.c:181
 msgid "Set Account Idle Time"
 msgstr "Aseta tilin joutenoloaika"
 
-#: ../plugins/idle.c:126
+#: plugins/idle.c:126
 msgid "_Set"
 msgstr "_Aseta"
 
-#: ../plugins/idle.c:127 ../plugins/idle.c:154
+#: plugins/idle.c:127 plugins/idle.c:154
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../plugins/idle.c:150 ../plugins/idle.c:182
+#: plugins/idle.c:150 plugins/idle.c:185
 msgid "Unset Account Idle Time"
 msgstr "Poista tilin joutenoloajan asetus"
 
-#: ../plugins/idle.c:153
+#: plugins/idle.c:153
 msgid "_Unset"
 msgstr "_Poista asetus"
 
-#: ../plugins/idle.c:187
+#: plugins/idle.c:190
 msgid "Unset Idle Time For All Idled Accounts"
 msgstr "Ota pois joutenoloaika kaikilta jouten olevilta käyttäjätileiltä"
 
-#: ../plugins/idle.c:219 ../plugins/idle.c:220
+#: plugins/idle.c:217 plugins/idle.c:218
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten"
 
@@ -700,19 +672,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ipc-test-client.c:87
+#: plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC-testiasiakasohjelma"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/ipc-test-client.c:90
+#: plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Testiliitännäinen - IPC asiakasohjelmana"
 
 #. *  description
-#: ../plugins/ipc-test-client.c:92
+#: plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -726,103 +698,103 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ipc-test-server.c:74
+#: plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC-testipalvelin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/ipc-test-server.c:77
+#: plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Testiliitännäinen - IPC palvelimena"
 
 #. *  description
-#: ../plugins/ipc-test-server.c:79
+#: plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Testiliitännäinen - IPC palvelimena. Tämä rekisteröi IPC-komennot."
 
-#: ../plugins/mailchk.c:160
+#: plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Sähköpostitarkistin"
 
-#: ../plugins/mailchk.c:162
+#: plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Tarkistaa paikallisen koneen sähköpostin."
 
-#: ../plugins/mailchk.c:163
+#: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Lisää pienen neliön tuttavalistaan, joka ilmoittaa uudesta sähköpostista."
 
 #. ---------- "Notify For" ----------
-#: ../plugins/notify.c:652
+#: plugins/notify.c:638
 msgid "Notify For"
 msgstr "Huomautus"
 
-#: ../plugins/notify.c:656
+#: plugins/notify.c:642
 msgid "_IM windows"
 msgstr "_Pikaviesti-ikkunoille"
 
-#: ../plugins/notify.c:663
+#: plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "_Ryhmäkeskusteluikkunoille"
 
-#: ../plugins/notify.c:670
+#: plugins/notify.c:656
 msgid "_Focused windows"
 msgstr "_Kohdistetuille ikkunoille"
 
 #. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:678
+#: plugins/notify.c:664
 msgid "Notification Methods"
 msgstr "Ilmoitustavat"
 
-#: ../plugins/notify.c:685
+#: plugins/notify.c:671
 msgid "Prepend _string into window title:"
 msgstr "Lisää _merkkijono ikkunaotsikon eteen:"
 
 #. Count method button
-#: ../plugins/notify.c:704
+#: plugins/notify.c:690
 msgid "Insert c_ount of new messages into window title"
 msgstr "Lisää uusien _viestien määrä ikkunaotsikkoon"
 
 #. Urgent method button
-#: ../plugins/notify.c:712
+#: plugins/notify.c:698
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aseta ikkunointiohjelman \"_URGENT\"(kiireellinen)-lippu"
 
 #. Raise window method button
-#: ../plugins/notify.c:720
+#: plugins/notify.c:706
 msgid "R_aise conversation window"
 msgstr "N_osta keskusteluikkuna"
 
 #. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:728
+#: plugins/notify.c:714
 msgid "Notification Removal"
 msgstr "Huomautuksen poisto"
 
 #. Remove on focus button
-#: ../plugins/notify.c:733
+#: plugins/notify.c:719
 msgid "Remove when conversation window _gains focus"
 msgstr "Poista kun keskusteluikkuna on _aktiivinen"
 
 #. Remove on click button
-#: ../plugins/notify.c:740
+#: plugins/notify.c:726
 msgid "Remove when conversation window _receives click"
 msgstr "Poista kun keskusteluikkunaa _napsautetaan"
 
 #. Remove on type button
-#: ../plugins/notify.c:748
+#: plugins/notify.c:734
 msgid "Remove when _typing in conversation window"
 msgstr "Poista kun keskusteluikkunaan _kirjoitetaan"
 
 #. Remove on message send button
-#: ../plugins/notify.c:756
+#: plugins/notify.c:742
 msgid "Remove when a _message gets sent"
 msgstr "Poista kun viesti _lähetetään"
 
 #. Remove on conversation switch button
-#: ../plugins/notify.c:765
+#: plugins/notify.c:751
 msgid "Remove on switch to conversation ta_b"
 msgstr "Poista kun _välilehti vaihtuu"
 
@@ -832,7 +804,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/notify.c:855
+#: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "Viestihuomautus"
 
@@ -840,7 +812,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/notify.c:858 ../plugins/notify.c:860
+#: plugins/notify.c:844 plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
 
@@ -850,28 +822,28 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/perl/perl.c:583
+#: plugins/perl/perl.c:587
 msgid "Perl Plugin Loader"
 msgstr "Perl-liitännäisten lataaja"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
+#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-liitännäisiä."
 
-#: ../plugins/raw.c:151
+#: plugins/raw.c:151
 msgid "Raw"
 msgstr "Raakasyöttö"
 
-#: ../plugins/raw.c:153
+#: plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Mahdollistaa raakamuotoisen syötteen antamisen tekstipohjaisille "
 "protokollille"
 
-#: ../plugins/raw.c:154
+#: plugins/raw.c:154
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -880,12 +852,12 @@
 "(Jabber MSN, IRC, TOC). Paina \"Enter\" viestinsyöttölaatikossa "
 "lähettääksesi. Katso debug-ikkunaa."
 
-#: ../plugins/relnot.c:63
+#: plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "Käyttämäsi Gaim-versio on %s. Uusin versio on %s.<hr>"
 
-#: ../plugins/relnot.c:69
+#: plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -894,7 +866,7 @@
 "<b>Muutosloki:</b>\n"
 "%s<br><br>"
 
-#: ../plugins/relnot.c:74
+#: plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -903,7 +875,7 @@
 "Version %s voi noutaa osoitteesta:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
+#: plugins/relnot.c:78 plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Uusi versio saatavilla"
 
@@ -913,19 +885,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/relnot.c:137
+#: plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Julkaisuilmoitus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/relnot.c:140
+#: plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Tarkistaa määräajoin onko uusi Gaim-versio julkaistu."
 
 #. *  description
-#: ../plugins/relnot.c:142
+#: plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -939,7 +911,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/signals-test.c:718
+#: plugins/signals-test.c:730
 msgid "Signals Test"
 msgstr "Signaalitesti"
 
@@ -947,7 +919,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/signals-test.c:721 ../plugins/signals-test.c:723
+#: plugins/signals-test.c:733 plugins/signals-test.c:735
 msgid "Test to see that all signals are working properly."
 msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
 
@@ -957,7 +929,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/simple.c:34
+#: plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "\"Yksinkertainen\"-liitännäinen"
 
@@ -965,55 +937,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
+#: plugins/simple.c:37 plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Kokeilee että useimmat asiat toimivat."
 
-#: ../plugins/spellchk.c:1791
+#: plugins/spellchk.c:1788
 msgid "Duplicate Correction"
 msgstr "Korjauksen toisinto"
 
-#: ../plugins/spellchk.c:1792
+#: plugins/spellchk.c:1789
 msgid "The specified word already exists in the correction list."
 msgstr "Määritetty sana on jo korjauslistassa."
 
-#: ../plugins/spellchk.c:1942
+#: plugins/spellchk.c:1948
 msgid "Text Replacements"
 msgstr "Tekstin korvaus"
 
-#: ../plugins/spellchk.c:1966
+#: plugins/spellchk.c:1972
 msgid "You type"
 msgstr "Kirjoitettu"
 
-#: ../plugins/spellchk.c:1978
+#: plugins/spellchk.c:1984
 msgid "You send"
 msgstr "Lähetetty"
 
-#: ../plugins/spellchk.c:1990
+#: plugins/spellchk.c:1996
 msgid "Whole words only"
 msgstr "Vain kokonaiset sanat"
 
-#: ../plugins/spellchk.c:2016
+#: plugins/spellchk.c:2022
 msgid "Add a new text replacement"
 msgstr "Lisää uusi korvausehto"
 
-#: ../plugins/spellchk.c:2026
+#: plugins/spellchk.c:2032
 msgid "You _type:"
 msgstr "_Kirjoitettu:"
 
-#: ../plugins/spellchk.c:2042
+#: plugins/spellchk.c:2048
 msgid "You _send:"
 msgstr "_Lähetetty:"
 
-#: ../plugins/spellchk.c:2054
+#: plugins/spellchk.c:2060
 msgid "Only replace _whole words"
 msgstr "Korvaa vain _kokonaiset sanat"
 
-#: ../plugins/spellchk.c:2091
+#: plugins/spellchk.c:2097
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../plugins/spellchk.c:2093 ../plugins/spellchk.c:2094
+#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
 
@@ -1023,7 +995,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ssl/ssl-gnutls.c:227
+#: plugins/ssl/ssl-gnutls.c:227
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1031,7 +1003,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-gnutls.c:230 ../plugins/ssl/ssl-gnutls.c:232
+#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -1041,7 +1013,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ssl/ssl-nss.c:319
+#: plugins/ssl/ssl-nss.c:319
 msgid "NSS"
 msgstr "NSS"
 
@@ -1049,7 +1021,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-nss.c:322 ../plugins/ssl/ssl-nss.c:324
+#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -1059,7 +1031,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ssl/ssl.c:94
+#: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1067,39 +1039,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
-#: ../plugins/statenotify.c:42
+#: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
 msgstr "%s poistui."
 
-#: ../plugins/statenotify.c:49
+#: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s palasi."
 
-#: ../plugins/statenotify.c:56
+#: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
 msgstr "%s on jouten."
 
-#: ../plugins/statenotify.c:63
+#: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ei enää ole jouten."
 
-#: ../plugins/statenotify.c:74
+#: plugins/statenotify.c:74
 msgid "Notify When"
 msgstr "Huomautus kun"
 
-#: ../plugins/statenotify.c:77
+#: plugins/statenotify.c:77
 msgid "Buddy Goes _Away"
 msgstr "Tuttava _poistuu"
 
-#: ../plugins/statenotify.c:80
+#: plugins/statenotify.c:80
 msgid "Buddy Goes _Idle"
 msgstr "Tuttava on _jouten"
 
@@ -1109,7 +1081,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/statenotify.c:120
+#: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "Tuttavan tilan ilmoitus"
 
@@ -1117,7 +1089,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/statenotify.c:123 ../plugins/statenotify.c:126
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1125,11 +1097,11 @@
 "Ilmoittaa keskusteluikkunassa kun tuttava on poissa tai jouten ja kun hän "
 "palaa."
 
-#: ../plugins/tcl/tcl.c:363
+#: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-liitännäisten lataaja"
 
-#: ../plugins/tcl/tcl.c:365 ../plugins/tcl/tcl.c:366
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcl-liitännäisten latauksen."
 
@@ -1139,7 +1111,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ticker/ticker.c:75 ../plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
 msgid "Buddy Ticker"
 msgstr "Rullaava tuttavataulu"
 
@@ -1147,33 +1119,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ticker/ticker.c:329 ../plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
 
-#: ../plugins/timestamp.c:202
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "iChat-tyylinen aikaleima"
 
-#: ../plugins/timestamp.c:209
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "Viive"
 
-#: ../plugins/timestamp.c:216
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "minuuttia."
 
-#: ../plugins/timestamp.c:222
-msgid "_Apply"
-msgstr "_Toteuta"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:287
+#: plugins/timestamp.c:279
 msgid "Timestamp"
 msgstr "Aikaleima"
 
@@ -1181,52 +1149,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:290 ../plugins/timestamp.c:292
+#: plugins/timestamp.c:282 plugins/timestamp.c:284
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Lisää iChat-tyylisen aikaleiman keskusteluihin N minuutin välein."
 
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
+#: plugins/win32/transparency/win2ktrans.c:183
+#: plugins/win32/transparency/win2ktrans.c:569
+#: plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
 msgstr "Peitto:"
 
 #. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
+#: plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "Pikaviesti-ikkunat"
 
 # NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:534
+#: plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
 
-#: ../plugins/win32/transparency/win2ktrans.c:548
+#: plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 # NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:555
+#: plugins/win32/transparency/win2ktrans.c:555
 msgid "Remove IM window transparency on focus"
 msgstr "Poista pikaviesti-ikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
+#: plugins/win32/transparency/win2ktrans.c:558
+#: plugins/win32/transparency/win2ktrans.c:606
 msgid "Always on top"
 msgstr "Aina päällimmäisenä"
 
 #. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
+#: plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
 # NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:591
+#: plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "_Tuttavalistaikkunan läpinäkyvyys"
 
 # NOTE source: gimp + google
-#: ../plugins/win32/transparency/win2ktrans.c:604
+#: plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Poista tuttavalistaikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
@@ -1237,19 +1205,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
 
 #. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: plugins/win32/transparency/win2ktrans.c:662
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1261,66 +1229,65 @@
 "\n"
 "Huomaa: Tämä liitännäinen vaatii Win2000 tai uudemman."
 
-#: ../plugins/win32/winprefs/winprefs.c:385
+#: plugins/win32/winprefs/winprefs.c:385
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime -versio"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:393
+#: plugins/win32/winprefs/winprefs.c:393
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: ../plugins/win32/winprefs/winprefs.c:394
+#: plugins/win32/winprefs/winprefs.c:394
 msgid "_Start Gaim on Windows startup"
 msgstr "_Käynnistä Gaim Windowsin käynnistyessä."
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:405 ../src/gtkblist.c:3514
-#: ../src/gtkprefs.c:2163
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: plugins/win32/winprefs/winprefs.c:406
 msgid "_Dockable Buddy List"
 msgstr "_Telakoi tuttavalista ruudun reunaan"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:410
 msgid "_Keep Buddy List window on top:"
 msgstr "_Pidä tuttavalistaikkuna päällimmäisenä:"
 
-#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:1820
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../plugins/win32/winprefs/winprefs.c:413
+#: plugins/win32/winprefs/winprefs.c:413
 msgid "Always"
 msgstr "Aina"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:415
+#: plugins/win32/winprefs/winprefs.c:415
 msgid "Only when docked"
 msgstr "Vain telakoituna"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:419 ../src/gtkprefs.c:938
-#: ../src/gtkprefs.c:2164
+#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
+#: src/gtkprefs.c:1727
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../plugins/win32/winprefs/winprefs.c:420
+#: plugins/win32/winprefs/winprefs.c:420
 msgid "_Flash window when messages are received"
 msgstr "_Vilkuta ikkunaa viestien saapuessa"
 
-#: ../plugins/win32/winprefs/winprefs.c:443
+#: plugins/win32/winprefs/winprefs.c:443
 msgid "WinGaim Options"
 msgstr "WinGaim-valinnat"
 
-#: ../plugins/win32/winprefs/winprefs.c:445
+#: plugins/win32/winprefs/winprefs.c:445
 msgid "Options specific to Windows Gaim."
 msgstr "Windows-Gaimin erityiset asetukset"
 
-#: ../plugins/win32/winprefs/winprefs.c:446
+#: plugins/win32/winprefs/winprefs.c:446
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1328,143 +1295,143 @@
 "Tarjoaa Windows Gaim -sidonnaisia valintoja, kuten tuttavalistan telakoinnin "
 "ja keskustelujen vilkuttamisen."
 
-#: ../src/account.c:773
+#: src/account.c:773
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../src/account.c:915
+#: src/account.c:915
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../src/account.c:940
+#: src/account.c:940
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../src/account.c:947
+#: src/account.c:947
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../src/account.c:952
+#: src/account.c:952
 msgid "Save password"
 msgstr "Tallenna salasana"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: ../src/account.c:960 ../src/account.c:1114 ../src/gtkdialogs.c:505
-#: ../src/gtkdialogs.c:646 ../src/gtkdialogs.c:702 ../src/gtkrequest.c:260
-#: ../src/protocols/gg/gg.c:434 ../src/protocols/gg/gg.c:581
-#: ../src/protocols/gg/gg.c:1512 ../src/protocols/jabber/jabber.c:1135
-#: ../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:2900
-#: ../src/protocols/oscar/oscar.c:4408 ../src/protocols/oscar/oscar.c:4489
-#: ../src/protocols/oscar/oscar.c:7857 ../src/protocols/oscar/oscar.c:7982
-#: ../src/protocols/oscar/oscar.c:8007 ../src/protocols/oscar/oscar.c:8059
-#: ../src/protocols/silc/buddy.c:465 ../src/protocols/silc/buddy.c:1137
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
-#: ../src/protocols/silc/chat.c:723 ../src/protocols/silc/ops.c:1083
-#: ../src/protocols/silc/ops.c:1696 ../src/protocols/silc/silc.c:724
-#: ../src/protocols/yahoo/yahoo.c:2952 ../src/protocols/yahoo/yahoo.c:2961
-#: ../src/request.h:1331
+#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
+#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
+#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
+#: 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:2894
+#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
+#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
+#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
+#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
+#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
+#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:961 ../src/account.c:1115 ../src/account.c:1153
-#: ../src/gtkaccount.c:2089 ../src/gtkaccount.c:2544 ../src/gtkblist.c:4817
-#: ../src/gtkdialogs.c:506 ../src/gtkdialogs.c:647 ../src/gtkdialogs.c:703
-#: ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:744 ../src/gtkdialogs.c:764
-#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:870 ../src/gtkdialogs.c:912
-#: ../src/gtkdialogs.c:954 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkprivacy.c:595 ../src/gtkprivacy.c:608 ../src/gtkprivacy.c:633
-#: ../src/gtkprivacy.c:644 ../src/gtkrequest.c:261
-#: ../src/gtksavedstatuses.c:188 ../src/protocols/gg/gg.c:435
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/gg/gg.c:656
-#: ../src/protocols/gg/gg.c:1513 ../src/protocols/jabber/buddy.c:572
-#: ../src/protocols/jabber/chat.c:780 ../src/protocols/jabber/jabber.c:707
-#: ../src/protocols/jabber/jabber.c:1136 ../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:1594
-#: ../src/protocols/oscar/oscar.c:2901 ../src/protocols/oscar/oscar.c:4366
-#: ../src/protocols/oscar/oscar.c:4409 ../src/protocols/oscar/oscar.c:4446
-#: ../src/protocols/oscar/oscar.c:4490 ../src/protocols/oscar/oscar.c:7858
-#: ../src/protocols/oscar/oscar.c:7983 ../src/protocols/oscar/oscar.c:8008
-#: ../src/protocols/oscar/oscar.c:8060 ../src/protocols/oscar/oscar.c:8129
-#: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1042
-#: ../src/protocols/silc/buddy.c:1138 ../src/protocols/silc/chat.c:595
-#: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1697
-#: ../src/protocols/silc/silc.c:725 ../src/protocols/trepia/trepia.c:348
-#: ../src/protocols/yahoo/yahoo.c:2953 ../src/protocols/yahoo/yahoo.c:2962
-#: ../src/request.h:1331 ../src/request.h:1341
+#: src/account.c:961 src/account.c:1117 src/account.c:1155
+#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
+#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
+#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
+#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
+#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
+#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
+#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1163 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:1596
+#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
+#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
+#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
+#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
+#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
+#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
+#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
+#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
+#: src/request.h:1331 src/request.h:1341
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../src/account.c:983 ../src/connection.c:96
+#: src/account.c:986 src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-protokollaliitännäinen puuttuu"
 
-#: ../src/account.c:985 ../src/connection.c:99
+#: src/account.c:988 src/connection.c:99
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../src/account.c:1049 ../src/protocols/gg/gg.c:470
-#: ../src/protocols/jabber/jabber.c:1088
+#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/protocols/jabber/jabber.c:1115
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../src/account.c:1058
+#: src/account.c:1061
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../src/account.c:1083
+#: src/account.c:1085
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../src/account.c:1090
+#: src/account.c:1092
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../src/account.c:1097
+#: src/account.c:1099
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../src/account.c:1103
+#: src/account.c:1105
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../src/account.c:1111
+#: src/account.c:1113
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../src/account.c:1144
+#: src/account.c:1146
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../src/account.c:1152 ../src/gtkdebug.c:684 ../src/gtkrequest.c:267
-#: ../src/protocols/jabber/buddy.c:571 ../src/protocols/trepia/trepia.c:347
+#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/account.c:1635 ../src/gtkft.c:156
-#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:1082
-#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/novell/novell.c:2837
+#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
+#: src/protocols/novell/novell.c:2837
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/blist.c:545
+#: src/blist.c:545
 msgid "buddy list"
 msgstr "tuttavalista"
 
-#: ../src/blist.c:1162
+#: src/blist.c:1162
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
-#: ../src/blist.c:1863
+#: src/blist.c:1863
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1479,72 +1446,72 @@
 "%d tuttavaa ryhmästä %s ei poistettu koska sen käyttäjät ei olleet "
 "kirjautuneena sisään. Näitä tuttavia ja ryhmiä ei poistettu.\n"
 
-#: ../src/blist.c:1872
+#: src/blist.c:1872
 msgid "Group not removed"
 msgstr "Ryhmää ei poistettu"
 
-#: ../src/connection.c:98
+#: src/connection.c:98
 msgid "Registration Error"
 msgstr "Rekisteröintivirhe"
 
-#: ../src/conversation.c:205
+#: src/conversation.c:205
 msgid "Unable to send message: The message is too large."
 msgstr "Viestiä ei voitu lähettää: viesti on liian suuri."
 
-#: ../src/conversation.c:208 ../src/conversation.c:221
+#: src/conversation.c:208 src/conversation.c:221
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../src/conversation.c:209
+#: src/conversation.c:209
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../src/conversation.c:218
+#: src/conversation.c:218
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: ../src/conversation.c:1515
+#: src/conversation.c:1497
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../src/conversation.c:1517
+#: src/conversation.c:1499
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../src/conversation.c:1616
+#: src/conversation.c:1598
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../src/conversation.c:1631
+#: src/conversation.c:1613
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../src/conversation.c:1687
+#: src/conversation.c:1669
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: ../src/conversation.c:1689
+#: src/conversation.c:1671
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../src/conversation.c:1766
+#: src/conversation.c:1748
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d muuta)"
 
-#: ../src/conversation.c:1768
+#: src/conversation.c:1750
 #, c-format
 msgid " left the room (%s)."
 msgstr " poistui huoneesta (%s)."
 
-#: ../src/ft.c:188 ../src/protocols/msn/msn.c:412
+#: src/ft.c:188 src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1553,7 +1520,7 @@
 "Virhe luettaessa %s:  \n"
 "%s.\n"
 
-#: ../src/ft.c:192
+#: src/ft.c:192
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1562,7 +1529,7 @@
 "Virhe kirjoitettaessa %s: \n"
 "%s.\n"
 
-#: ../src/ft.c:196
+#: src/ft.c:196
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1571,35 +1538,35 @@
 "Virhe käytettäessä tiedostoa %s: \n"
 "%s.\n"
 
-#: ../src/ft.c:229
+#: src/ft.c:229
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ei voida lähettää tiedostoa, jonka koko on 0 tavua."
 
-#: ../src/ft.c:239
+#: src/ft.c:239
 msgid "Cannot send a directory."
 msgstr "Ei voida lähettää kansiota."
 
-#: ../src/ft.c:248
+#: src/ft.c:248
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
 
-#: ../src/ft.c:306
+#: src/ft.c:306
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: ../src/ft.c:313
+#: src/ft.c:313
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "Käyttäjä %s tahtoo lähettää sinulle tiedoston"
 
-#: ../src/ft.c:354
+#: src/ft.c:354
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
 
-#: ../src/ft.c:358
+#: src/ft.c:358
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1610,65 +1577,65 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../src/ft.c:382
+#: src/ft.c:382
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../src/ft.c:422
+#: src/ft.c:422
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../src/ft.c:443
+#: src/ft.c:443
 #, 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:454
+#: src/ft.c:454
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
-#: ../src/ft.c:608
+#: src/ft.c:608
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../src/ft.c:611
+#: src/ft.c:611
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../src/ft.c:995
+#: src/ft.c:995
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../src/ft.c:1000
+#: src/ft.c:1000
 msgid "File transfer cancelled"
 msgstr "Tiedostosiirto peruutettu"
 
-#: ../src/ft.c:1057
+#: src/ft.c:1057
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../src/ft.c:1062
+#: src/ft.c:1062
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostosiirron"
 
-#: ../src/ft.c:1119
+#: src/ft.c:1119
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
 
-#: ../src/ft.c:1121
+#: src/ft.c:1121
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
 
-#: ../src/gtkaccount.c:363
+#: src/gtkaccount.c:362
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1680,153 +1647,152 @@
 "<b>Kuvan koko:</b> %d × %d"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:731
+#: src/gtkaccount.c:730
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../src/gtkaccount.c:748 ../src/gtkft.c:623
+#: src/gtkaccount.c:747 src/gtkft.c:623
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: ../src/gtkaccount.c:753 ../src/gtkblist.c:4371
+#: src/gtkaccount.c:752 src/gtkblist.c:4051
 msgid "Screen Name:"
 msgstr "Näyttönimi:"
 
-#: ../src/gtkaccount.c:826
+#: src/gtkaccount.c:825
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gtkaccount.c:831 ../src/gtkblist.c:4385 ../src/gtkblist.c:4764
+#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../src/gtkaccount.c:835
+#: src/gtkaccount.c:834
 msgid "Remember password"
 msgstr "Muista salasana"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:880
+#: src/gtkaccount.c:879
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: ../src/gtkaccount.c:893
+#: src/gtkaccount.c:892
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../src/gtkaccount.c:902
+#: src/gtkaccount.c:901
 msgid "Buddy icon:"
 msgstr "Tuttavakuvake:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:991
+#: src/gtkaccount.c:990
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
 #. Use Global Proxy Settings
-#: ../src/gtkaccount.c:1129 ../src/gtkaccount.c:1176
+#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleistä välipalvelimen asetusta"
 
 #. No Proxy
-#: ../src/gtkaccount.c:1135 ../src/gtkaccount.c:1183
+#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
 #. HTTP
-#: ../src/gtkaccount.c:1141 ../src/gtkaccount.c:1190
+#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: ../src/gtkaccount.c:1147 ../src/gtkaccount.c:1197
+#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: ../src/gtkaccount.c:1153 ../src/gtkaccount.c:1204
+#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: ../src/gtkaccount.c:1159 ../src/gtkaccount.c:1211 ../src/gtkprefs.c:1138
+#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
-#: ../src/gtkaccount.c:1250
+#: src/gtkaccount.c:1249
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../src/gtkaccount.c:1254
+#: src/gtkaccount.c:1253
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: ../src/gtkaccount.c:1270
+#: src/gtkaccount.c:1269
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../src/gtkaccount.c:1288 ../src/gtkprefs.c:1132
+#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../src/gtkaccount.c:1297 ../src/gtkprefs.c:1159
+#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../src/gtkaccount.c:1301 ../src/gtkprefs.c:1177
+#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../src/gtkaccount.c:1309
+#: src/gtkaccount.c:1308
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../src/gtkaccount.c:1314 ../src/gtkprefs.c:1214
+#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../src/gtkaccount.c:1702
+#: src/gtkaccount.c:1700
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../src/gtkaccount.c:1704
+#: src/gtkaccount.c:1702
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
 #. Register button
-#: ../src/gtkaccount.c:1751 ../src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../src/gtkaccount.c:2083 ../src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../src/gtkaccount.c:2088 ../src/gtkrequest.c:264
-#: ../src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gtkaccount.c:2145 ../src/gtksavedstatuses.c:626
-#: ../src/protocols/oscar/oscar.c:5053
+#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
+#: src/protocols/oscar/oscar.c:5049
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../src/gtkaccount.c:2168
+#: src/gtkaccount.c:2210
 msgid "Enabled"
 msgstr "Päällä"
 
-#: ../src/gtkaccount.c:2176
+#: src/gtkaccount.c:2218
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/gtkaccount.c:2519
+#: src/gtkaccount.c:2550
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s on tehnyt %s tuttavansa%s%s%s"
 
-#: ../src/gtkaccount.c:2533
+#: src/gtkaccount.c:2564
 msgid ""
 "\n"
 "\n"
@@ -1836,115 +1802,115 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../src/gtkaccount.c:2541
+#: src/gtkaccount.c:2572
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../src/gtkaccount.c:2543 ../src/gtkblist.c:4816 ../src/gtkconv.c:1499
-#: ../src/gtkrequest.c:265 ../src/protocols/gg/gg.c:655
-#: ../src/protocols/oscar/oscar.c:4678 ../src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
+#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
+#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/gtkblist.c:886
+#: src/gtkblist.c:595
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/gtkblist.c:907
+#: src/gtkblist.c:616
 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:918 ../src/gtkpounce.c:415 ../src/gtkroomlist.c:354
+#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../src/gtkblist.c:1223
+#: src/gtkblist.c:935
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../src/gtkblist.c:1226
+#: src/gtkblist.c:938
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../src/gtkblist.c:1232
+#: src/gtkblist.c:944
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../src/gtkblist.c:1238
+#: src/gtkblist.c:950
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../src/gtkblist.c:1242 ../src/gtkblist.c:1246 ../src/gtkblist.c:1344
-#: ../src/gtkblist.c:1367
+#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
+#: src/gtkblist.c:1079
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../src/gtkblist.c:1257
+#: src/gtkblist.c:969
 msgid "_Alias Buddy..."
 msgstr "Anna tuttavalle _alias"
 
-#: ../src/gtkblist.c:1259
+#: src/gtkblist.c:971
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../src/gtkblist.c:1261
+#: src/gtkblist.c:973
 msgid "Alias Contact..."
 msgstr "Anna kontaktiryhmälle alias..."
 
-#: ../src/gtkblist.c:1264 ../src/gtkdialogs.c:806 ../src/gtkdialogs.c:807
+#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../src/gtkblist.c:1268 ../src/gtkblist.c:1352 ../src/gtkblist.c:1373
+#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:1270 ../src/gtkblist.c:1354 ../src/gtkblist.c:1375
+#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/gtkblist.c:1316
+#: src/gtkblist.c:1028
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../src/gtkblist.c:1318
+#: src/gtkblist.c:1030
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:1320
+#: src/gtkblist.c:1032
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkblist.c:1322
+#: src/gtkblist.c:1034
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../src/gtkblist.c:1340 ../src/gtkroomlist.c:264 ../src/gtkroomlist.c:409
-#: ../src/gtkstock.c:118
+#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:118
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/gtkblist.c:1342
+#: src/gtkblist.c:1054
 msgid "Auto-Join"
 msgstr "Kirjaudu sisään automaattisesti"
 
-#: ../src/gtkblist.c:1380 ../src/gtkblist.c:1403
+#: src/gtkblist.c:1092 src/gtkblist.c:1115
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../src/gtkblist.c:1408
+#: src/gtkblist.c:1120
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../src/gtkblist.c:1635 ../src/gtkblist.c:1645 ../src/gtkblist.c:3646
-#: ../src/gtkblist.c:3649
+#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
+#: src/gtkblist.c:3331
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../src/gtkblist.c:2104 ../src/gtkconv.c:3707 ../src/gtkpounce.c:314
+#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -1952,117 +1918,124 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2673
+#: src/gtkblist.c:2329
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../src/gtkblist.c:2674
+#: src/gtkblist.c:2330
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../src/gtkblist.c:2675
+#: src/gtkblist.c:2331
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:2676
+#: src/gtkblist.c:2332
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../src/gtkblist.c:2677
+#: src/gtkblist.c:2333
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../src/gtkblist.c:2679
+#: src/gtkblist.c:2335
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:2680
+#: src/gtkblist.c:2336
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:2681
+#: src/gtkblist.c:2337
+#, fuzzy
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
+
+#: src/gtkblist.c:2338 src/gtkblist.c:5158
+#, fuzzy
+msgid "/Buddies/Sort Buddies"
+msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
+
+#: src/gtkblist.c:2340
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../src/gtkblist.c:2682
+#: src/gtkblist.c:2341
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:2683
+#: src/gtkblist.c:2342
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../src/gtkblist.c:2685
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Tools
-#: ../src/gtkblist.c:2688
+#: src/gtkblist.c:2347
 msgid "/_Tools"
 msgstr "/_Työkalut"
 
-#: ../src/gtkblist.c:2689
+#: src/gtkblist.c:2348
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Työkalut/Tuttava_ilmoitin"
 
-#: ../src/gtkblist.c:2690
+#: src/gtkblist.c:2349
 msgid "/Tools/Account Ac_tions"
 msgstr "/Työkalut/_Käyttäjätilitoiminnot"
 
-#: ../src/gtkblist.c:2691
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/Työkalut/_Liitännäistoiminnot"
-
-#: ../src/gtkblist.c:2693
-msgid "/Tools/_Statuses"
-msgstr "/Työkalut/_Tilat"
-
-#: ../src/gtkblist.c:2694
+#: src/gtkblist.c:2351
 msgid "/Tools/A_ccounts"
 msgstr "/Työkalut/_Käyttäjätilit"
 
-#: ../src/gtkblist.c:2695
+#: src/gtkblist.c:2352
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../src/gtkblist.c:2696
+#: src/gtkblist.c:2353
+#, fuzzy
+msgid "/Tools/P_lugins"
+msgstr "/Työkalut/Liitännäistoiminnot"
+
+#: src/gtkblist.c:2354
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../src/gtkblist.c:2697
+#: src/gtkblist.c:2355
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostosiirrot..."
 
-#: ../src/gtkblist.c:2698
+#: src/gtkblist.c:2356
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
-#: ../src/gtkblist.c:2700
+#: src/gtkblist.c:2358
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
-#: ../src/gtkblist.c:2701
+#: src/gtkblist.c:2359
 msgid "/Tools/View System _Log"
 msgstr "/Työkalut/Näytä järjestelmä_loki"
 
 #. Help
-#: ../src/gtkblist.c:2704
+#: src/gtkblist.c:2362
 msgid "/_Help"
 msgstr "/_Ohje"
 
-#: ../src/gtkblist.c:2705
+#: src/gtkblist.c:2363
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Ohjeita verkossa"
 
-#: ../src/gtkblist.c:2706
+#: src/gtkblist.c:2364
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../src/gtkblist.c:2707
+#: src/gtkblist.c:2365
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../src/gtkblist.c:2739 ../src/gtkblist.c:2806
+#: src/gtkblist.c:2397 src/gtkblist.c:2464
 #, c-format
 msgid ""
 "\n"
@@ -2071,7 +2044,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../src/gtkblist.c:2815
+#: src/gtkblist.c:2473
 #, c-format
 msgid ""
 "\n"
@@ -2080,7 +2053,7 @@
 "\n"
 "<b>Kontaktin Alias:</b> %s"
 
-#: ../src/gtkblist.c:2823
+#: src/gtkblist.c:2481
 #, c-format
 msgid ""
 "\n"
@@ -2089,7 +2062,7 @@
 "\n"
 "<b>Alias:</b> %s"
 
-#: ../src/gtkblist.c:2831
+#: src/gtkblist.c:2489
 #, c-format
 msgid ""
 "\n"
@@ -2098,7 +2071,7 @@
 "\n"
 "<b>Kutsumanimi:</b> %s"
 
-#: ../src/gtkblist.c:2840
+#: src/gtkblist.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -2107,7 +2080,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> %s"
 
-#: ../src/gtkblist.c:2852
+#: src/gtkblist.c:2510
 #, c-format
 msgid ""
 "\n"
@@ -2116,7 +2089,7 @@
 "\n"
 "<b>Jouten:</b> %s"
 
-#: ../src/gtkblist.c:2888
+#: src/gtkblist.c:2546
 #, c-format
 msgid ""
 "\n"
@@ -2125,7 +2098,7 @@
 "\n"
 "<b>Viimeksi nähty:</b> %s sitten"
 
-#: ../src/gtkblist.c:2896
+#: src/gtkblist.c:2554
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2133,7 +2106,7 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: ../src/gtkblist.c:2918
+#: src/gtkblist.c:2577
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2141,7 +2114,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: ../src/gtkblist.c:2920
+#: src/gtkblist.c:2579
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2149,7 +2122,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: ../src/gtkblist.c:2922
+#: src/gtkblist.c:2581
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2157,103 +2130,105 @@
 "\n"
 "<b>Tila</b>: Rokkaava"
 
-#: ../src/gtkblist.c:3184
+#: src/gtkblist.c:2843
 #, c-format
 msgid "Idle (%dh %02dm) "
 msgstr "Jouten (%dt %02dm) "
 
-#: ../src/gtkblist.c:3186
+#: src/gtkblist.c:2845
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jouten (%dm) "
 
-#: ../src/gtkblist.c:3189
+#: src/gtkblist.c:2848
 msgid "Idle "
 msgstr "Jouten "
 
-#: ../src/gtkblist.c:3193
+#: src/gtkblist.c:2852
 msgid "Offline "
 msgstr "Poissa linjoilta "
 
-#: ../src/gtkblist.c:3309
+#: src/gtkblist.c:2968
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../src/gtkblist.c:3310 ../src/gtkblist.c:3344
+#: src/gtkblist.c:2969 src/gtkblist.c:3003
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:3311
+#: src/gtkblist.c:2970
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../src/gtkblist.c:3312
+#: src/gtkblist.c:2971
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../src/gtkblist.c:3313
+#: src/gtkblist.c:2972
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../src/gtkblist.c:3314
+#: src/gtkblist.c:2973
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../src/gtkblist.c:3347
+#: src/gtkblist.c:3006
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../src/gtkblist.c:3350
+#: src/gtkblist.c:3009
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../src/gtkblist.c:3426 ../src/protocols/jabber/jabber.c:968
-#: ../src/protocols/yahoo/yahoo.c:2779
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../src/gtkblist.c:3428
-msgid "Alphabetical"
+#: src/gtkblist.c:3085
+#, fuzzy
+msgid "Manually"
+msgstr "Oma komento"
+
+#: src/gtkblist.c:3087
+#, fuzzy
+msgid "Alphabetically"
 msgstr "Aakkosellinen"
 
-#: ../src/gtkblist.c:3429
+#: src/gtkblist.c:3088
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../src/gtkblist.c:3430
+#: src/gtkblist.c:3089
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../src/gtkblist.c:3542
+#: src/gtkblist.c:3201
 msgid "/Tools/Buddy Pounce"
 msgstr "/Työkalut/Tuttavailmoitin"
 
-#: ../src/gtkblist.c:3543
+#: src/gtkblist.c:3202
 msgid "/Tools/Account Actions"
 msgstr "/Työkalut/Käyttäjätilitoiminnot"
 
-#: ../src/gtkblist.c:3544
-msgid "/Tools/Plugin Actions"
-msgstr "/Työkalut/Liitännäistoiminnot"
-
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3642
+#: src/gtkblist.c:3322
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:3644
+#: src/gtkblist.c:3324
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:4325 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:994 ../src/protocols/silc/buddy.c:1039
-#: ../src/protocols/silc/buddy.c:1129 ../src/protocols/yahoo/yahoo.c:2877
+#: src/gtkblist.c:3328
+#, fuzzy
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
+
+#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
+#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../src/gtkblist.c:4349
+#: src/gtkblist.c:4029
 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. "
@@ -2264,15 +2239,15 @@
 "näyttönimen sijasta aina kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4412 ../src/gtkblist.c:4744
+#: src/gtkblist.c:4092 src/gtkblist.c:4424
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../src/gtkblist.c:4677
+#: src/gtkblist.c:4357
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä protokolla ei tue keskusteluhuoneita."
 
-#: ../src/gtkblist.c:4693
+#: src/gtkblist.c:4373
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2280,11 +2255,11 @@
 "Et ole kirjautuneena millään protokollalla jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../src/gtkblist.c:4710
+#: src/gtkblist.c:4390
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:4734
+#: src/gtkblist.c:4414
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2292,46 +2267,51 @@
 "Anna alias, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../src/gtkblist.c:4813
+#: src/gtkblist.c:4493
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../src/gtkblist.c:4814
+#: src/gtkblist.c:4494
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../src/gtkblist.c:5364 ../src/gtkblist.c:5460
+#: src/gtkblist.c:5025
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../src/gtkconn.c:190
-#, c-format
-msgid "%s could not connect"
-msgstr "%s ei voinut yhdistää"
-
-#: ../src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was unable to connect due to an error. %s The account has been disabled. "
-"Correct the error and reenable to account to connect."
+#: src/gtkblist.c:5094
+#, fuzzy
+msgid "/Tools"
+msgstr "/_Työkalut"
+
+#: src/gtkconn.c:190
+#, fuzzy, c-format
+msgid "%s disconnected"
+msgstr "Yhteys katkennut"
+
+#: src/gtkconn.c:191
+#, fuzzy, c-format
+msgid ""
+"%s was disconnected due to an error. %s The account has been disabled. "
+"Correct the error and reenable the account to connect."
 msgstr ""
 "%s ei voinut yhdistää virheen takia. %s Käyttäjätili on otettu pois käytöstä."
 "Korjaa ongelma ja ota käyttäjätili jälleen käyttöön yhdistääksesi."
 
-#: ../src/gtkconv.c:324
+#: src/gtkconv.c:325
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "Minä käytän Gaimin versiota v%s."
 
-#: ../src/gtkconv.c:333
+#: src/gtkconv.c:334
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../src/gtkconv.c:370
+#: src/gtkconv.c:371
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../src/gtkconv.c:373
+#: src/gtkconv.c:374
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2339,331 +2319,341 @@
 "Kirjoita \"/help &alt;komento>\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../src/gtkconv.c:445
+#: src/gtkconv.c:446
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../src/gtkconv.c:452
+#: src/gtkconv.c:453
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../src/gtkconv.c:457
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../src/gtkconv.c:464
+#: src/gtkconv.c:465
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../src/gtkconv.c:467
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../src/gtkconv.c:471
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle protokollalle."
 
-#: ../src/gtkconv.c:697 ../src/gtkconv.c:723
+#: src/gtkconv.c:699 src/gtkconv.c:725
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa protokollaa kuin tämä ryhmäkeskustelu."
 
-#: ../src/gtkconv.c:717
+#: src/gtkconv.c:719
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../src/gtkconv.c:770
+#: src/gtkconv.c:772
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:800
+#: src/gtkconv.c:802
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../src/gtkconv.c:821
+#: src/gtkconv.c:823
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../src/gtkconv.c:841 ../src/gtksavedstatuses.c:778
+#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../src/gtkconv.c:898 ../src/gtkconv.c:2196 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:470
+#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../src/gtkconv.c:904
+#: src/gtkconv.c:906
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../src/gtkconv.c:928
+#: src/gtkconv.c:930
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../src/gtkconv.c:1028 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/gtkconv.c:1054 ../src/gtkdebug.c:193
+#: src/gtkconv.c:1056 src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../src/gtkconv.c:1461
+#: src/gtkconv.c:1227
+#, fuzzy
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
+
+#: src/gtkconv.c:1235
+#, fuzzy
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
+
+#: src/gtkconv.c:1489
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../src/gtkconv.c:1467 ../src/protocols/oscar/oscar.c:626
+#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../src/gtkconv.c:1474
+#: src/gtkconv.c:1502
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../src/gtkconv.c:1477
+#: src/gtkconv.c:1505
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../src/gtkconv.c:1483
+#: src/gtkconv.c:1511
 msgid "Info"
 msgstr "Tietoja"
 
-#: ../src/gtkconv.c:1489
+#: src/gtkconv.c:1517
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../src/gtkconv.c:1496 ../src/gtkrequest.c:266
+#: src/gtkconv.c:1524 src/gtkrequest.c:267
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/gtkconv.c:2204
+#: src/gtkconv.c:2236
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../src/gtkconv.c:2227
+#: src/gtkconv.c:2259
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../src/gtkconv.c:2277
+#: src/gtkconv.c:2308
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../src/gtkconv.c:2282
+#: src/gtkconv.c:2313
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../src/gtkconv.c:2288
+#: src/gtkconv.c:2319
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2336
+#: src/gtkconv.c:2367
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../src/gtkconv.c:2338
+#: src/gtkconv.c:2369
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../src/gtkconv.c:2343
+#: src/gtkconv.c:2374
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../src/gtkconv.c:2345
+#: src/gtkconv.c:2376
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä _loki..."
 
-#: ../src/gtkconv.c:2346
+#: src/gtkconv.c:2377
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../src/gtkconv.c:2348
+#: src/gtkconv.c:2379
 msgid "/Conversation/Clear"
 msgstr "/Keskustelu/Tyhjennä"
 
-#: ../src/gtkconv.c:2352
+#: src/gtkconv.c:2383
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2353
+#: src/gtkconv.c:2384
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../src/gtkconv.c:2355
+#: src/gtkconv.c:2386
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../src/gtkconv.c:2357
+#: src/gtkconv.c:2388
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../src/gtkconv.c:2362
+#: src/gtkconv.c:2393
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../src/gtkconv.c:2364
+#: src/gtkconv.c:2395
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../src/gtkconv.c:2366
+#: src/gtkconv.c:2397
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../src/gtkconv.c:2368
+#: src/gtkconv.c:2399
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../src/gtkconv.c:2373
+#: src/gtkconv.c:2404
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../src/gtkconv.c:2375
+#: src/gtkconv.c:2406
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../src/gtkconv.c:2380
+#: src/gtkconv.c:2411
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../src/gtkconv.c:2384
+#: src/gtkconv.c:2415
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../src/gtkconv.c:2385
+#: src/gtkconv.c:2416
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2386
+#: src/gtkconv.c:2417
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../src/gtkconv.c:2387
+#: src/gtkconv.c:2418
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../src/gtkconv.c:2388
+#: src/gtkconv.c:2419
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../src/gtkconv.c:2389
+#: src/gtkconv.c:2420
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2429
+#: src/gtkconv.c:2460
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../src/gtkconv.c:2435
+#: src/gtkconv.c:2466
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2439
+#: src/gtkconv.c:2470
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../src/gtkconv.c:2445
+#: src/gtkconv.c:2476
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../src/gtkconv.c:2449
+#: src/gtkconv.c:2480
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../src/gtkconv.c:2455
+#: src/gtkconv.c:2486
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../src/gtkconv.c:2459
+#: src/gtkconv.c:2490
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../src/gtkconv.c:2463
+#: src/gtkconv.c:2494
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../src/gtkconv.c:2467
+#: src/gtkconv.c:2498
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../src/gtkconv.c:2473
+#: src/gtkconv.c:2504
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../src/gtkconv.c:2477
+#: src/gtkconv.c:2508
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../src/gtkconv.c:2483
+#: src/gtkconv.c:2514
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2486
+#: src/gtkconv.c:2517
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../src/gtkconv.c:2489
+#: src/gtkconv.c:2520
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../src/gtkconv.c:2492
+#: src/gtkconv.c:2523
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../src/gtkconv.c:2495
+#: src/gtkconv.c:2526
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2565
+#: src/gtkconv.c:2597
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../src/gtkconv.c:2570
+#: src/gtkconv.c:2602
 msgid "User has typed something and paused"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send As menu
-#: ../src/gtkconv.c:2710
+#: src/gtkconv.c:2740
 msgid "_Send To"
 msgstr "_Lähetä"
 
-#: ../src/gtkconv.c:3339
+#: src/gtkconv.c:3373
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3387
+#: src/gtkconv.c:3421
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../src/gtkconv.c:3466
+#: src/gtkconv.c:3500
 msgid "IM the user"
 msgstr "Lähetä pikaviesti käyttäjälle"
 
-#: ../src/gtkconv.c:3479
+#: src/gtkconv.c:3513
 msgid "Ignore the user"
 msgstr "Älä huomioi käyttäjää"
 
-#: ../src/gtkconv.c:3491
+#: src/gtkconv.c:3525
 msgid "Get the user's information"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkconv.c:4283 ../src/gtkconv.c:4385 ../src/gtkconv.c:4440
+#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../src/gtkconv.c:5480
+#: src/gtkconv.c:5582
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2671,289 +2661,294 @@
 "say <viesti>: Lähetä viesti normaalisti, niin kuin et olisi käyttämässä "
 "komentoa."
 
-#: ../src/gtkconv.c:5483
+#: src/gtkconv.c:5585
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me <toiminta>: Lähetä IRC-tyylinen toiminta tuttavalle tai keskusteluun."
 
-#: ../src/gtkconv.c:5486
+#: src/gtkconv.c:5588
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug <valinta>: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../src/gtkconv.c:5489
+#: src/gtkconv.c:5591
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../src/gtkconv.c:5492
+#: src/gtkconv.c:5594
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../src/gtkconv.c:5601
+#: src/gtkconv.c:5709
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../src/gtkconv.c:5633
+#: src/gtkconv.c:5741
 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:6272
+#: src/gtkconv.c:6408
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../src/gtkconv.c:6720
+#: src/gtkconv.c:6872
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../src/gtkconv.c:6722
+#: src/gtkconv.c:6874
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../src/gtkconv.c:6724 ../src/gtkprefs.c:1337
+#: src/gtkconv.c:6876 src/gtkprefs.c:1205
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../src/gtkconv.c:6726
+#: src/gtkconv.c:6878
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../src/gtkconv.c:6728
+#: src/gtkconv.c:6880
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../src/gtkdebug.c:232
+#: src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../src/gtkdebug.c:586
+#: src/gtkdebug.c:586
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../src/gtkdebug.c:589
+#: src/gtkdebug.c:589
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../src/gtkdebug.c:636
+#: src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
-#: ../src/gtkdebug.c:689
+#: src/gtkdebug.c:689
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../src/gtkdebug.c:698
+#: src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Tauko"
 
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
+#: src/gtkdebug.c:705 src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Aikaleimat"
 
-#: ../src/gtkdebug.c:724
+#: src/gtkdebug.c:724
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../src/gtkdebug.c:743
+#: src/gtkdebug.c:743
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../src/gtkdialogs.c:59 ../src/gtkdialogs.c:89
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
-#: ../src/gtkdialogs.c:60 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:64
-#: ../src/gtkdialogs.c:65 ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:67
-#: ../src/gtkdialogs.c:69 ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
 msgid "developer"
 msgstr "kehittäjä"
 
-#: ../src/gtkdialogs.c:61
+#: src/gtkdialogs.c:61
 msgid "developer & webmaster"
 msgstr "kehittäjä & verkkosivujen ylläpitäjä"
 
-#: ../src/gtkdialogs.c:62
+#: src/gtkdialogs.c:62
 msgid "win32 port"
 msgstr "win32-käännös"
 
-#: ../src/gtkdialogs.c:68
+#: src/gtkdialogs.c:68
 msgid "support"
 msgstr "tuki"
 
-#: ../src/gtkdialogs.c:87 ../src/gtkdialogs.c:90
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: ../src/gtkdialogs.c:88
+#: src/gtkdialogs.c:89
 msgid "libfaim maintainer"
 msgstr "libfaim-ylläpitäjä"
 
-#: ../src/gtkdialogs.c:91
+#: src/gtkdialogs.c:92
 msgid "Jabber developer"
 msgstr "Jabber-kehittäjä"
 
-#: ../src/gtkdialogs.c:92
+#: src/gtkdialogs.c:93
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../src/gtkdialogs.c:93
+#: src/gtkdialogs.c:94
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../src/gtkdialogs.c:98 ../src/gtkdialogs.c:99 ../src/gtkdialogs.c:142
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: ../src/gtkdialogs.c:100 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: src/gtkdialogs.c:101
+#, fuzzy
+msgid "Bosnian"
+msgstr "viro"
+
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../src/gtkdialogs.c:101 ../src/gtkdialogs.c:145
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../src/gtkdialogs.c:102
+#: src/gtkdialogs.c:104
 msgid "Danish"
 msgstr "tanska"
 
-#: ../src/gtkdialogs.c:103 ../src/gtkdialogs.c:146
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
 msgid "German"
 msgstr "saksa"
 
-#: ../src/gtkdialogs.c:104
+#: src/gtkdialogs.c:106
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../src/gtkdialogs.c:105
+#: src/gtkdialogs.c:107
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../src/gtkdialogs.c:106
+#: src/gtkdialogs.c:108
 msgid "Canadian English"
 msgstr "kanadan englanti"
 
-#: ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:147
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:148
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:149
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
 msgid "French"
 msgstr "ranska"
 
-#: ../src/gtkdialogs.c:110
+#: src/gtkdialogs.c:112
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../src/gtkdialogs.c:111
+#: src/gtkdialogs.c:113
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../src/gtkdialogs.c:112
+#: src/gtkdialogs.c:114
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../src/gtkdialogs.c:113 ../src/gtkdialogs.c:150
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
 msgid "Italian"
 msgstr "italia"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:151
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
 msgid "Japanese"
 msgstr "japani"
 
-#: ../src/gtkdialogs.c:115
+#: src/gtkdialogs.c:117
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../src/gtkdialogs.c:116
+#: src/gtkdialogs.c:118
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:152
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
 msgid "Korean"
 msgstr "korea"
 
-#: ../src/gtkdialogs.c:118
+#: src/gtkdialogs.c:120
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../src/gtkdialogs.c:119
+#: src/gtkdialogs.c:121
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../src/gtkdialogs.c:120
+#: src/gtkdialogs.c:122
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:153
+#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
 msgid "Polish"
 msgstr "puola"
 
-#: ../src/gtkdialogs.c:123
+#: src/gtkdialogs.c:125
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../src/gtkdialogs.c:124
+#: src/gtkdialogs.c:126
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../src/gtkdialogs.c:125
+#: src/gtkdialogs.c:127
 msgid "Romanian"
 msgstr "romania"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:155
+#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:128
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../src/gtkdialogs.c:129
+#: src/gtkdialogs.c:131
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:157
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../src/gtkdialogs.c:131
+#: src/gtkdialogs.c:133
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../src/gtkdialogs.c:132
+#: src/gtkdialogs.c:134
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../src/gtkdialogs.c:132
+#: src/gtkdialogs.c:134
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:158
+#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:159
+#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../src/gtkdialogs.c:141
+#: src/gtkdialogs.c:143
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../src/gtkdialogs.c:156
+#: src/gtkdialogs.c:158
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../src/gtkdialogs.c:200
+#: src/gtkdialogs.c:202
 msgid "About Gaim"
 msgstr "Tietoja Gaimista"
 
-#: ../src/gtkdialogs.c:224
+#: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -2964,109 +2959,109 @@
 "Zephyr- ja Gadu-Gadu-protokollia yhtä aikaa. Se on ohjelmoitu käyttäen Gtk+:"
 "aa ja on lisensoitu GNU GPL:n mukaisesti.<BR><BR>"
 
-#: ../src/gtkdialogs.c:233
+#: src/gtkdialogs.c:235
 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:236
+#: src/gtkdialogs.c:238
 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:242
+#: src/gtkdialogs.c:244
 msgid "Active Developers"
 msgstr "Aktiiviset kehittäjät"
 
-#: ../src/gtkdialogs.c:257
+#: src/gtkdialogs.c:259
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../src/gtkdialogs.c:272
+#: src/gtkdialogs.c:274
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../src/gtkdialogs.c:287
+#: src/gtkdialogs.c:289
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:307
+#: src/gtkdialogs.c:309
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../src/gtkdialogs.c:325
+#: src/gtkdialogs.c:327
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../src/gtkdialogs.c:487 ../src/gtkdialogs.c:628 ../src/gtkdialogs.c:683
+#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:492 ../src/gtkdialogs.c:633 ../src/gtkdialogs.c:688
+#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../src/gtkdialogs.c:500
+#: src/gtkdialogs.c:502
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../src/gtkdialogs.c:502
+#: src/gtkdialogs.c:504
 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 alias, jolle haluat lähettää pikaviestin."
 
-#: ../src/gtkdialogs.c:641
+#: src/gtkdialogs.c:643
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkdialogs.c:643
+#: src/gtkdialogs.c:645
 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 alias, jonka tiedot haluat nähdä."
 
-#: ../src/gtkdialogs.c:697
+#: src/gtkdialogs.c:699
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../src/gtkdialogs.c:699
+#: src/gtkdialogs.c:701
 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:718
+#: src/gtkdialogs.c:720
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle alias"
 
-#: ../src/gtkdialogs.c:719
+#: src/gtkdialogs.c:721
 msgid "Enter an alias for this contact."
 msgstr "Anna alias tälle kontaktiryhmälle."
 
-#: ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:743 ../src/gtkdialogs.c:763
-#: ../src/gtkrequest.c:268 ../src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
+#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:739
+#: src/gtkdialogs.c:741
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: ../src/gtkdialogs.c:741
+#: src/gtkdialogs.c:743
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: ../src/gtkdialogs.c:760
+#: src/gtkdialogs.c:762
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle alias"
 
-#: ../src/gtkdialogs.c:761
+#: src/gtkdialogs.c:763
 msgid "Enter an alias for this chat."
 msgstr "Syötä aliasnimi tälle ryhmäkeskustelulle."
 
-#: ../src/gtkdialogs.c:798
+#: src/gtkdialogs.c:800
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3081,7 +3076,7 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:865
+#: src/gtkdialogs.c:867
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3089,21 +3084,21 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:868 ../src/gtkdialogs.c:869
+#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../src/gtkdialogs.c:907
+#: src/gtkdialogs.c:909
 #, 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:910 ../src/gtkdialogs.c:911
+#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../src/gtkdialogs.c:949
+#: src/gtkdialogs.c:951
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3112,178 +3107,168 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../src/gtkdialogs.c:952 ../src/gtkdialogs.c:953
+#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../src/gtkft.c:138
+#: src/gtkft.c:138
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kt/s"
 
-#: ../src/gtkft.c:159 ../src/gtkft.c:1043
+#: src/gtkft.c:159 src/gtkft.c:1035
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../src/gtkft.c:162 ../src/gtkft.c:994
+#: src/gtkft.c:162 src/gtkft.c:986
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: ../src/gtkft.c:165 ../src/gtkft.c:913
+#: src/gtkft.c:165 src/gtkft.c:905
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: ../src/gtkft.c:218
+#: src/gtkft.c:218
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Otetaan vastaan käyttäjänä:</b>"
 
-#: ../src/gtkft.c:220
+#: src/gtkft.c:220
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Otetaan vastaan käyttäjältä:</b>"
 
-#: ../src/gtkft.c:224
+#: src/gtkft.c:224
 msgid "<b>Sending To:</b>"
 msgstr "<b>Lähetetään:</b>"
 
-#: ../src/gtkft.c:226
+#: src/gtkft.c:226
 msgid "<b>Sending As:</b>"
 msgstr "<b>Lähetetään käyttäjänä:</b>"
 
-#: ../src/gtkft.c:442
+#: src/gtkft.c:442
 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:447
+#: src/gtkft.c:447
 msgid "An error occurred while opening the file."
 msgstr "Virhe tapahtui avattaessa tiedostoa."
 
-#: ../src/gtkft.c:467
+#: src/gtkft.c:467
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Virhe käynnistettäessä %s: %s"
 
-#: ../src/gtkft.c:476
+#: src/gtkft.c:476
 #, c-format
 msgid "Error running %s"
 msgstr "Virhe ajettaessa %s"
 
-#: ../src/gtkft.c:477
+#: src/gtkft.c:477
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Käsittele palautettu virhekoodi %d"
 
-#: ../src/gtkft.c:572
+#: src/gtkft.c:572
 msgid "Progress"
 msgstr "Valmiina"
 
-#: ../src/gtkft.c:579
+#: src/gtkft.c:579
 msgid "Filename"
 msgstr "Tiedoston nimi"
 
-#: ../src/gtkft.c:586
+#: src/gtkft.c:586
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/gtkft.c:593
+#: src/gtkft.c:593
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: ../src/gtkft.c:624
+#: src/gtkft.c:624
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: ../src/gtkft.c:625
+#: src/gtkft.c:625
 msgid "Local File:"
 msgstr "Paikallinen tiedosto:"
 
-#: ../src/gtkft.c:626
+#: src/gtkft.c:626
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../src/gtkft.c:627
+#: src/gtkft.c:627
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../src/gtkft.c:628
+#: src/gtkft.c:628
 msgid "Time Elapsed:"
 msgstr "Aikaa kulunut:"
 
-#: ../src/gtkft.c:629
+#: src/gtkft.c:629
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: ../src/gtkft.c:715
+#: src/gtkft.c:715
 msgid "_Keep the dialog open"
 msgstr "Pidä tiedonsiirtoikkuna _auki"
 
-#: ../src/gtkft.c:725
-msgid "_Clear finished transfers"
+#: src/gtkft.c:725
+#, fuzzy
+msgid "C_lear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:734
-msgid "Show transfer details"
-msgstr "Näytä tiedostosiirron yksityiskohdat"
-
-#: ../src/gtkft.c:735
-msgid "Hide transfer details"
+#: src/gtkft.c:734
+#, fuzzy
+msgid "File transfer _details"
 msgstr "Piilota tiedostosiirron yksityiskohdat"
 
 #. Pause button
-#: ../src/gtkft.c:772 ../src/gtkstock.c:122
+#: src/gtkft.c:764 src/gtkstock.c:122
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: ../src/gtkft.c:782
+#: src/gtkft.c:774
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../src/gtkft.c:996
+#: src/gtkft.c:988
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: ../src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "Laajentajan koko"
-
-#: ../src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "Laajennusnuolen koko"
-
-#: ../src/gtkimhtml.c:814
+#: src/gtkimhtml.c:816
 msgid "Pa_ste As Text"
 msgstr "_Liimaa tekstinä"
 
-#: ../src/gtkimhtml.c:1311
+#: src/gtkimhtml.c:1313
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../src/gtkimhtml.c:1312
+#: src/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../src/gtkimhtml.c:1315
+#: src/gtkimhtml.c:1317
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../src/gtkimhtml.c:1316
+#: src/gtkimhtml.c:1318
 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:1535
+#: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/gtkimhtml.c:1547
+#: src/gtkimhtml.c:1549
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/gtkimhtml.c:1557
+#: src/gtkimhtml.c:1559
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/gtkimhtml.c:3236
+#: src/gtkimhtml.c:3234
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3293,7 +3278,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3239
+#: src/gtkimhtml.c:3237
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3303,7 +3288,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3252
+#: src/gtkimhtml.c:3250
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3314,7 +3299,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3255
+#: src/gtkimhtml.c:3253
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3325,35 +3310,35 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3335 ../src/gtkimhtml.c:3347
+#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/gtkimhtml.c:3375
+#: src/gtkimhtml.c:3373
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../src/gtkimhtmltoolbar.c:405
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3361,158 +3346,160 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../src/gtkimhtmltoolbar.c:721
+#: src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../src/gtkimhtmltoolbar.c:918
+#: src/gtkimhtmltoolbar.c:916
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../src/gtkimhtmltoolbar.c:929
+#: src/gtkimhtmltoolbar.c:927
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../src/gtkimhtmltoolbar.c:940
+#: src/gtkimhtmltoolbar.c:938
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../src/gtkimhtmltoolbar.c:956
+#: src/gtkimhtmltoolbar.c:954
 msgid "Larger font size"
 msgstr "Suurempi kirjasinkoko"
 
-#: ../src/gtkimhtmltoolbar.c:968
+#: src/gtkimhtmltoolbar.c:966
 msgid "Smaller font size"
 msgstr "Pienempi kirjasinkoko"
 
-#: ../src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:983
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: ../src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:995
 msgid "Foreground font color"
 msgstr "Kirjasimen etualaväri"
 
-#: ../src/gtkimhtmltoolbar.c:1009
+#: src/gtkimhtmltoolbar.c:1007
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: ../src/gtkimhtmltoolbar.c:1025
+#: src/gtkimhtmltoolbar.c:1023
 msgid "Clear formatting"
 msgstr "Poista muotoilu"
 
-#: ../src/gtkimhtmltoolbar.c:1040
+#: src/gtkimhtmltoolbar.c:1038
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: ../src/gtkimhtmltoolbar.c:1050
+#: src/gtkimhtmltoolbar.c:1048
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: ../src/gtkimhtmltoolbar.c:1061
+#: src/gtkimhtmltoolbar.c:1059
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: ../src/gtklog.c:200
+#: src/gtklog.c:200
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Keskustelu paikassa %s aiheesta %s"
 
-#: ../src/gtklog.c:202
+#: src/gtklog.c:202
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Keskustelu tuttavan %s kanssa aiheesta %s"
 
-#: ../src/gtklog.c:374
-msgid "Total log size:"
-msgstr "Lokin kokonaiskoko:"
-
-#: ../src/gtklog.c:422
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Enable "
-"system log preference</span> is set."
+#: src/gtklog.c:309
+#, fuzzy
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
 msgstr ""
 "Järjestelmätapahtumat kirjataan lokiin vain jos <span style=\"italic\">Ota "
 "järjestelmäloki käyttöön</span> on asetettu."
 
-#: ../src/gtklog.c:426
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
+#: src/gtklog.c:313
+#, fuzzy
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
 msgstr ""
 "Pikaviestit kirjataan lokiin vain jos <span style=\"italic\">Kirjaa kaikki "
 "pikaviestit lokiin</span> on asetettu."
 
-#: ../src/gtklog.c:429
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
+#: src/gtklog.c:316
+#, fuzzy
+msgid ""
+"Chats will only be logged if the \"Log all chats preference\" is enabled."
 msgstr ""
 "Ryhmäkeskustelut kirjataan lokiin vain jos <span style=\"italic\">Kirjaa "
 "kaikki ryhmäkeskustelut lokiin</span> on asetettu."
 
-#: ../src/gtklog.c:434
-msgid "No logs were found."
+#: src/gtklog.c:320
+#, fuzzy
+msgid "No logs were found"
 msgstr "Lokeja ei löytynyt."
 
-#: ../src/gtklog.c:480
+#: src/gtklog.c:396
+msgid "Total log size:"
+msgstr "Lokin kokonaiskoko:"
+
+#: src/gtklog.c:472
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../src/gtklog.c:488 ../src/gtklog.c:540
+#: src/gtklog.c:480 src/gtklog.c:531
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut tuttavan %s kanssa"
 
-#: ../src/gtklog.c:565
+#: src/gtklog.c:556
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
-#: ../src/gtkmain.c:326
+#: src/gtkmain.c:326
 #, 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:328
-#, c-format
+#: src/gtkmain.c:328
+#, fuzzy, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -a, --acct          display account editor window\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
+"                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "Gaim %s\n"
@@ -3527,25 +3514,34 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
+#. TODO: Should save the previous status as a transient status?
+#. Save the newly selected status to prefs.xml and status.xml
+#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
+#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
+#: src/status.c:1696
+#, fuzzy
+msgid "Default"
+msgstr "Gnomen oletus"
+
 #. Descriptive label
-#: ../src/gtknotify.c:275
+#: src/gtknotify.c:275
 #, 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:289
+#: src/gtknotify.c:289
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Lähettäjä:</span> %s\n"
 
-#: ../src/gtknotify.c:298
+#: src/gtknotify.c:298
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Aihe:</span> %s\n"
 
-#: ../src/gtknotify.c:303
+#: src/gtknotify.c:303
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3556,7 +3552,7 @@
 "\n"
 "%s%s%s%s"
 
-#: ../src/gtknotify.c:319
+#: src/gtknotify.c:319
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3567,193 +3563,193 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:502
+#: src/gtknotify.c:504
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../src/gtknotify.c:641 ../src/protocols/oscar/oscar.c:4862
+#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: ../src/gtknotify.c:642 ../src/protocols/toc/toc.c:470
+#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: ../src/gtknotify.c:685
+#: src/gtknotify.c:687
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Selainkomento <b>%s</b> on virheellinen."
 
-#: ../src/gtknotify.c:687 ../src/gtknotify.c:699 ../src/gtknotify.c:712
-#: ../src/gtknotify.c:836
+#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
+#: src/gtknotify.c:838
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../src/gtknotify.c:697 ../src/gtknotify.c:710
+#: src/gtknotify.c:699 src/gtknotify.c:712
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Virhe käynnistettäessä <b>%s</b>: %s"
 
-#: ../src/gtknotify.c:837
+#: src/gtknotify.c:839
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
 
-#: ../src/gtkpounce.c:130
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/gtkpounce.c:161
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
 #. "New Buddy Pounce"
-#: ../src/gtkpounce.c:391 ../src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../src/gtkpounce.c:391
+#: src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce Who" frame.
-#: ../src/gtkpounce.c:408
+#: src/gtkpounce.c:408
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../src/gtkpounce.c:435
+#: src/gtkpounce.c:435
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When" frame.
-#: ../src/gtkpounce.c:459
+#: src/gtkpounce.c:459
 msgid "Pounce When"
 msgstr "Ilmoitetaan kun tuttava"
 
-#: ../src/gtkpounce.c:467
+#: src/gtkpounce.c:467
 msgid "Si_gn on"
 msgstr "_kirjautuu sisään"
 
-#: ../src/gtkpounce.c:469
+#: src/gtkpounce.c:469
 msgid "Sign _off"
 msgstr "kirjautuu _ulos"
 
-#: ../src/gtkpounce.c:471
+#: src/gtkpounce.c:471
 msgid "A_way"
 msgstr "_poistuu"
 
-#: ../src/gtkpounce.c:473
+#: src/gtkpounce.c:473
 msgid "_Return from away"
 msgstr "_palaa"
 
-#: ../src/gtkpounce.c:475
+#: src/gtkpounce.c:475
 msgid "_Idle"
 msgstr "_on jouten"
 
-#: ../src/gtkpounce.c:477
+#: src/gtkpounce.c:477
 msgid "Retur_n from idle"
 msgstr "palaa oltuaan _jouten"
 
-#: ../src/gtkpounce.c:479
+#: src/gtkpounce.c:479
 msgid "Buddy starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../src/gtkpounce.c:481
+#: src/gtkpounce.c:481
 msgid "Buddy stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
 #. Create the "Pounce Action" frame.
-#: ../src/gtkpounce.c:510
+#: src/gtkpounce.c:510
 msgid "Pounce Action"
 msgstr "Ilmoittimen toiminto"
 
-#: ../src/gtkpounce.c:518
+#: src/gtkpounce.c:518
 msgid "Op_en an IM window"
 msgstr "_Avaa pikaviesti-ikkuna"
 
-#: ../src/gtkpounce.c:520
+#: src/gtkpounce.c:520
 msgid "_Popup notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../src/gtkpounce.c:522
+#: src/gtkpounce.c:522
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../src/gtkpounce.c:524
+#: src/gtkpounce.c:524
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../src/gtkpounce.c:526
+#: src/gtkpounce.c:526
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../src/gtkpounce.c:530
+#: src/gtkpounce.c:530
 msgid "B_rowse..."
 msgstr "_Selaa"
 
-#: ../src/gtkpounce.c:532
+#: src/gtkpounce.c:532
 msgid "Bro_wse..."
 msgstr "_Selaa"
 
-#: ../src/gtkpounce.c:533
+#: src/gtkpounce.c:533
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: ../src/gtkpounce.c:616
+#: src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
 msgstr "_Säilytä tämä ilmoitin aktivoinnin jälkeen"
 
 #. "Remove Buddy Pounce"
-#: ../src/gtkpounce.c:906
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: ../src/gtkpounce.c:964
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../src/gtkpounce.c:966
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../src/gtkpounce.c:968
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../src/gtkpounce.c:970
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../src/gtkpounce.c:972
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../src/gtkpounce.c:974
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../src/gtkpounce.c:976
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../src/gtkpounce.c:978
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../src/gtkpounce.c:979
+#: src/gtkpounce.c:979
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Ilmoita tästä!"
 
-#: ../src/gtkprefs.c:724
+#: src/gtkprefs.c:623
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3761,58 +3757,40 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: ../src/gtkprefs.c:759
+#: src/gtkprefs.c:658
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../src/gtkprefs.c:766 ../src/gtkprefs.c:2099
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:810
-#: ../src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Kuvaus"
 
-# NOTE source: gftt glossary
-#: ../src/gtkprefs.c:887
-msgid "Buddy List Sorting"
-msgstr "Tuttavalistan lajittelu"
-
-#: ../src/gtkprefs.c:896
-msgid "_Sorting:"
-msgstr "_Järjestys:"
-
-#: ../src/gtkprefs.c:901
-msgid "Buddy Display"
-msgstr "Tuttavien näyttö"
-
-#: ../src/gtkprefs.c:902
-msgid "Show more buddy details"
-msgstr "Näytä lisää käyttäjän yksityiskohtia"
-
-#: ../src/gtkprefs.c:940
+#: src/gtkprefs.c:805
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Lähetä _tuntemattomia \"kauttaviiva\"-komentoja viesteinä"
 
-#: ../src/gtkprefs.c:942
+#: src/gtkprefs.c:807
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../src/gtkprefs.c:944
+#: src/gtkprefs.c:809
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: ../src/gtkprefs.c:946
+#: src/gtkprefs.c:811
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../src/gtkprefs.c:948
+#: src/gtkprefs.c:813
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../src/gtkprefs.c:951
+#: src/gtkprefs.c:816
 msgid "_Highlight misspelled words"
 msgstr "_Korosta väärinkirjoitetut sanat"
 
-#: ../src/gtkprefs.c:969
+#: src/gtkprefs.c:834
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3821,152 +3799,161 @@
 "muotoiluja. :)"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:991
+#: src/gtkprefs.c:856
 msgid "Tab Options"
 msgstr "Välilehtivalinnat"
 
-#: ../src/gtkprefs.c:993
+#: src/gtkprefs.c:858
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: ../src/gtkprefs.c:1007
+#: src/gtkprefs.c:872
 msgid "Show close b_utton on tabs"
 msgstr "Näytä _sulkemispainikkeet välilehdissä"
 
-#: ../src/gtkprefs.c:1013
+#: src/gtkprefs.c:878
 msgid "_Placement:"
 msgstr "_Asettelu:"
 
-#: ../src/gtkprefs.c:1015
+#: src/gtkprefs.c:880
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: ../src/gtkprefs.c:1016
+#: src/gtkprefs.c:881
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: ../src/gtkprefs.c:1017
+#: src/gtkprefs.c:882
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: ../src/gtkprefs.c:1018
+#: src/gtkprefs.c:883
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../src/gtkprefs.c:1022
+#: src/gtkprefs.c:885
+msgid "Left Vertical"
+msgstr ""
+
+#: src/gtkprefs.c:886
+msgid "Right Vertical"
+msgstr ""
+
+#: src/gtkprefs.c:891
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../src/gtkprefs.c:1073 ../src/protocols/oscar/oscar.c:777
-#: ../src/protocols/oscar/oscar.c:5948
+#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
+#: src/protocols/oscar/oscar.c:5959
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../src/gtkprefs.c:1075
+#: src/gtkprefs.c:944
 msgid "STUN Server:"
 msgstr "STUN-palvelin:"
 
-#: ../src/gtkprefs.c:1077
+#: src/gtkprefs.c:946
 msgid "_Autodetect IP Address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../src/gtkprefs.c:1086
+#: src/gtkprefs.c:955
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../src/gtkprefs.c:1110
+#: src/gtkprefs.c:979
 msgid "Ports"
 msgstr "Portit"
 
-#: ../src/gtkprefs.c:1113
+#: src/gtkprefs.c:982
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../src/gtkprefs.c:1116
+#: src/gtkprefs.c:985
 msgid "_Start Port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../src/gtkprefs.c:1123
+#: src/gtkprefs.c:992
 msgid "_End Port:"
 msgstr "Viimeinen _portti:"
 
-#: ../src/gtkprefs.c:1130
+#: src/gtkprefs.c:999
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../src/gtkprefs.c:1134
+#: src/gtkprefs.c:1003
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../src/gtkprefs.c:1196
+#: src/gtkprefs.c:1059
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../src/gtkprefs.c:1252
+#: src/gtkprefs.c:1119
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../src/gtkprefs.c:1253
+#: src/gtkprefs.c:1120
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../src/gtkprefs.c:1254
+#: src/gtkprefs.c:1121
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/gtkprefs.c:1255
+#: src/gtkprefs.c:1122
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/gtkprefs.c:1256
-msgid "Gnome Default"
+#: src/gtkprefs.c:1123
+#, fuzzy
+msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../src/gtkprefs.c:1257
+#: src/gtkprefs.c:1124
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1258
+#: src/gtkprefs.c:1125
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1259
+#: src/gtkprefs.c:1126
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../src/gtkprefs.c:1260
+#: src/gtkprefs.c:1127
 msgid "Opera"
 msgstr "Opera"
 
-#: ../src/gtkprefs.c:1269
+#: src/gtkprefs.c:1136
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../src/gtkprefs.c:1322
+#: src/gtkprefs.c:1189
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../src/gtkprefs.c:1326
+#: src/gtkprefs.c:1193
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../src/gtkprefs.c:1333
+#: src/gtkprefs.c:1201
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../src/gtkprefs.c:1335
+#: src/gtkprefs.c:1203
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../src/gtkprefs.c:1336
+#: src/gtkprefs.c:1204
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../src/gtkprefs.c:1338
+#: src/gtkprefs.c:1206
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../src/gtkprefs.c:1352
+#: src/gtkprefs.c:1220
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3975,75 +3962,56 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../src/gtkprefs.c:1391
-msgid "Message Logs"
-msgstr "Viestilokit"
-
-#: ../src/gtkprefs.c:1394
+#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+msgid "Logging"
+msgstr "Kirjataan lokiin"
+
+#: src/gtkprefs.c:1259
 msgid "Log _Format:"
 msgstr "Loki_formaatti:"
 
-#: ../src/gtkprefs.c:1397
-msgid "_Log all instant messages"
+#: src/gtkprefs.c:1264
+#, fuzzy
+msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../src/gtkprefs.c:1399
+#: src/gtkprefs.c:1266
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../src/gtkprefs.c:1402
-msgid "System Logs"
-msgstr "Järjestelmälokit"
-
-#: ../src/gtkprefs.c:1404
-msgid "_Enable system log"
-msgstr "Ota järjestelmäloki _käyttöön"
-
-#: ../src/gtkprefs.c:1407
-msgid "Log when buddies log in/log _out"
-msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
-
-#: ../src/gtkprefs.c:1413
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
-
-#: ../src/gtkprefs.c:1419
-msgid "Log when buddies go away/come _back"
-msgstr "Kirjaa lokiin tuttavien poistumiset/_palaamiset"
-
-#: ../src/gtkprefs.c:1425
-msgid "Log your own _signons/idleness/awayness"
-msgstr "Kirjaa lokiin _omat sisäänkirjautumiset/joutenolot/poissaolot"
-
-#: ../src/gtkprefs.c:1562
+#: src/gtkprefs.c:1268
+msgid "Log all _status changes to system log"
+msgstr ""
+
+#: src/gtkprefs.c:1400
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../src/gtkprefs.c:1616
+#: src/gtkprefs.c:1454
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../src/gtkprefs.c:1617
+#: src/gtkprefs.c:1455
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../src/gtkprefs.c:1619
+#: src/gtkprefs.c:1457
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../src/gtkprefs.c:1621
+#: src/gtkprefs.c:1459
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/gtkprefs.c:1626
+#: src/gtkprefs.c:1464
 msgid "Command"
 msgstr "Komento"
 
-#: ../src/gtkprefs.c:1627
+#: src/gtkprefs.c:1465
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../src/gtkprefs.c:1635
+#: src/gtkprefs.c:1473
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4052,253 +4020,196 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../src/gtkprefs.c:1661
+#: src/gtkprefs.c:1499
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../src/gtkprefs.c:1662
+#: src/gtkprefs.c:1500
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../src/gtkprefs.c:1664
+#: src/gtkprefs.c:1502
 msgid "_Sounds while away"
 msgstr "Ää_net poissaollessasi"
 
-#: ../src/gtkprefs.c:1674
+#: src/gtkprefs.c:1512
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../src/gtkprefs.c:1725
+#: src/gtkprefs.c:1563
 msgid "Play"
 msgstr "Soita"
 
-#: ../src/gtkprefs.c:1732
+#: src/gtkprefs.c:1570
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/gtkprefs.c:1751
+#: src/gtkprefs.c:1589
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../src/gtkprefs.c:1755
+#: src/gtkprefs.c:1593
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../src/gtkprefs.c:1759
+#: src/gtkprefs.c:1597
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../src/gtkprefs.c:1815
+#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
+#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
+#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
+#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
+#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
+#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
+#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
+#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
+#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
+msgid "Away"
+msgstr "Poissa"
+
+#: src/gtkprefs.c:1652
 msgid "_Queue new messages when away"
 msgstr "Laita uudet viestit _jonoon poissaollessa"
 
-#: ../src/gtkprefs.c:1818
+#: src/gtkprefs.c:1655
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../src/gtkprefs.c:1821
+#: src/gtkprefs.c:1658
 msgid "When away"
 msgstr "Poissaollessa"
 
-#: ../src/gtkprefs.c:1822
+#: src/gtkprefs.c:1659
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
-#: ../src/gtkprefs.c:1825 ../src/protocols/msn/msn.c:546
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2831
-#: ../src/protocols/oscar/oscar.c:5068 ../src/protocols/yahoo/yahoo.c:2634
-#: ../src/protocols/yahoo/yahoo_profile.c:665
-msgid "Idle"
-msgstr "Jouten"
-
-#: ../src/gtkprefs.c:1826
-msgid "Idle _Tracking:"
-msgstr "Jouto_aikaseuranta:"
-
-#: ../src/gtkprefs.c:1828
-msgid "Gaim usage"
-msgstr "Gaimin käyttö"
-
-#: ../src/gtkprefs.c:1831
-msgid "X usage"
-msgstr "X:n käyttö"
-
-#: ../src/gtkprefs.c:1833
-msgid "Windows usage"
-msgstr "Windowsin käyttö"
-
-#: ../src/gtkprefs.c:1838
+#: src/gtkprefs.c:1662
 msgid "_Report idle time"
 msgstr "Näytä joutenolo_aika"
 
-#: ../src/gtkprefs.c:1844
+#: src/gtkprefs.c:1665
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../src/gtkprefs.c:1845
-msgid "Set away _when idle"
+#: src/gtkprefs.c:1666
+#, fuzzy
+msgid "Change status when _idle"
 msgstr "Aseta poissaolevaksi, _kun ollaan jouten"
 
-#: ../src/gtkprefs.c:1849
-msgid "_Minutes before setting away:"
+#: src/gtkprefs.c:1670
+#, fuzzy
+msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen asetusta:"
 
-#: ../src/gtkprefs.c:1857
-msgid "Away m_essage:"
-msgstr "Poissaolovi_esti:"
-
-#: ../src/gtkprefs.c:1915
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Tekijä/Tekijät:</span>\t%s\n"
-"<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
-"<span weight=\"bold\">Tiedostopolku:</span>\t%s"
-
-#: ../src/gtkprefs.c:1920
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">File name:</span>  %s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Tekijä/Tekijät:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">Tiedostopolku:</span>  %s"
-
-#: ../src/gtkprefs.c:2055
-msgid "Load"
-msgstr "Lataa"
-
-#: ../src/gtkprefs.c:2069
-msgid "Summary"
-msgstr "Yhteenveto"
-
-#: ../src/gtkprefs.c:2117
-msgid "Details"
-msgstr "Yksityiskohdat"
-
-#: ../src/gtkprefs.c:2165
+#: src/gtkprefs.c:1678
+#, fuzzy
+msgid "Change _status to:"
+msgstr "Vaihda osoite:"
+
+#: src/gtkprefs.c:1728
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../src/gtkprefs.c:2166
+#: src/gtkprefs.c:1729
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/gtkprefs.c:2167 ../src/protocols/silc/silc.c:1597
+#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
 msgid "Network"
 msgstr "Verkko"
 
-#: ../src/gtkprefs.c:2172
+#: src/gtkprefs.c:1735
 msgid "Browser"
 msgstr "Selain"
 
-#: ../src/gtkprefs.c:2175
-msgid "Logging"
-msgstr "Kirjataan lokiin"
-
-#: ../src/gtkprefs.c:2176
+#: src/gtkprefs.c:1739
 msgid "Away / Idle"
 msgstr "Poissa-/Joutenolot"
 
-#: ../src/gtkprefs.c:2179
-msgid "Plugins"
-msgstr "Liitännäiset"
-
-#: ../src/gtkprivacy.c:79
+#: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien käyttäjien ottaa minuun yhteyttä"
 
-#: ../src/gtkprivacy.c:80
+#: src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Salli vain käyttäjät tuttavalistassa"
 
-#: ../src/gtkprivacy.c:81
+#: src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat käyttäjät"
 
-#: ../src/gtkprivacy.c:82
+#: src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Estä kaikki käyttäjät"
 
-#: ../src/gtkprivacy.c:83
+#: src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: ../src/gtkprivacy.c:398
+#: src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/gtkprivacy.c:411
+#: src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:423
+#: src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../src/gtkprivacy.c:589 ../src/gtkprivacy.c:605
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: ../src/gtkprivacy.c:590
+#: src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: ../src/gtkprivacy.c:591
+#: src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../src/gtkprivacy.c:594 ../src/gtkprivacy.c:607
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Salli"
 
-#: ../src/gtkprivacy.c:599
+#: src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:601
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:628 ../src/gtkprivacy.c:641
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../src/gtkprivacy.c:629
+#: src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../src/gtkprivacy.c:630
+#: src/gtkprivacy.c:630
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../src/gtkprivacy.c:632 ../src/gtkprivacy.c:643
-#: ../src/protocols/gg/gg.c:1140
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
 msgid "Block"
 msgstr "Estä"
 
-#: ../src/gtkprivacy.c:637
+#: src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../src/gtkprivacy.c:639
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -4306,161 +4217,168 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: ../src/gtkrequest.c:258 ../src/protocols/msn/dialog.c:113
-#: ../src/protocols/msn/msn.c:553 ../src/protocols/msn/msn.c:556
-#: ../src/protocols/novell/novell.c:1902 ../src/protocols/silc/buddy.c:312
-#: ../src/protocols/silc/pk.c:117 ../src/request.h:1322
+#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
+#: src/protocols/silc/pk.c:117 src/request.h:1322
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/gtkrequest.c:259 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:553 ../src/protocols/msn/msn.c:556
-#: ../src/protocols/novell/novell.c:1903 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:118 ../src/request.h:1322
+#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:118 src/request.h:1322
 msgid "No"
 msgstr "Ei"
 
-#: ../src/gtkrequest.c:262
+#: src/gtkrequest.c:263
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../src/gtkrequest.c:263 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:335
+#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
+#: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/gtkrequest.c:1795
+#: src/gtkrequest.c:1796
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../src/gtkrequest.c:1796
+#: src/gtkrequest.c:1797
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: ../src/gtkrequest.c:1838 ../src/gtkrequest.c:1879
+#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../src/gtkrequest.c:1839 ../src/gtkrequest.c:1880
+#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
-#: ../src/gtkroomlist.c:331
+#: src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "Huonelista"
 
 #. list button
-#: ../src/gtkroomlist.c:402
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "_Hae lista"
 
-#: ../src/gtksavedstatuses.c:314 ../src/protocols/jabber/buddy.c:263
-#: ../src/protocols/jabber/buddy.c:804 ../src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "Nimike"
 
-#: ../src/gtksavedstatuses.c:329
+#: src/gtksavedstatuses.c:377
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/gtksavedstatuses.c:340 ../src/protocols/gg/gg.c:1083
-#: ../src/protocols/gg/gg.c:1088 ../src/protocols/gg/gg.c:1097
-#: ../src/protocols/gg/gg.c:1102 ../src/protocols/gg/gg.c:1112
-#: ../src/protocols/gg/gg.c:1117 ../src/protocols/irc/irc.c:177
-#: ../src/protocols/jabber/jabber.c:1005 ../src/protocols/jabber/jabber.c:1013
-#: ../src/protocols/jabber/jabber.c:1021 ../src/protocols/jabber/jabber.c:1029
-#: ../src/protocols/jabber/jabber.c:1037 ../src/protocols/jabber/jabber.c:1045
-#: ../src/protocols/novell/novell.c:2845 ../src/protocols/oscar/oscar.c:7758
-#: ../src/protocols/oscar/oscar.c:7765 ../src/protocols/yahoo/yahoo.c:3216
-#: ../src/protocols/yahoo/yahoo.c:3250 ../src/protocols/zephyr/zephyr.c:2260
+#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
+#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
+#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
+#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
+#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
+#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
+#: src/protocols/sametime/sametime.c:2759
+#: src/protocols/sametime/sametime.c:2765
+#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
+#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
+#: src/protocols/zephyr/zephyr.c:2260
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/gtksavedstatuses.c:403
+#: src/gtksavedstatuses.c:451
 msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
-#: ../src/gtksavedstatuses.c:524
+#. Use button
+#. TODO: It might be better if the button said "Use" or "Activate"
+#: src/gtksavedstatuses.c:477
+msgid "_Use"
+msgstr "_Käytä"
+
+#: src/gtksavedstatuses.c:584
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Nimike on käytössä. Sinun täytyy valita yksilöllinen nimike."
 
-#: ../src/gtksavedstatuses.c:615
+#: src/gtksavedstatuses.c:675
 msgid "Custom status"
 msgstr "Mukautettu tila"
 
-#: ../src/gtksavedstatuses.c:718 ../src/protocols/gg/gg.c:1064
-#: ../src/protocols/gg/gg.c:1069 ../src/protocols/jabber/buddy.c:625
-#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:643
-#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/msn.c:544
-#: ../src/protocols/novell/novell.c:2844 ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/oscar/oscar.c:760 ../src/protocols/oscar/oscar.c:765
-#: ../src/protocols/oscar/oscar.c:767 ../src/protocols/yahoo/yahoo.c:2786
+#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
+#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
+#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/gtksavedstatuses.c:737
+#: src/gtksavedstatuses.c:797
 msgid "_Title:"
 msgstr "_Arvonimi"
 
-#: ../src/gtksavedstatuses.c:748
-msgid "Out of the office"
-msgstr "Poissa toimistolta"
-
-#: ../src/gtksavedstatuses.c:759
+#: src/gtksavedstatuses.c:817
 msgid "_Status:"
 msgstr "_Tila:"
 
-#. Custom status message disclosure
-#: ../src/gtksavedstatuses.c:794 ../src/gtksavedstatuses.c:795
-msgid "Use a different status for some accounts"
+#. Custom status message expander
+#: src/gtksavedstatuses.c:852
+#, fuzzy
+msgid "Use a _different status for some accounts"
 msgstr "Käytä erilaista tilaa joillekin käyttäjätileille"
 
-#: ../src/gtksound.c:61
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
 
-#: ../src/gtksound.c:62
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
-#: ../src/gtksound.c:63
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/gtksound.c:64
+#: src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "Vastaanotettu viesti aloittaa keskustelun"
 
-#: ../src/gtksound.c:65
+#: src/gtksound.c:65
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../src/gtksound.c:66
+#: src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "Joku saapuu ryhmäkeskusteluun"
 
-#: ../src/gtksound.c:67
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Joku poistuu ryhmäkeskustelusta"
 
-#: ../src/gtksound.c:68
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Sinä puhut ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:69
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Muut puhuvat ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:72
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:413
+#: src/gtksound.c:414
 #, 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:429
+#: src/gtksound.c:430
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4468,7 +4386,7 @@
 "Äänen soito ei onnistu. \"Komento\"-metodi on valittu mutta komentoa ei ole "
 "asetettu."
 
-#: ../src/gtksound.c:441
+#: src/gtksound.c:442
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4476,90 +4394,100 @@
 msgstr ""
 "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
 
-#: ../src/gtkstatusbox.c:183
+#: src/gtkstatusbox.c:197
 msgid "Typing"
 msgstr "Kirjoittaa"
 
 #. connect to the server
-#: ../src/gtkstatusbox.c:186 ../src/protocols/irc/irc.c:258
-#: ../src/protocols/jabber/jabber.c:834 ../src/protocols/msn/session.c:362
-#: ../src/protocols/napster/napster.c:525
-#: ../src/protocols/novell/novell.c:2164 ../src/protocols/oscar/oscar.c:1822
-#: ../src/protocols/trepia/trepia.c:1069 ../src/protocols/yahoo/yahoo.c:2456
-#: ../src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
+#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
+#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
+#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #. hacks
+#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
+#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
+#: src/protocols/msn/msn.c:573 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:2822
+#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
+#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
+#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
+msgid "Available"
+msgstr "Tavoitettavissa"
+
 #.
-#. * Without this selecting Available or Invisible as own status doesn't
+#. * Without this selecting Invisible as own status doesn't
 #. * work. It's not used and not needed to show status of buddies.
 #.
-#: ../src/gtkstatusbox.c:305 ../src/protocols/gg/gg.c:1096
-#: ../src/protocols/irc/irc.c:172 ../src/protocols/jabber/jabber.c:1012
-#: ../src/protocols/msn/msn.c:573 ../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:2822
-#: ../src/protocols/novell/novell.c:2956 ../src/protocols/novell/novell.c:3045
-#: ../src/protocols/oscar/oscar.c:806 ../src/protocols/oscar/oscar.c:7757
-#: ../src/protocols/silc/silc.c:48 ../src/protocols/yahoo/yahoo.c:3210
-#: ../src/status.c:155
-msgid "Available"
-msgstr "Tavoitettavissa"
-
-#: ../src/gtkstatusbox.c:307 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/oscar/oscar.c:709 ../src/protocols/oscar/oscar.c:7771
-#: ../src/protocols/yahoo/yahoo.c:2632 ../src/protocols/yahoo/yahoo.c:3254
+#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
+#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
+#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../src/gtkstatusbox.c:308 ../src/protocols/gg/gg.c:1082
-#: ../src/protocols/irc/irc.c:168 ../src/protocols/jabber/buddy.c:1086
-#: ../src/protocols/jabber/jabber.c:1005 ../src/protocols/msn/msn.c:569
-#: ../src/protocols/napster/napster.c:573
-#: ../src/protocols/novell/novell.c:2834 ../src/protocols/novell/novell.c:2953
-#: ../src/protocols/oscar/oscar.c:767 ../src/protocols/oscar/oscar.c:7591
-#: ../src/protocols/oscar/oscar.c:7752 ../src/protocols/silc/silc.c:46
-#: ../src/protocols/yahoo/yahoo.c:2636 ../src/protocols/yahoo/yahoo.c:3207
-#: ../src/status.c:154
+#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
+#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
+#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
+#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
+#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
+#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
+#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
+#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
+#: src/status.c:154
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../src/gtkstock.c:117
+#: src/gtkstatusbox.c:299
+#, fuzzy
+msgid "Custom..."
+msgstr "Oma"
+
+#: src/gtkstatusbox.c:300
+#, fuzzy
+msgid "Saved..."
+msgstr "Tallenna tiedosto..."
+
+#: src/gtkstock.c:117
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../src/gtkstock.c:119
+#: src/gtkstock.c:119
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../src/gtkstock.c:120
+#: src/gtkstock.c:120
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: ../src/gtkstock.c:121
+#: src/gtkstock.c:121
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
-#: ../src/gtkstock.c:123
+#: src/gtkstock.c:123
 msgid "_Warn"
 msgstr "_Varoita"
 
-#: ../src/gtkutils.c:1388 ../src/gtkutils.c:1413
+#: src/gtkutils.c:1393 src/gtkutils.c:1418
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../src/gtkutils.c:1390 ../src/gtkutils.c:1415
+#: src/gtkutils.c:1395 src/gtkutils.c:1420
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../src/gtkutils.c:1490
+#: src/gtkutils.c:1495
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../src/gtkutils.c:1492
+#: src/gtkutils.c:1497
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -4567,11 +4495,11 @@
 "Gaim ei voi siirtää kansiota. Sinun täytyy lähettää kansion sisältämät "
 "tiedostot erikseen."
 
-#: ../src/gtkutils.c:1520 ../src/gtkutils.c:1529 ../src/gtkutils.c:1534
+#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../src/gtkutils.c:1521
+#: src/gtkutils.c:1526
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4579,23 +4507,23 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../src/gtkutils.c:1525 ../src/gtkutils.c:1540
+#: src/gtkutils.c:1530 src/gtkutils.c:1545
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../src/gtkutils.c:1526 ../src/gtkutils.c:1541
+#: src/gtkutils.c:1531 src/gtkutils.c:1546
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../src/gtkutils.c:1527 ../src/gtkutils.c:1541
+#: src/gtkutils.c:1532 src/gtkutils.c:1546
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../src/gtkutils.c:1530
+#: src/gtkutils.c:1535
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../src/gtkutils.c:1535
+#: src/gtkutils.c:1540
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4603,7 +4531,7 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../src/gtkutils.c:1537
+#: src/gtkutils.c:1542
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4616,11 +4544,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../src/gtkutils.c:1591
+#: src/gtkutils.c:1596
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../src/gtkutils.c:1591
+#: src/gtkutils.c:1596
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -4628,19 +4556,19 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../src/log.c:129
+#: src/log.c:129
 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:578
+#: src/log.c:577
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../src/log.c:840
+#: src/log.c:839
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:905
+#: src/log.c:904
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4649,7 +4577,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:907
+#: src/log.c:906
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4658,21 +4586,21 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:958 ../src/log.c:1075
+#: src/log.c:957 src/log.c:1074
 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:968 ../src/log.c:1087
+#: src/log.c:967 src/log.c:1086
 #, 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:1020
+#: src/log.c:1019
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../src/plugin.c:331
+#: src/plugin.c:331
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4680,189 +4608,247 @@
 msgstr ""
 "Vaadittu liitännäinen %s puuttuu. Ole hyvä ja asenna se ja yritä uudelleen."
 
-#: ../src/plugin.c:336 ../src/plugin.c:364
+#: src/plugin.c:336 src/plugin.c:364
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ei kyennyt lataamaan liitännäistäsi."
 
-#: ../src/plugin.c:360
+#: src/plugin.c:360
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu liitännäinen %s ei latautunut."
 
-#: ../src/prefs.c:1094
-msgid "Slightly less boring default"
-msgstr "Hieman vähemmän tylsä oletusviesti"
-
-#: ../src/protocols/gg/gg.c:136 ../src/protocols/gg/gg.c:155
-msgid "Save Buddylist..."
-msgstr "Tallenna tuttavalista..."
-
-#: ../src/protocols/gg/gg.c:137
-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:143 ../src/protocols/gg/gg.c:145
-#: ../src/protocols/gg/gg.c:176
-msgid "Couldn't open file"
-msgstr "Tiedoston avaus ei onnistunut"
-
-#: ../src/protocols/gg/gg.c:156
-msgid "Buddylist saved successfully!"
-msgstr "Tuttavalista tallennettiin onnistuneesti!"
-
-#: ../src/protocols/gg/gg.c:178
-msgid "Could't open file"
-msgstr "Tiedoston avaus ei onnistunut"
-
-#: ../src/protocols/gg/gg.c:199
-msgid "Load Buddylist..."
-msgstr "Avaa tuttavalista..."
-
-#: ../src/protocols/gg/gg.c:200
-msgid "Buddylist loaded successfully!"
-msgstr "Tuttavalista avattiin onnistuneesti!"
-
-#: ../src/protocols/gg/gg.c:211
-msgid "Save buddylist..."
-msgstr "Tallenna tuttavalista..."
-
-#: ../src/protocols/gg/gg.c:254
-msgid "Fill in the registration fields."
-msgstr "Täytä rekisteröitymiskentät."
-
-#: ../src/protocols/gg/gg.c:259
-msgid "Passwords do not match."
-msgstr "Salasanat eivät täsmää."
-
-#: ../src/protocols/gg/gg.c:266
-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:279
-msgid "New Gadu-Gadu Account Registered"
-msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
-
-#: ../src/protocols/gg/gg.c:280
-msgid "Registration completed successfully!"
-msgstr "Rekisteröinti onnistui!"
-
-#: ../src/protocols/gg/gg.c:401
-msgid "Last name"
+#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
+#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
+#: src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "Jouten"
+
+#: src/protocols/bonjour/bonjour.c:303
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>Tila</b>: Mahtava"
+
+#: src/protocols/bonjour/bonjour.c:305
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Message:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
+#, fuzzy
+msgid "Bonjour Protocol Plugin"
+msgstr "Yahoo-protokollaliitännäinen"
+
+#. Creating the user splits
+#: src/protocols/bonjour/bonjour.c:417
+#, fuzzy
+msgid "Host name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/gg/gg.c:405
+#. Creating the options for the protocol
+#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
+#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
+#: src/protocols/silc/silc.c:1597
+msgid "Port"
+msgstr "Portti"
+
+#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../src/protocols/gg/gg.c:409 ../src/protocols/gg/gg.c:1679
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:697
-#: ../src/protocols/jabber/jabber.c:648 ../src/protocols/msn/msn.c:1402
-#: ../src/protocols/silc/buddy.c:1480 ../src/protocols/silc/ops.c:822
-#: ../src/protocols/silc/ops.c:965 ../src/protocols/silc/ops.c:1114
-#: ../src/protocols/yahoo/yahoo_profile.c:1008
+#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
+msgid "Last name"
+msgstr "Sukunimi"
+
+#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
+#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
+#: src/protocols/yahoo/yahoo_profile.c:995
+msgid "Email"
+msgstr "Sähköposti"
+
+#: src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr ""
+
+#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+msgid "Save Buddylist..."
+msgstr "Tallenna tuttavalista..."
+
+#: src/protocols/gg/gg.c:137
+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:143 src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:176
+msgid "Couldn't open file"
+msgstr "Tiedoston avaus ei onnistunut"
+
+#: src/protocols/gg/gg.c:156
+msgid "Buddylist saved successfully!"
+msgstr "Tuttavalista tallennettiin onnistuneesti!"
+
+#: src/protocols/gg/gg.c:178
+msgid "Could't open file"
+msgstr "Tiedoston avaus ei onnistunut"
+
+#: src/protocols/gg/gg.c:199
+msgid "Load Buddylist..."
+msgstr "Avaa tuttavalista..."
+
+#: src/protocols/gg/gg.c:200
+msgid "Buddylist loaded successfully!"
+msgstr "Tuttavalista avattiin onnistuneesti!"
+
+#: src/protocols/gg/gg.c:211
+msgid "Save buddylist..."
+msgstr "Tallenna tuttavalista..."
+
+#: src/protocols/gg/gg.c:254
+msgid "Fill in the registration fields."
+msgstr "Täytä rekisteröitymiskentät."
+
+#: src/protocols/gg/gg.c:259
+msgid "Passwords do not match."
+msgstr "Salasanat eivät täsmää."
+
+#: src/protocols/gg/gg.c:266
+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:279
+msgid "New Gadu-Gadu Account Registered"
+msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
+
+#: src/protocols/gg/gg.c:280
+msgid "Registration completed successfully!"
+msgstr "Rekisteröinti onnistui!"
+
+#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
+#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#. City
-#: ../src/protocols/gg/gg.c:413 ../src/protocols/jabber/jabber.c:668
-#: ../src/protocols/oscar/oscar.c:5995 ../src/protocols/oscar/oscar.c:6003
-#: ../src/protocols/trepia/trepia.c:332 ../src/protocols/trepia/trepia.c:411
+#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../src/protocols/gg/gg.c:417
+#: src/protocols/gg/gg.c:417
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:426
+#: src/protocols/gg/gg.c:426
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:431
-#: ../src/protocols/gg/gg.c:1524
+#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
+#: src/protocols/gg/gg.c:1510
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../src/protocols/gg/gg.c:432
+#: src/protocols/gg/gg.c:432
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:465
 msgid "Fill in the fields."
 msgstr "Täytä kentät."
 
-#: ../src/protocols/gg/gg.c:476
+#: src/protocols/gg/gg.c:476
 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:491
+#: src/protocols/gg/gg.c:491
 msgid "Unable to change password. Error occured.\n"
 msgstr "Ei kyetty muuttamaan salasanaa virheen takia.\n"
 
-#: ../src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:500
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
 
-#: ../src/protocols/gg/gg.c:501
+#: src/protocols/gg/gg.c:501
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../src/protocols/gg/gg.c:535
+#: src/protocols/gg/gg.c:535
 msgid "Token Error"
 msgstr "Vastamerkkivirhe"
 
-#: ../src/protocols/gg/gg.c:536
+#: src/protocols/gg/gg.c:536
 msgid "Unable to fetch the token.\n"
 msgstr "Ei voitu hakea vastamerkkiä.\n"
 
-#: ../src/protocols/gg/gg.c:551
+#: src/protocols/gg/gg.c:551
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../src/protocols/gg/gg.c:555 ../src/protocols/gg/gg.c:1490
-#: ../src/protocols/jabber/jabber.c:632 ../src/protocols/jabber/jabber.c:1123
+#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
+#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
 msgid "Password"
 msgstr "Salasana"
 
-#: ../src/protocols/gg/gg.c:559 ../src/protocols/gg/gg.c:1494
+#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/gg/gg.c:563 ../src/protocols/gg/gg.c:1498
+#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
 msgid "Enter current token"
 msgstr "Syötä nykyinen vastamerkki"
 
 #. original size: 60x24
-#: ../src/protocols/gg/gg.c:568 ../src/protocols/gg/gg.c:1503
+#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
 msgid "Current token"
 msgstr "Nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:574
+#: src/protocols/gg/gg.c:574
 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:578 ../src/protocols/gg/gg.c:579
+#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../src/protocols/gg/gg.c:649
+#: src/protocols/gg/gg.c:649
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 
-#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
+#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:812
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:959
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../src/protocols/gg/gg.c:960
+#: src/protocols/gg/gg.c:960
 msgid "Search results"
 msgstr "Hakutulokset"
 
@@ -4879,9 +4865,9 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: ../src/protocols/gg/gg.c:1087 ../src/protocols/jabber/buddy.c:1088
-#: ../src/protocols/napster/napster.c:578 ../src/protocols/oscar/oscar.c:711
-#: ../src/protocols/yahoo/yahoo.c:2638 ../src/protocols/zephyr/zephyr.c:2252
+#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
+#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
 msgid "Online"
 msgstr "Linjoilla"
 
@@ -4889,83 +4875,83 @@
 #. TRUE, TRUE, FALSE, "message", _("Message"),
 #. gaim_value_new(GAIM_TYPE_STRING), NULL);
 #. types = g_list_append(types, type);
-#: ../src/protocols/gg/gg.c:1111 ../src/protocols/msn/msn.c:585
-#: ../src/protocols/msn/state.c:31 ../src/protocols/novell/novell.c:2828
-#: ../src/protocols/novell/novell.c:2962 ../src/protocols/novell/novell.c:3050
-#: ../src/protocols/silc/buddy.c:1421 ../src/protocols/silc/silc.c:54
-#: ../src/protocols/yahoo/yahoo.c:2616 ../src/protocols/yahoo/yahoo.c:3224
+#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
+#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
+#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/protocols/gg/gg.c:1116 ../src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../src/protocols/gg/gg.c:1134
+#: src/protocols/gg/gg.c:1129
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../src/protocols/gg/gg.c:1138
+#: src/protocols/gg/gg.c:1133
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../src/protocols/gg/gg.c:1154
+#: src/protocols/gg/gg.c:1149
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../src/protocols/gg/gg.c:1187
+#: src/protocols/gg/gg.c:1183
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1357
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../src/protocols/gg/gg.c:1372
+#: src/protocols/gg/gg.c:1358
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../src/protocols/gg/gg.c:1449
+#: src/protocols/gg/gg.c:1435
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../src/protocols/gg/gg.c:1470
+#: src/protocols/gg/gg.c:1456
 msgid "Token Error: Unable to fetch the token.\n"
 msgstr "Vastamerkkivirhe: ei voitu hakea vastamerkkiä.\n"
 
-#: ../src/protocols/gg/gg.c:1486
+#: src/protocols/gg/gg.c:1472
 msgid "e-Mail"
 msgstr "Sähköposti"
 
-#: ../src/protocols/gg/gg.c:1509 ../src/protocols/gg/gg.c:1510
+#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
 
-#: ../src/protocols/gg/gg.c:1511
+#: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
 msgstr "Täytä seuraavat kentät"
 
-#: ../src/protocols/gg/gg.c:1529
+#: src/protocols/gg/gg.c:1515
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: ../src/protocols/gg/gg.c:1534
+#: src/protocols/gg/gg.c:1520
 msgid "Upload buddylist to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: ../src/protocols/gg/gg.c:1537
+#: src/protocols/gg/gg.c:1523
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:1540
+#: src/protocols/gg/gg.c:1526
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:1543
+#: src/protocols/gg/gg.c:1529
 msgid "Save buddylist to file"
 msgstr "Vie tuttavalista tiedostoon"
 
-#: ../src/protocols/gg/gg.c:1546
+#: src/protocols/gg/gg.c:1532
 msgid "Load buddylist from file"
 msgstr "Tuo tuttavalista tiedostosta"
 
@@ -4980,129 +4966,120 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1631
+#: src/protocols/gg/gg.c:1617
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokollaliitännäinen"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1632
+#: src/protocols/gg/gg.c:1618
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../src/protocols/gg/gg.c:1679
+#: src/protocols/gg/gg.c:1665
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1321
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: ../src/protocols/irc/cmds.c:463 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1029
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1021
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: ../src/protocols/irc/cmds.c:467 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1033
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1025
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: ../src/protocols/irc/dcc_send.c:272
-#: ../src/protocols/yahoo/yahoo_filexfer.c:177
-#: ../src/protocols/yahoo/yahoo_filexfer.c:186
-#: ../src/protocols/yahoo/yahoo_filexfer.c:195
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/yahoo/yahoo_filexfer.c:182
+#: src/protocols/yahoo/yahoo_filexfer.c:191
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"
 
-#: ../src/protocols/irc/dcc_send.c:273
+#: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim ei voinut avata kuuntelevaa porttia."
 
-#: ../src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Virhe näytettäessä MOTD:tä"
 
-#: ../src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "MOTD ei ole käytettävissä"
 
-#: ../src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "MOTD:tä ei ole assosioitu tälle yhteydelle."
 
-#: ../src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: ../src/protocols/irc/irc.c:103 ../src/protocols/irc/irc.c:526
-#: ../src/protocols/irc/irc.c:548
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
-#: ../src/protocols/irc/irc.c:188
+#: src/protocols/irc/irc.c:188
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: ../src/protocols/irc/irc.c:200 ../src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: ../src/protocols/irc/irc.c:206 ../src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/protocols/irc/irc.c:238
+#: src/protocols/irc/irc.c:238
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: ../src/protocols/irc/irc.c:266 ../src/protocols/jabber/jabber.c:433
-#: ../src/protocols/jabber/jabber.c:770
+#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
+#: src/protocols/jabber/jabber.c:770
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: ../src/protocols/irc/irc.c:277
+#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
+#: src/protocols/simple/simple.c:1219
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../src/protocols/irc/irc.c:348 ../src/protocols/jabber/jabber.c:306
-#: ../src/protocols/oscar/oscar.c:1742 ../src/protocols/oscar/oscar.c:1818
+#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: ../src/protocols/irc/irc.c:373 ../src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/irc/irc.c:376 ../src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: ../src/protocols/irc/irc.c:523 ../src/protocols/irc/irc.c:545
-#: ../src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/irc/irc.c:694 ../src/protocols/silc/chat.c:1388
-#: ../src/protocols/yahoo/yahoochat.c:1401
+#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../src/protocols/irc/irc.c:697 ../src/protocols/silc/chat.c:1391
-#: ../src/protocols/silc/ops.c:1166 ../src/protocols/yahoo/yahoochat.c:1410
+#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "Aihe"
 
-#: ../src/protocols/irc/irc.c:734
-msgid "IRC"
-msgstr "IRC"
-
-#: ../src/protocols/irc/irc.c:738
-msgid "Quit message"
-msgstr "Poistumisviesti"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5111,196 +5088,193 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:824
+#: src/protocols/irc/irc.c:799
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokollaliitännäinen"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:800
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokollaliitännäinen joka toimii"
 
-#: ../src/protocols/irc/irc.c:844 ../src/protocols/irc/msgs.c:233
-#: ../src/protocols/jabber/jabber.c:1677
-#: ../src/protocols/napster/napster.c:707 ../src/protocols/silc/ops.c:1028
-#: ../src/protocols/silc/ops.c:1130
+#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
+#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
+#: src/protocols/silc/ops.c:1130
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../src/protocols/irc/irc.c:847 ../src/protocols/msn/msn.c:1976
-#: ../src/protocols/napster/napster.c:712 ../src/protocols/silc/silc.c:1605
-#: ../src/protocols/trepia/trepia.c:1304
-msgid "Port"
-msgstr "Portti"
-
-#: ../src/protocols/irc/irc.c:850
+#: src/protocols/irc/irc.c:825
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../src/protocols/irc/irc.c:853 ../src/protocols/irc/msgs.c:227
-#: ../src/protocols/jabber/jabber.c:628 ../src/protocols/silc/buddy.c:1483
-#: ../src/protocols/silc/ops.c:975 ../src/protocols/silc/ops.c:977
-#: ../src/protocols/silc/ops.c:1124 ../src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/irc/irc.c:856
+#: src/protocols/irc/irc.c:831
 msgid "Real name"
 msgstr "Oikea nimi"
 
-#: ../src/protocols/irc/irc.c:859
+#.
+#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+#: src/protocols/irc/irc.c:839
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
-#: ../src/protocols/irc/msgs.c:105
+#: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "Väärä tila"
 
-#: ../src/protocols/irc/msgs.c:116
+#: src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sinut on kielletty kanavalta %s."
 
-#: ../src/protocols/irc/msgs.c:117
+#: src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "Kielletty"
 
-#: ../src/protocols/irc/msgs.c:134
+#: src/protocols/irc/msgs.c:134
 #, 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:213 ../src/protocols/irc/msgs.c:233
-#: ../src/protocols/irc/msgs.c:246
+#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:213 ../src/protocols/oscar/oscar.c:5941
-#: ../src/protocols/silc/ops.c:1198
+#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
+#: src/protocols/silc/ops.c:1198
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: ../src/protocols/irc/msgs.c:216
+#: src/protocols/irc/msgs.c:216
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:217
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: ../src/protocols/irc/msgs.c:221 ../src/protocols/irc/msgs.c:227
-#: ../src/protocols/irc/msgs.c:228 ../src/protocols/irc/msgs.c:239
-#: ../src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:228 ../src/protocols/silc/ops.c:969
-#: ../src/protocols/silc/ops.c:1118
-#: ../src/protocols/yahoo/yahoo_profile.c:1013
+#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Oikea nimi"
 
-#: ../src/protocols/irc/msgs.c:239 ../src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
-#: ../src/protocols/irc/msgs.c:244
+#: src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Jouten:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:246
+#: src/protocols/irc/msgs.c:246
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: ../src/protocols/irc/msgs.c:249
+#: src/protocols/irc/msgs.c:249
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Kuvaava adjektiivi</b> Kunniakas<br>"
 
-#: ../src/protocols/irc/msgs.c:317
+#: src/protocols/irc/msgs.c:317
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../src/protocols/irc/msgs.c:322
+#: src/protocols/irc/msgs.c:322
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../src/protocols/irc/msgs.c:339
+#: src/protocols/irc/msgs.c:339
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../src/protocols/irc/msgs.c:340
+#: src/protocols/irc/msgs.c:340
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../src/protocols/irc/msgs.c:340
+#: src/protocols/irc/msgs.c:340
 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:363
+#: src/protocols/irc/msgs.c:363
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:482
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:483
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:494
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:505
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:508
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:513
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:533
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:589
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:590
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
-#: ../src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:697
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../src/protocols/irc/msgs.c:721
+#: src/protocols/irc/msgs.c:721
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../src/protocols/irc/msgs.c:805
+#: src/protocols/irc/msgs.c:805
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5308,51 +5282,51 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:844
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:844
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:865
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:907
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:909
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:984
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: ../src/protocols/irc/msgs.c:985 ../src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../src/protocols/irc/msgs.c:1019
+#: src/protocols/irc/msgs.c:1019
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: ../src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;tehtävä toiminta&gt;: Tee toiminta."
 
-#: ../src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5360,7 +5334,7 @@
 "away [viesti]: Aseta poissaoloviesti, tai jätä viesti tyhjäksi poistaaksesi "
 "poissaolotilan."
 
-#: ../src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:116
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5368,7 +5342,7 @@
 "deop &lt;nimi1&gt; [nimi2] ...: Poista kanavaoperaattorin status joltakulta. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:117
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5378,7 +5352,7 @@
 "puhumasta jos kanava on moderoitu (+m). Sinun tulee olla kanavaperaattori "
 "tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:118
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5386,7 +5360,7 @@
 "invite &lt;nimi&gt; [huone]: Kutsu joku liittymään kanssasi tietylle tai "
 "tämänhetkiselle kanavalle."
 
-#: ../src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:119
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5394,7 +5368,7 @@
 "j &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle tai "
 "useammalle kanavalle, antaen myös kanava-avaimen mikäli tarpeen."
 
-#: ../src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:120
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5402,7 +5376,7 @@
 "join &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle "
 "tai useammalle kanavalle antaen myös kanava-avaimen mikäli tarpeen."
 
-#: ../src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:121
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5410,7 +5384,7 @@
 "kick &lt;nimi&gt; [viesti]: Poista joku kanavalta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:122
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5418,11 +5392,11 @@
 "list: Näytä lista keskusteluhuoneista verkossa. <i>Varoitus, jotkut "
 "palvelimet saattavat katkaista yhteytesi jos teet näin.</i>"
 
-#: ../src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:123
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;tehtävä toiminto&gt;: Suorita toiminto."
 
-#: ../src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:124
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5430,7 +5404,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nimi|kanava&gt;: Aseta tai poista kanavan "
 "tai käyttäjän tila."
 
-#: ../src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:125
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5438,15 +5412,15 @@
 "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle "
 "(ollessasi kanavalla)."
 
-#: ../src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: ../src/protocols/irc/parse.c:127 ../src/protocols/jabber/jabber.c:1524
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
-#: ../src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:128
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5454,7 +5428,7 @@
 "op &lt;nimi1&gt; [nimi2] ...: Anna kanavaoperaattorin status jollekulle. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:129
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5462,7 +5436,7 @@
 "operwall &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tule käyttää tätä."
 
-#: ../src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:130
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5470,7 +5444,7 @@
 "part [huone] [viesti]: Poistu tämänhetkiseltä kanavalta tai tietyltä "
 "kanavalta valinnaisen viestin kanssa."
 
-#: ../src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:131
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5478,7 +5452,7 @@
 "ping [nimi]: Kysyy kuinka paljon viivettä käyttäjällä(tai palvelimella jos "
 "ei käyttäjää annettu) on."
 
-#: ../src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:132
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5486,15 +5460,15 @@
 "query &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (kun "
 "olet kanavalla)."
 
-#: ../src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
 
-#: ../src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:134
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Lähetä \"raaka\" komento palvelimelle."
 
-#: ../src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:135
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5502,19 +5476,19 @@
 "remove &lt;nimi&gt; [viesti]: Poista joku huoneesta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:136
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Näyttää paikallisen ajan IRC palvelimella."
 
-#: ../src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:137
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda kanavan aihetta."
 
-#: ../src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:138
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;nimi1&gt; [nimi2] ...: Aseta tai poista käyttäjän tila."
 
-#: ../src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:139
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5522,7 +5496,7 @@
 "voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun "
 "tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:140
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5530,31 +5504,31 @@
 "wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tulee käyttää sitä."
 
-#: ../src/protocols/irc/parse.c:141
+#: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [palvelin] &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: ../src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:422
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:423
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../src/protocols/irc/parse.c:526 ../src/protocols/irc/parse.c:530
-#: ../src/protocols/oscar/oscar.c:1651 ../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/irc/parse.c:526 src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1653 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."
 
-#: ../src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5562,27 +5536,27 @@
 "Palvelin vaatii TLS/SSL kirjautumiseen. Valitse \"Käytä TLS jos mahdollista"
 "\" käyttäjätilit-valikosta."
 
-#: ../src/protocols/jabber/auth.c:53
+#: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL tukea ei löydy."
 
-#: ../src/protocols/jabber/auth.c:114
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/auth.c:133 ../src/protocols/jabber/auth.c:207
-#: ../src/protocols/jabber/auth.c:375 ../src/protocols/jabber/auth.c:473
-#: ../src/protocols/jabber/auth.c:485 ../src/protocols/jabber/jabber.c:110
+#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
+#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
+#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../src/protocols/jabber/auth.c:163 ../src/protocols/jabber/auth.c:164
-#: ../src/protocols/jabber/auth.c:244 ../src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../src/protocols/jabber/auth.c:165 ../src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5590,93 +5564,84 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../src/protocols/jabber/auth.c:173 ../src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
 
-#: ../src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../src/protocols/jabber/buddy.c:248 ../src/protocols/jabber/buddy.c:666
-#: ../src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
+#: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:679
-#: ../src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
+#: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:683
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/buddy.c:725
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Alue"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Seutu"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:737
-#: ../src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/jabber.c:678
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#. Country
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:742
-#: ../src/protocols/trepia/trepia.c:340 ../src/protocols/trepia/trepia.c:417
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
 msgid "Country"
 msgstr "Maa"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:753
-#: ../src/protocols/jabber/buddy.c:760
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:771
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/silc/silc.c:669
-#: ../src/protocols/silc/util.c:511
-#: ../src/protocols/yahoo/yahoo_profile.c:1003
-msgid "Email"
-msgstr "Sähköposti"
-
-#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:794
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:798
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../src/protocols/jabber/buddy.c:264 ../src/protocols/jabber/buddy.c:807
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Asema"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:700
-#: ../src/protocols/oscar/oscar.c:5976
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
+#: src/protocols/oscar/oscar.c:5987
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/jabber/buddy.c:566 ../src/protocols/jabber/buddy.c:567
+#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Muokkaa Jabberin vCardia"
 
-#: ../src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5684,572 +5649,612 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../src/protocols/jabber/buddy.c:615
+#: src/protocols/jabber/buddy.c:616
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1680
+#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
 msgstr "Lähde"
 
-#: ../src/protocols/jabber/buddy.c:687 ../src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../src/protocols/jabber/buddy.c:705 ../src/protocols/jabber/jabber.c:663
-#: ../src/protocols/oscar/oscar.c:5994 ../src/protocols/oscar/oscar.c:6002
-#: ../src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
+#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
+#: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/protocols/jabber/buddy.c:717
+#: src/protocols/jabber/buddy.c:718
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../src/protocols/jabber/buddy.c:831
+#: src/protocols/jabber/buddy.c:832
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../src/protocols/jabber/buddy.c:831
+#: src/protocols/jabber/buddy.c:832
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:1035
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../src/protocols/jabber/buddy.c:1037
+#: src/protocols/jabber/buddy.c:1038
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1044
+#: src/protocols/jabber/buddy.c:1045
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../src/protocols/jabber/buddy.c:1050
+#: src/protocols/jabber/buddy.c:1051
 msgid "(Re-)Request authorization"
 msgstr "Pyydetään lupaa uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1058
+#: src/protocols/jabber/buddy.c:1059
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../src/protocols/jabber/buddy.c:1084 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:991
-#: ../src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
+#: src/protocols/silc/ops.c:1235
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/protocols/jabber/buddy.c:1090 ../src/protocols/jabber/jabber.c:1020
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../src/protocols/jabber/buddy.c:1094 ../src/protocols/jabber/jabber.c:1036
-#: ../src/status.c:159
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
+#: src/status.c:159
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../src/protocols/jabber/buddy.c:1096 ../src/protocols/jabber/jabber.c:1044
-#: ../src/protocols/oscar/oscar.c:699 ../src/protocols/oscar/oscar.c:7791
+#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
+#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
+#: src/protocols/sametime/sametime.c:2770
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7318
-#: ../src/protocols/yahoo/yahoochat.c:996
+#: src/protocols/jabber/buddy.c:1235
+msgid "The following are the results of your search"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1327
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
+#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgid "First Name"
+msgstr "Etunimi"
+
+#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
+#: src/protocols/oscar/oscar.c:5963
+msgid "Last Name"
+msgstr "Sukunimi"
+
+#: src/protocols/jabber/buddy.c:1346
+msgid "E-Mail Address"
+msgstr "Sähköpostiosoite"
+
+#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
+#, fuzzy
+msgid "Search for Jabber users"
+msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
+
+#: src/protocols/jabber/buddy.c:1370
+#, fuzzy
+msgid "Invalid Directory"
+msgstr "Epäkelpo virhe"
+
+#: src/protocols/jabber/buddy.c:1387
+#, fuzzy
+msgid "Enter a User Directory"
+msgstr "Ei voida lähettää kansiota."
+
+#: src/protocols/jabber/buddy.c:1388
+#, fuzzy
+msgid "Select a user directory to search"
+msgstr "Valitse konferenssipalvelin"
+
+#: src/protocols/jabber/buddy.c:1391
+#, fuzzy
+msgid "Search Directory"
+msgstr "Hakutulokset"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+#: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Huone:"
 
-#: ../src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Keskustelualias:"
 
-#: ../src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ei ole kelvollinen keskusteluhuoneen nimi"
 
-#: ../src/protocols/jabber/chat.c:224
+#: src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-#: ../src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ei ole kelvollinen palvelinnimi."
 
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Palvelimen nimi ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:235
+#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ei ole kelvollinen keskustelunimi (room handle)"
 
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Keskustelunimi ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:395
+#: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Konfigurointivirhe"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida"
 
-#: ../src/protocols/jabber/chat.c:420
+#: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Huoneen konfigurointivirhe"
 
-#: ../src/protocols/jabber/chat.c:421
+#: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: ../src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa muissa kuin MUC-keskusteluhuoneissa"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
-#: ../src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
+#: src/protocols/silc/ops.c:1235
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huonelistaa"
 
-#: ../src/protocols/jabber/chat.c:737
+#: src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Palvelin ei kelpaa"
 
-#: ../src/protocols/jabber/chat.c:775
+#: src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Syötä konferenssipalvelin"
 
-#: ../src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Valitse konferenssipalvelin"
 
-#: ../src/protocols/jabber/chat.c:779
+#: src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-#: ../src/protocols/jabber/jabber.c:79
+#: src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Virhe session alustuksessa"
 
-#: ../src/protocols/jabber/jabber.c:215 ../src/protocols/trepia/trepia.c:248
-#: ../src/protocols/trepia/trepia.c:699 ../src/protocols/trepia/trepia.c:991
-#: ../src/protocols/trepia/trepia.c:1036 ../src/protocols/trepia/trepia.c:1135
-#: ../src/protocols/trepia/trepia.c:1181
+#: src/protocols/jabber/jabber.c:215
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../src/protocols/jabber/jabber.c:253 ../src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: ../src/protocols/jabber/jabber.c:359 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/trepia/trepia.c:1075
+#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:403 ../src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:473
+#: src/protocols/jabber/jabber.c:473
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:475 ../src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:482 ../src/protocols/jabber/jabber.c:1268
+#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../src/protocols/jabber/jabber.c:484 ../src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:596 ../src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../src/protocols/jabber/jabber.c:643
+#: src/protocols/jabber/jabber.c:643
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#. First Name
-#: ../src/protocols/jabber/jabber.c:653 ../src/protocols/oscar/oscar.c:5951
-#: ../src/protocols/silc/ops.c:810 ../src/protocols/trepia/trepia.c:268
-msgid "First Name"
-msgstr "Etunimi"
-
-#. Last Name
-#: ../src/protocols/jabber/jabber.c:658 ../src/protocols/oscar/oscar.c:5952
-#: ../src/protocols/trepia/trepia.c:275
-msgid "Last Name"
-msgstr "Sukunimi"
-
-#. State
-#: ../src/protocols/jabber/jabber.c:673 ../src/protocols/oscar/oscar.c:5996
-#: ../src/protocols/oscar/oscar.c:6004 ../src/protocols/trepia/trepia.c:336
-#: ../src/protocols/trepia/trepia.c:414
+#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
+#: src/protocols/oscar/oscar.c:6015
 msgid "State"
 msgstr "Lääni"
 
-#: ../src/protocols/jabber/jabber.c:683 ../src/protocols/silc/ops.c:855
-#: ../src/protocols/silc/silc.c:671 ../src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:693
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../src/protocols/jabber/jabber.c:701
+#: src/protocols/jabber/jabber.c:701
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../src/protocols/jabber/jabber.c:704 ../src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: ../src/protocols/jabber/jabber.c:838
+#: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:844 ../src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../src/protocols/jabber/jabber.c:853
+#: src/protocols/jabber/jabber.c:857
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:924 ../src/protocols/jabber/jabber.c:1246
-#: ../src/protocols/jabber/jabber.c:1287 ../src/protocols/jabber/jabber.c:1320
-#: ../src/protocols/oscar/oscar.c:765 ../src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:971
 msgid "Both"
 msgstr "molemmille"
 
-#: ../src/protocols/jabber/jabber.c:959
+#: src/protocols/jabber/jabber.c:973
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/jabber.c:975
 msgid "From"
 msgstr "vain sinulle"
 
-#: ../src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/jabber.c:978
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../src/protocols/jabber/jabber.c:966
+#: src/protocols/jabber/jabber.c:980
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:970
+#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
+msgid "None"
+msgstr "Ei mitään"
+
+#: src/protocols/jabber/jabber.c:984
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../src/protocols/jabber/jabber.c:1012 ../src/protocols/jabber/jabber.c:1020
-#: ../src/protocols/jabber/jabber.c:1028 ../src/protocols/jabber/jabber.c:1036
-#: ../src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/jabber.c:1071
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../src/protocols/jabber/jabber.c:1066
+#: src/protocols/jabber/jabber.c:1093
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../src/protocols/jabber/jabber.c:1067
+#: src/protocols/jabber/jabber.c:1094
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../src/protocols/jabber/jabber.c:1071 ../src/protocols/jabber/jabber.c:1072
+#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../src/protocols/jabber/jabber.c:1128
+#: src/protocols/jabber/jabber.c:1155
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/jabber/jabber.c:1133 ../src/protocols/jabber/jabber.c:1134
+#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasana"
 
-#: ../src/protocols/jabber/jabber.c:1134
+#: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../src/protocols/jabber/jabber.c:1144 ../src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1149 ../src/protocols/toc/toc.c:1694
+#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: ../src/protocols/jabber/jabber.c:1226
+#. }
+#: src/protocols/jabber/jabber.c:1181
+#, fuzzy
+msgid "Search for users"
+msgstr "_Haettava termi:"
+
+#: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1259
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1261
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1263
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1265
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../src/protocols/jabber/jabber.c:1236 ../src/protocols/jabber/jabber.c:1310
+#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1269
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1271
 msgid "Malformed Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1275
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1279
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1281
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1285
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1287
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1258
+#: src/protocols/jabber/jabber.c:1289
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../src/protocols/jabber/jabber.c:1260
+#: src/protocols/jabber/jabber.c:1291
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../src/protocols/jabber/jabber.c:1262
+#: src/protocols/jabber/jabber.c:1293
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../src/protocols/jabber/jabber.c:1264
+#: src/protocols/jabber/jabber.c:1295
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../src/protocols/jabber/jabber.c:1266
+#: src/protocols/jabber/jabber.c:1297
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1304
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../src/protocols/jabber/jabber.c:1275
+#: src/protocols/jabber/jabber.c:1306
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1309
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1312
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1315
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1320
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1322
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1326
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1328
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1331
 msgid "Resource Conflict"
 msgstr "Lähdekonflikti"
 
-#: ../src/protocols/jabber/jabber.c:1302 ../src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1335
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1337
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../src/protocols/jabber/jabber.c:1308
+#: src/protocols/jabber/jabber.c:1339
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1343
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../src/protocols/jabber/jabber.c:1314
+#: src/protocols/jabber/jabber.c:1345
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../src/protocols/jabber/jabber.c:1316
+#: src/protocols/jabber/jabber.c:1347
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: src/protocols/jabber/jabber.c:1349
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1353
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../src/protocols/jabber/jabber.c:1324
+#: src/protocols/jabber/jabber.c:1355
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../src/protocols/jabber/jabber.c:1326
+#: src/protocols/jabber/jabber.c:1357
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: ../src/protocols/jabber/jabber.c:1328
+#: src/protocols/jabber/jabber.c:1359
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../src/protocols/jabber/jabber.c:1330
+#: src/protocols/jabber/jabber.c:1361
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1363
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../src/protocols/jabber/jabber.c:1334
+#: src/protocols/jabber/jabber.c:1365
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../src/protocols/jabber/jabber.c:1336
+#: src/protocols/jabber/jabber.c:1367
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1338
+#: src/protocols/jabber/jabber.c:1369
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../src/protocols/jabber/jabber.c:1340
+#: src/protocols/jabber/jabber.c:1371
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1342
+#: src/protocols/jabber/jabber.c:1373
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../src/protocols/jabber/jabber.c:1344
+#: src/protocols/jabber/jabber.c:1375
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1442
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../src/protocols/jabber/jabber.c:1433
+#: src/protocols/jabber/jabber.c:1464
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1469
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1490
+#: src/protocols/jabber/jabber.c:1521
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: src/protocols/jabber/jabber.c:1547
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: src/protocols/jabber/jabber.c:1551
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: src/protocols/jabber/jabber.c:1560
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1534
+#: src/protocols/jabber/jabber.c:1565
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1540
+#: src/protocols/jabber/jabber.c:1571
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../src/protocols/jabber/jabber.c:1546
+#: src/protocols/jabber/jabber.c:1577
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban <käyttäjä> [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1552
+#: src/protocols/jabber/jabber.c:1583
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6257,19 +6262,19 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../src/protocols/jabber/jabber.c:1558
+#: src/protocols/jabber/jabber.c:1589
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite <käyttäjä> [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1564
+#: src/protocols/jabber/jabber.c:1595
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: <huone> [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1601
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick <käyttäjä> [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1606
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msh <käyttäjä> <viesti>: Lähetä yksityisviesti käyttäjälle."
@@ -6284,95 +6289,94 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1655 ../src/protocols/jabber/jabber.c:1657
+#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokollaliitännäinen"
 
-#: ../src/protocols/jabber/jabber.c:1683
+#: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: ../src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1719
 msgid "Require TLS"
 msgstr "Vaadi TLS"
 
-#: ../src/protocols/jabber/jabber.c:1691
+#: src/protocols/jabber/jabber.c:1722
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../src/protocols/jabber/jabber.c:1696
+#: src/protocols/jabber/jabber.c:1727
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/jabber.c:1701
+#: src/protocols/jabber/jabber.c:1732
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1705 ../src/protocols/silc/silc.c:1601
+#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: ../src/protocols/jabber/message.c:114
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: ../src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: ../src/protocols/jabber/message.c:297
+#: src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../src/protocols/jabber/presence.c:292
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../src/protocols/jabber/presence.c:297 ../src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/jabber/presence.c:305 ../src/protocols/msn/userlist.c:100
-#: ../src/protocols/oscar/oscar.c:4606 ../src/protocols/oscar/oscar.c:7248
-#: ../src/protocols/yahoo/yahoo.c:889
+#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
+#: src/protocols/yahoo/yahoo.c:895
 msgid "Authorize"
 msgstr "Salli"
 
-#: ../src/protocols/jabber/presence.c:306 ../src/protocols/msn/userlist.c:101
-#: ../src/protocols/oscar/oscar.c:4608 ../src/protocols/oscar/oscar.c:7249
-#: ../src/protocols/yahoo/yahoo.c:891
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
+#: src/protocols/yahoo/yahoo.c:897
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../src/protocols/jabber/presence.c:353
-#: ../src/protocols/jabber/presence.c:354
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../src/protocols/jabber/presence.c:355
+#: src/protocols/jabber/presence.c:347
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6380,40 +6384,40 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../src/protocols/jabber/presence.c:357
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "Aseta huoneen asetukset"
 
-#: ../src/protocols/jabber/presence.c:359
+#: src/protocols/jabber/presence.c:351
 msgid "Accept Defaults"
 msgstr "Hyväksy oletusasetukset"
 
-#: ../src/protocols/jabber/presence.c:396
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../src/protocols/jabber/presence.c:399
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
 
-#: ../src/protocols/jabber/si.c:591
+#: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostosiirtoja"
 
-#: ../src/protocols/jabber/si.c:592 ../src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: ../src/protocols/msn/dialog.c:91
+#: src/protocols/msn/dialog.c:91
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Tuttavalistan synkronointiongelma käyttäjätilillä %s (%s)"
 
-#: ../src/protocols/msn/dialog.c:97
+#: src/protocols/msn/dialog.c:97
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6422,7 +6426,7 @@
 "%s paikallisella listalla on ryhmässä \"%s\" mutta ei ole palvelimen "
 "listalla. Haluatko että tämä tuttava lisätään?"
 
-#: ../src/protocols/msn/dialog.c:105
+#: src/protocols/msn/dialog.c:105
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6431,263 +6435,263 @@
 "%s paikallisella listalla mutta ei palvelimen listalla. Haluatko että tämä "
 "tuttava lisätään?"
 
-#: ../src/protocols/msn/error.c:35
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Viestin jäsennys epäonnistui"
 
-#: ../src/protocols/msn/error.c:38
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe Gaimissa)"
 
-#: ../src/protocols/msn/error.c:42
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Epäkelpo sähköpostiosoite"
 
-#: ../src/protocols/msn/error.c:45
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Käyttäjää ei ole"
 
-#: ../src/protocols/msn/error.c:49
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu"
 
-#: ../src/protocols/msn/error.c:52
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Olet jo kirjautuneena sisään"
 
-#: ../src/protocols/msn/error.c:55
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Epäkelpo käyttäjänimi"
 
-#: ../src/protocols/msn/error.c:58
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Epäkelpo tuttavanimi"
 
-#: ../src/protocols/msn/error.c:61
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista täynnä"
 
-#: ../src/protocols/msn/error.c:64
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "On jo siellä"
 
-#: ../src/protocols/msn/error.c:67
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Ei listalla"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
-#: ../src/protocols/msn/error.c:73
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Olet jo kyseisessä tilassa"
 
-#: ../src/protocols/msn/error.c:76
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "On jo vastakkaisessa listassa"
 
-#: ../src/protocols/msn/error.c:79
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Liian monta ryhmää"
 
-#: ../src/protocols/msn/error.c:82
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Epäkelpo ryhmä"
 
-#: ../src/protocols/msn/error.c:85
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Käyttäjä ei ole ryhmässä"
 
-#: ../src/protocols/msn/error.c:88
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Ryhmän nimi liian pitkä"
 
-#: ../src/protocols/msn/error.c:91
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Ei voida poistaa ryhmää nolla"
 
-#: ../src/protocols/msn/error.c:95
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "Yritettiin lisätä tuttavaa ryhmään jota ei ole"
 
-#: ../src/protocols/msn/error.c:99
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Kytkentä epäonnistui"
 
-#: ../src/protocols/msn/error.c:102
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Siirrosta tiedottaminen epäonnistui"
 
-#: ../src/protocols/msn/error.c:106
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Vaadittuja kenttiä puuttuu"
 
-#: ../src/protocols/msn/error.c:109
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:204
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
-#: ../src/protocols/msn/error.c:116
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../src/protocols/msn/error.c:119
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
-#: ../src/protocols/msn/error.c:122
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Komento poistettu käytöstä"
 
-#: ../src/protocols/msn/error.c:125
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
-#: ../src/protocols/msn/error.c:128
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
-#: ../src/protocols/msn/error.c:131
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
-#: ../src/protocols/msn/error.c:135
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
 
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
-#: ../src/protocols/msn/error.c:141
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Vastapään ilmoituspalvelin ei toiminnassa"
 
-#: ../src/protocols/msn/error.c:144
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
-#: ../src/protocols/msn/error.c:148
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
-#: ../src/protocols/msn/error.c:155
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
-#: ../src/protocols/msn/error.c:159
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
-#: ../src/protocols/msn/error.c:162
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#: ../src/protocols/msn/error.c:165
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
-#: ../src/protocols/msn/error.c:168
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
-#: ../src/protocols/msn/error.c:171
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
-#: ../src/protocols/msn/error.c:174
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport-tiliä ei ole varmistettu"
 
-#: ../src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
-#: ../src/protocols/msn/error.c:180
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Odottamaton"
 
-#: ../src/protocols/msn/error.c:185
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
-#: ../src/protocols/msn/error.c:194
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2762
-#: ../src/protocols/silc/ops.c:1503 ../src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
+#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
-#: ../src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
-#: ../src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
-#: ../src/protocols/msn/error.c:217
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
-#: ../src/protocols/msn/error.c:220
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
-#: ../src/protocols/msn/error.c:224
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tuntematon virhekoodi %d"
 
-#: ../src/protocols/msn/error.c:236
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "Olet lähettänyt tönäisyn!"
 
-#: ../src/protocols/msn/msn.c:138
+#: src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: ../src/protocols/msn/msn.c:263
+#: src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../src/protocols/msn/msn.c:278
+#: src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../src/protocols/msn/msn.c:293
+#: src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../src/protocols/msn/msn.c:306
+#: src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6695,29 +6699,29 @@
 "Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../src/protocols/msn/msn.c:311
+#: src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Salli"
 
-#: ../src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../src/protocols/msn/msn.c:328
+#: src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
-#: ../src/protocols/msn/msn.c:354
+#: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../src/protocols/msn/msn.c:356
+#: src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../src/protocols/msn/msn.c:544 ../src/protocols/msn/msn.c:551
-#: ../src/protocols/msn/msn.c:554 ../src/protocols/yahoo/yahoo.c:2786
-#: ../src/protocols/yahoo/yahoo.c:2792
+#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2793
 #, c-format
 msgid ""
 "\n"
@@ -6726,67 +6730,67 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:551
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
-#: ../src/protocols/msn/msn.c:581 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2614 ../src/protocols/yahoo/yahoo.c:3221
+#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:35
-#: ../src/protocols/yahoo/yahoo.c:2624 ../src/protocols/yahoo/yahoo.c:3236
+#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
-#: ../src/protocols/msn/msn.c:593 ../src/protocols/msn/state.c:36
-#: ../src/protocols/yahoo/yahoo.c:2628 ../src/protocols/yahoo/yahoo.c:3242
+#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/msn.c:597 ../src/protocols/zephyr/zephyr.c:2255
-#: ../src/status.c:157
+#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:157
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: ../src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:613
 msgid "Set Friendly Name"
 msgstr "Aseta tuttavanimi"
 
-#: ../src/protocols/msn/msn.c:618
+#: src/protocols/msn/msn.c:618
 msgid "Set Home Phone Number"
 msgstr "Aseta kotipuhelinnumero"
 
-#: ../src/protocols/msn/msn.c:622
+#: src/protocols/msn/msn.c:622
 msgid "Set Work Phone Number"
 msgstr "Aseta työpuhelinnumero"
 
-#: ../src/protocols/msn/msn.c:626
+#: src/protocols/msn/msn.c:626
 msgid "Set Mobile Phone Number"
 msgstr "Aseta matkapuhelinnumero"
 
-#: ../src/protocols/msn/msn.c:632
+#: src/protocols/msn/msn.c:632
 msgid "Enable/Disable Mobile Devices"
 msgstr "Aseta päälle/pois mobiililaitteet"
 
-#: ../src/protocols/msn/msn.c:637
+#: src/protocols/msn/msn.c:637
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Salli/estä mobiilihaut"
 
-#: ../src/protocols/msn/msn.c:647
+#: src/protocols/msn/msn.c:647
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../src/protocols/msn/msn.c:671
+#: src/protocols/msn/msn.c:671
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../src/protocols/msn/msn.c:680 ../src/protocols/novell/novell.c:3448
+#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../src/protocols/msn/msn.c:717
+#: src/protocols/msn/msn.c:717
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6794,95 +6798,89 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:745
+#: src/protocols/msn/msn.c:745
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../src/protocols/msn/msn.c:1395 ../src/protocols/yahoo/yahoo_profile.c:659
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1402 ../src/protocols/msn/msn.c:1748
-#: ../src/protocols/yahoo/yahoo_profile.c:1175 ../src/util.c:801
+#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
+#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1479
+#: src/protocols/msn/msn.c:1471
 msgid "MSN Profile"
 msgstr "MSN-profiili"
 
-#: ../src/protocols/msn/msn.c:1484 ../src/protocols/msn/msn.c:1735
-#: ../src/protocols/yahoo/yahoo_profile.c:765
+#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#. Age
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/oscar/oscar.c:5981
-#: ../src/protocols/trepia/trepia.c:286 ../src/protocols/trepia/trepia.c:405
-#: ../src/protocols/yahoo/yahoo_profile.c:1023
+#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Ikä"
 
-#. Gender
-#: ../src/protocols/msn/msn.c:1561 ../src/protocols/oscar/oscar.c:5968
-#: ../src/protocols/trepia/trepia.c:280 ../src/protocols/trepia/trepia.c:407
-#: ../src/protocols/yahoo/yahoo_profile.c:1033
+#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../src/protocols/msn/msn.c:1570 ../src/protocols/yahoo/yahoo_profile.c:1028
+#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../src/protocols/msn/msn.c:1577 ../src/protocols/novell/novell.c:1454
-#: ../src/protocols/yahoo/yahoo_profile.c:1018
+#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/protocols/msn/msn.c:1585 ../src/protocols/yahoo/yahoo_profile.c:1038
+#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../src/protocols/msn/msn.c:1602 ../src/protocols/msn/msn.c:1608
-#: ../src/protocols/msn/msn.c:1615 ../src/protocols/msn/msn.c:1623
-#: ../src/protocols/msn/msn.c:1630
+#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
+#: src/protocols/msn/msn.c:1622
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../src/protocols/msn/msn.c:1639 ../src/protocols/msn/msn.c:1645
-#: ../src/protocols/msn/msn.c:1652 ../src/protocols/msn/msn.c:1659
+#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
+#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../src/protocols/msn/msn.c:1668 ../src/protocols/msn/msn.c:1674
-#: ../src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1673
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../src/protocols/msn/msn.c:1690 ../src/protocols/msn/msn.c:1696
-#: ../src/protocols/yahoo/yahoo_profile.c:1080
+#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../src/protocols/msn/msn.c:1704
+#: src/protocols/msn/msn.c:1696
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#. Homepage
-#: ../src/protocols/msn/msn.c:1715 ../src/protocols/silc/ops.c:846
-#: ../src/protocols/trepia/trepia.c:290 ../src/protocols/trepia/trepia.c:420
+#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../src/protocols/msn/msn.c:1737
+#: src/protocols/msn/msn.c:1729
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1738
+#: src/protocols/msn/msn.c:1730
 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 "
@@ -6891,7 +6889,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:1742
+#: src/protocols/msn/msn.c:1734
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6899,7 +6897,7 @@
 "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:1748 ../src/protocols/yahoo/yahoo_profile.c:1175
+#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -6913,76 +6911,76 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:1950 ../src/protocols/msn/msn.c:1952
+#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokollaliitännäinen"
 
-#: ../src/protocols/msn/msn.c:1971 ../src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1963
 msgid "Login server"
 msgstr "Sisäänkirjautumispalvelin"
 
-#: ../src/protocols/msn/msn.c:1980
+#: src/protocols/msn/msn.c:1972
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../src/protocols/msn/msn.c:1988
+#: src/protocols/msn/msn.c:1980
 msgid "nudge: nudge a contact to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
-#: ../src/protocols/msn/nexus.c:103 ../src/protocols/msn/servconn.c:127
-#: ../src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: ../src/protocols/msn/notification.c:178
+#: src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ei ole kelvollinen ryhmä"
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:528 ../src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
+#: src/protocols/msn/session.c:347
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
-#: ../src/protocols/msn/notification.c:187
+#: src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s tilillä %s (%s)"
 
-#: ../src/protocols/msn/notification.c:498
+#: src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Ei voitu lisätä käyttäjää %s (%s)"
 
-#: ../src/protocols/msn/notification.c:502
+#: src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ei voitu estää käyttäjää %s (%s)"
 
-#: ../src/protocols/msn/notification.c:506
+#: src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Ei voida sallia käyttäjää %s (%s)"
 
-#: ../src/protocols/msn/notification.c:514
+#: src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Käyttäjää %s ei voitu lisätä koska tuttavalista on täynnä."
 
-#: ../src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ei ole kelvollinen passport-tili"
 
-#: ../src/protocols/msn/notification.c:811
+#: src/protocols/msn/notification.c:815
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:870
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voitu poistaa"
 
-#: ../src/protocols/msn/notification.c:1299
+#: src/protocols/msn/notification.c:1303
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7011,199 +7009,197 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: ../src/protocols/msn/servconn.c:129
+#: src/protocols/msn/servconn.c:129
 msgid "Writing error"
 msgstr "Virhe kirjoitettaessa"
 
-#: ../src/protocols/msn/servconn.c:131
+#: src/protocols/msn/servconn.c:131
 msgid "Reading error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/msn/servconn.c:133 ../src/protocols/msn/session.c:339
-#: ../src/protocols/oscar/oscar.c:4929
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4925
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/protocols/msn/servconn.c:136
+#: src/protocols/msn/servconn.c:136
 #, c-format
 msgid ""
 "Connection error from %s server (%s):\n"
 "%s"
 msgstr "Yhteysvirhe: %s palvelin (%s):%s"
 
-#: ../src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:317
 msgid "Our protocol is not supported by the server."
 msgstr "Palvelin ei tue protokollaa."
 
-#: ../src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:321
 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:325 ../src/protocols/napster/napster.c:450
-#: ../src/protocols/oscar/oscar.c:5632 ../src/protocols/yahoo/yahoo.c:189
+#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
+#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
-#: ../src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:328
 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:333
+#: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:337
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:342
 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:363 ../src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:364
 msgid "Transferring"
 msgstr "Siirtää"
 
-#: ../src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:366
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:367
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:369
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../src/protocols/msn/session.c:370 ../src/protocols/trepia/trepia.c:637
+#: src/protocols/msn/session.c:370
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
-#: ../src/protocols/msn/state.c:34
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
-#: ../src/protocols/msn/switchboard.c:403
+#: src/protocols/msn/switchboard.c:403
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Viestiä ei välttämättä lähetetty koska tapahtui aikakatkaisu:"
 
-#: ../src/protocols/msn/switchboard.c:411
+#: src/protocols/msn/switchboard.c:411
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Viestien lähetys ei ole sallittu näkymättömänä:"
 
-#: ../src/protocols/msn/switchboard.c:415
+#: src/protocols/msn/switchboard.c:415
 msgid "Message could not be sent because the user is offline:"
 msgstr "Viestiä ei voitu lähettää koska käyttäjä on poissa linjoilta:"
 
-#: ../src/protocols/msn/switchboard.c:419
+#: src/protocols/msn/switchboard.c:419
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Viestiä ei voitu lähettää yhteysvirheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:423
+#: src/protocols/msn/switchboard.c:423
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Viestiä ei voitu lähettää switchboard-virheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:431
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:952
+#: src/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
 
-#: ../src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:85
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:276
+#: src/protocols/msn/userlist.c:275
 #, c-format
 msgid "%s has added you to his or her contact list."
 msgstr "Käyttäjä %s on lisännyt sinut tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:340
+#: src/protocols/msn/userlist.c:339
 #, c-format
 msgid "%s has removed you from his or her contact list."
 msgstr "%s on poistanut sinut tuttavalistaltaan."
 
-#: ../src/protocols/msn/userlist.c:655
+#: src/protocols/msn/userlist.c:659
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ei voitu lisätä \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:657
+#: src/protocols/msn/userlist.c:661
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
-#: ../src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "Otsikkotietoja ei kyetty lukemaan palvelimelta."
 
-#: ../src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %hd."
 
-#: ../src/protocols/napster/napster.c:290
+#: src/protocols/napster/napster.c:290
 msgid "Unknown server error."
 msgstr "Tuntematon palvelinvirhe."
 
-#: ../src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:339
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "käyttäjiä: %s, tiedostoja: %s, koko: %sGt"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:350
+#: src/protocols/napster/napster.c:350
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Ei voitu lisätä \"%s\" Napster-hotlistiin"
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../src/protocols/napster/napster.c:357
+#: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
 #. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:414
 #, c-format
 msgid "%s requested your information"
 msgstr "%s pyysi tietojasi"
 
 #. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:454
+#: src/protocols/napster/napster.c:454
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s pyysi PING-sanoman"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/napster/napster.c:501
-#: ../src/protocols/napster/napster.c:532 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2214 ../src/protocols/yahoo/yahoo.c:2241
-#: ../src/protocols/yahoo/yahoo.c:2304
-#: ../src/protocols/yahoo/yahoo_filexfer.c:71
-#: ../src/protocols/yahoo/yahoo_filexfer.c:115
-#: ../src/protocols/yahoo/ycht.c:483
+#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
+#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
+#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/yahoo/yahoo_filexfer.c:69
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
-#: ../src/protocols/napster/napster.c:590 ../src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -7217,92 +7213,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/napster/napster.c:687
-#: ../src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protokollaliitännäinen"
 
-#: ../src/protocols/novell/nmuser.c:1868
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Vaadittuja parametreja ei syötetty"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Ei voida kirjoittaa verkkoon"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Ei voida lukea verkosta"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Virhe kommunikoitaessa palvelimelle"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Konferenssia ei löydy"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Konferenssia ei ole"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Sen niminen kansio on jo olemassa"
 
-#: ../src/protocols/novell/nmuser.c:1891
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Ei tueta"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Salasana vanhentunut"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Virheellinen salasana"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Käyttäjää ei löydy"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Käyttäjätili on poistettu käytöstä"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Palvelin ei pääse hakemistoon"
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Järjestelmänne ylläpitäjä on estänyt tämän toiminnon."
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Palvelin ei ole käytössä; yritä myöhemmin uudelleen"
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Tuttavaa ei voi lisätä samaan hakemistoon kahdesti"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Et voi lisätä itseäsi"
 
-#: ../src/protocols/novell/nmuser.c:1922
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Pääarkisto on väärin konfiguroitu"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Epäkelpo käyttäjänimi tai salasana"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ei voitu tunnistaa syöttämäsi käyttäjän isäntää."
 
-#: ../src/protocols/novell/nmuser.c:1932
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -7310,31 +7305,31 @@
 "Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on "
 "syötetty"
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Et voi lisätä samaa henkilöä kahdesti keskusteluun"
 
-#: ../src/protocols/novell/nmuser.c:1939
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Olet saavuttanut rajasi sallittujen tuttavien määrässä"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Olet syöttänyt epäkelvon käyttäjänimen"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Virhe tapahtui päivitettäessä hakemistoa"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Epäyhteensopiva protokollaversio"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Käyttäjä on estänyt sinut"
 
-#: ../src/protocols/novell/nmuser.c:1954
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7342,53 +7337,53 @@
 "Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena "
 "sisään samaan aikaan"
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "Käyttäjä on joko poissa linjoilta tai sinut on estetty"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
 
-#: ../src/protocols/novell/novell.c:117
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Kirjautuminen epäonnistui (%s)."
 
-#: ../src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:232
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Viestiä ei voitu lähettää. Ei saatu yksityiskohtia käyttäjälle (%s)."
 
-#: ../src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:381
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ei voitu lisätä %s tuttavalistalle (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:407
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Viestiä ei voitu lähettää (%s)."
 
-#: ../src/protocols/novell/novell.c:478 ../src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ei voitu kutsua käyttäjää (%s)."
 
-#: ../src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:517
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Ei voitu lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:522
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Viestiä ei voitu lähettää. Ei voitu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:569
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7397,7 +7392,7 @@
 "Ei voitu siirtää käyttäjää %s kansioon %s palvelinpuolen listalla. Virhe "
 "luotaessa kansiota (%s)."
 
-#: ../src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:617
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7406,67 +7401,67 @@
 "Ei voitu lisätä %s tuttavalistalle. Virhe luotaessa kansiota palvelinpuolen "
 "listalle (%s)."
 
-#: ../src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:690
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ei saatu yksityiskohtia käyttäjälle %s (%s)."
 
-#: ../src/protocols/novell/novell.c:736 ../src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Ei voitu lisätä käyttäjää yksityisyys-listalle (%s)."
 
-#: ../src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:783
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Ei voitu lisätä %s kieltolistalle (%s)."
 
-#: ../src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:836
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Ei voitu lisätä %s sallitut-listalle (%s)."
 
-#: ../src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:904
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
 
-#: ../src/protocols/novell/novell.c:927 ../src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
 
-#: ../src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:999
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ei voitu luoda konferenssia (%s)."
 
-#: ../src/protocols/novell/novell.c:1110 ../src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: ../src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1452
 msgid "Telephone Number"
 msgstr "Puhelinnumero"
 
-#: ../src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1456
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1458
 msgid "Personal Title"
 msgstr "Titteli"
 
-#: ../src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1462
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1464 ../src/protocols/oscar/oscar.c:5954
-#: ../src/protocols/oscar/oscar.c:5961
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
+#: src/protocols/oscar/oscar.c:5972
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1480
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -7477,46 +7472,46 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1618
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: ../src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1643
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: ../src/protocols/novell/novell.c:1673
+#: src/protocols/novell/novell.c:1673
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Virhe käsiteltäessä tapahtumaa tai vastausta. (%s)"
 
-#: ../src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1707
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: ../src/protocols/novell/novell.c:1719
+#: src/protocols/novell/novell.c:1719
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: ../src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1722
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: ../src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1857
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: ../src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1885
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: ../src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1886
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7527,16 +7522,16 @@
 "\n"
 "Lähetetty: %s"
 
-#: ../src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1888
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: ../src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:1995
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: ../src/protocols/novell/novell.c:2051
+#: src/protocols/novell/novell.c:2051
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7546,7 +7541,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2149
+#: src/protocols/novell/novell.c:2149
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7554,16 +7549,16 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: ../src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2171
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: ../src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2475
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
-#: ../src/protocols/novell/novell.c:2965 ../src/protocols/novell/novell.c:3053
-#: ../src/protocols/yahoo/yahoo.c:2838
+#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
+#: src/protocols/yahoo/yahoo.c:2839
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
@@ -7577,115 +7572,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3546 ../src/protocols/novell/novell.c:3548
+#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger -protokollaliitännäinen"
 
-#: ../src/protocols/novell/novell.c:3567
+#: src/protocols/novell/novell.c:3561
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../src/protocols/novell/novell.c:3571
+#: src/protocols/novell/novell.c:3565
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: ../src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:202
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
-#: ../src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:203
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-#: ../src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "Nopeus isäntään"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:205
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: ../src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:207
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
-#: ../src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:208
 msgid "Service not defined"
 msgstr "Palvelua ei määritelty"
 
-#: ../src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:209
 msgid "Obsolete SNAC"
 msgstr "Vanhentunut SNAC"
 
-#: ../src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:210
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkoisännässä"
 
-#: ../src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:211
 msgid "Not supported by client"
 msgstr "Ei tuettu asiakasohjelmassa"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:212
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:213
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:214
 msgid "Responses lost"
 msgstr "Vastaukset menetetty"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:215
 msgid "Request denied"
 msgstr "Pyyntö evätty"
 
-#: ../src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:216
 msgid "Busted SNAC payload"
 msgstr "Rikkoutunut SNAC-data"
 
-#: ../src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:217
 msgid "Insufficient rights"
 msgstr "Liian vähän oikeuksia"
 
-#: ../src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:218
 msgid "In local permit/deny"
 msgstr "Paikallisessa sallittujen/estettyjen listassa"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:219
 msgid "Too evil (sender)"
 msgstr "Lähettäjä liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:218
+#: src/protocols/oscar/oscar.c:220
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: src/protocols/oscar/oscar.c:221
 msgid "User temporarily unavailable"
 msgstr "Käyttäjä ei tilapäisesti saatavilla."
 
-#: ../src/protocols/oscar/oscar.c:220
+#: src/protocols/oscar/oscar.c:222
 msgid "No match"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/oscar/oscar.c:221
+#: src/protocols/oscar/oscar.c:223
 msgid "List overflow"
 msgstr "Lista-ylivuoto"
 
-#: ../src/protocols/oscar/oscar.c:222
+#: src/protocols/oscar/oscar.c:224
 msgid "Request ambiguous"
 msgstr "Pyyntö ei ole yksiselitteinen"
 
-#: ../src/protocols/oscar/oscar.c:223
+#: src/protocols/oscar/oscar.c:225
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: src/protocols/oscar/oscar.c:226
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../src/protocols/oscar/oscar.c:415 ../src/protocols/oscar/oscar.c:500
+#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7693,159 +7688,159 @@
 "(Tämän viestin vastaanotossa oli virhe. Henkilö jonka kanssa keskustelet "
 "käyttää todennäköisesti virheellistä asiakasohjelmaa.)"
 
-#: ../src/protocols/oscar/oscar.c:614
+#: src/protocols/oscar/oscar.c:616
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../src/protocols/oscar/oscar.c:617
+#: src/protocols/oscar/oscar.c:619
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:620 ../src/protocols/silc/silc.c:667
-#: ../src/protocols/silc/util.c:509
+#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
+#: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/protocols/oscar/oscar.c:623 ../src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../src/protocols/oscar/oscar.c:630
+#: src/protocols/oscar/oscar.c:632
 msgid "Games"
 msgstr "Pelit"
 
-#: ../src/protocols/oscar/oscar.c:633
+#: src/protocols/oscar/oscar.c:635
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../src/protocols/oscar/oscar.c:636
+#: src/protocols/oscar/oscar.c:638
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: ../src/protocols/oscar/oscar.c:639
+#: src/protocols/oscar/oscar.c:641
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../src/protocols/oscar/oscar.c:642
+#: src/protocols/oscar/oscar.c:644
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:647
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:650
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:653
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
-#: ../src/protocols/oscar/oscar.c:654
+#: src/protocols/oscar/oscar.c:656
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:657
+#: src/protocols/oscar/oscar.c:659
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../src/protocols/oscar/oscar.c:660
+#: src/protocols/oscar/oscar.c:662
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:663
+#: src/protocols/oscar/oscar.c:665
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:666
+#: src/protocols/oscar/oscar.c:668
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: ../src/protocols/oscar/oscar.c:669
+#: src/protocols/oscar/oscar.c:671
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/protocols/oscar/oscar.c:673
+#: src/protocols/oscar/oscar.c:675
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:676
+#: src/protocols/oscar/oscar.c:678
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:681
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:697 ../src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../src/protocols/oscar/oscar.c:701 ../src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../src/protocols/oscar/oscar.c:703 ../src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:709
 msgid "Web Aware"
 msgstr "Net-tietoisena"
 
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../src/protocols/oscar/oscar.c:790
+#: src/protocols/oscar/oscar.c:792
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../src/protocols/oscar/oscar.c:799
+#: src/protocols/oscar/oscar.c:801
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:958
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: ../src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:960
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:966
+#: src/protocols/oscar/oscar.c:968
 msgid "Direct Connect failed"
 msgstr "Suorayhteys epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:1043 ../src/protocols/oscar/oscar.c:1174
+#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
 
-#: ../src/protocols/oscar/oscar.c:1124
+#: src/protocols/oscar/oscar.c:1126
 #, 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:1545
+#: src/protocols/oscar/oscar.c:1547
 #, 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:1550
+#: src/protocols/oscar/oscar.c:1552
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviestiyhteyttä"
 
-#: ../src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, 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:1589
+#: src/protocols/oscar/oscar.c:1591
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7853,24 +7848,24 @@
 "Koska tämä paljastaa IP-osoitteesi, se voidaan ajatella yksityisyysriskiksi. "
 "Haluatko jatkaa?"
 
-#: ../src/protocols/oscar/oscar.c:1593 ../src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/protocols/oscar/oscar.c:1659
+#: src/protocols/oscar/oscar.c:1661
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../src/protocols/oscar/oscar.c:1682
+#: src/protocols/oscar/oscar.c:1684
 msgid "Chat is currently unavailable"
 msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
 
-#: ../src/protocols/oscar/oscar.c:1752
+#: src/protocols/oscar/oscar.c:1754
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:1776
+#: src/protocols/oscar/oscar.c:1770
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7881,22 +7876,22 @@
 "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:1805
+#: src/protocols/oscar/oscar.c:1799
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: ../src/protocols/oscar/oscar.c:1909 ../src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: ../src/protocols/oscar/oscar.c:1917
+#: src/protocols/oscar/oscar.c:1911
 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
 #. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2069
+#: src/protocols/oscar/oscar.c:2063
 msgid "Attempting connection redirect..."
 msgstr "Yritetään yhteyden uudelleenreititystä..."
 
@@ -7904,7 +7899,7 @@
 #. * 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/2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2114
+#: src/protocols/oscar/oscar.c:2108
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
@@ -7915,40 +7910,39 @@
 " Kokeile välipalvelimien käyttöönottoa tiedostonsiirroille kohdassa Työkalut-"
 ">Asetukset->AIM/ICQ."
 
-#: ../src/protocols/oscar/oscar.c:2212
-#: ../src/protocols/yahoo/yahoo_filexfer.c:178
-#: ../src/protocols/yahoo/yahoo_filexfer.c:187
-#: ../src/protocols/yahoo/yahoo_filexfer.c:196
+#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/yahoo/yahoo_filexfer.c:183
+#: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: ../src/protocols/oscar/oscar.c:2217
+#: src/protocols/oscar/oscar.c:2211
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen epäonnistui."
 
-#: ../src/protocols/oscar/oscar.c:2451 ../src/protocols/oscar/oscar.c:2460
-#: ../src/protocols/oscar/oscar.c:2474 ../src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
 msgid "Unable to log into file transfer proxy."
 msgstr "Ei kyetty kirjautumaan tiedostonsiirtovälipalvelimeen."
 
-#: ../src/protocols/oscar/oscar.c:2538
+#: src/protocols/oscar/oscar.c:2532
 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:2739 ../src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: ../src/protocols/oscar/oscar.c:2744
+#: src/protocols/oscar/oscar.c:2738
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2748
+#: src/protocols/oscar/oscar.c:2742
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/oscar/oscar.c:2753
+#: src/protocols/oscar/oscar.c:2747
 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."
@@ -7957,33 +7951,33 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:2752
 #, 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:2789
+#: src/protocols/oscar/oscar.c:2783
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: ../src/protocols/oscar/oscar.c:2859
+#: src/protocols/oscar/oscar.c:2853
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../src/protocols/oscar/oscar.c:2883
+#: src/protocols/oscar/oscar.c:2877
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:2891
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../src/protocols/oscar/oscar.c:2898
+#: src/protocols/oscar/oscar.c:2892
 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:2938 ../src/protocols/oscar/oscar.c:2968
-#: ../src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
+#: src/protocols/oscar/oscar.c:3051
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7992,24 +7986,24 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-protokollaa "
 "kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../src/protocols/oscar/oscar.c:2941 ../src/protocols/oscar/oscar.c:2971
+#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ei saanut kelvollista AIM:n sisäänkirjautumis-hash:iä."
 
-#: ../src/protocols/oscar/oscar.c:3060
+#: src/protocols/oscar/oscar.c:3054
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumis-hash:iä."
 
-#: ../src/protocols/oscar/oscar.c:3091
+#: src/protocols/oscar/oscar.c:3085
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4352
 #, 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:4359
+#: src/protocols/oscar/oscar.c:4355
 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 "
@@ -8019,19 +8013,19 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: ../src/protocols/oscar/oscar.c:4398
+#: src/protocols/oscar/oscar.c:4394
 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:4406
+#: src/protocols/oscar/oscar.c:4402
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../src/protocols/oscar/oscar.c:4407
+#: src/protocols/oscar/oscar.c:4403
 msgid "Please authorize me!"
 msgstr "Valtuuta minut."
 
-#: ../src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:4433
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8040,21 +8034,21 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: ../src/protocols/oscar/oscar.c:4442 ../src/protocols/oscar/oscar.c:4444
+#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:4482 ../src/protocols/oscar/oscar.c:4488
-#: ../src/protocols/oscar/oscar.c:4592 ../src/protocols/oscar/oscar.c:4616
-#: ../src/protocols/oscar/oscar.c:7234 ../src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../src/protocols/oscar/oscar.c:4487
+#: src/protocols/oscar/oscar.c:4483
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:4590
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8063,11 +8057,11 @@
 "Käyttäjä %u haluaa lisätä %s:n tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4604 ../src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
-#: ../src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4612
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8078,17 +8072,17 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4613
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4624
+#: src/protocols/oscar/oscar.c:4620
 #, 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:4632
+#: src/protocols/oscar/oscar.c:4628
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8101,7 +8095,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4640
+#: src/protocols/oscar/oscar.c:4636
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8114,7 +8108,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4648
+#: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8127,34 +8121,34 @@
 "Viesti on:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4669
+#: src/protocols/oscar/oscar.c:4665
 #, 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:4675
+#: src/protocols/oscar/oscar.c:4671
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../src/protocols/oscar/oscar.c:4679
+#: src/protocols/oscar/oscar.c:4675
 msgid "Decline"
 msgstr "Evää"
 
-#: ../src/protocols/oscar/oscar.c:4763
+#: src/protocols/oscar/oscar.c:4759
 #, 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:4772
+#: src/protocols/oscar/oscar.c:4768
 #, 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:4781
+#: src/protocols/oscar/oscar.c:4777
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8163,78 +8157,77 @@
 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:4790
+#: src/protocols/oscar/oscar.c:4786
 #, 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:4799
+#: src/protocols/oscar/oscar.c:4795
 #, 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:4808
+#: src/protocols/oscar/oscar.c:4804
 #, 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:4867
+#: src/protocols/oscar/oscar.c:4863
 #, 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:4928
+#: src/protocols/oscar/oscar.c:4924
 #, 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:4965
+#: src/protocols/oscar/oscar.c:4961
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../src/protocols/oscar/oscar.c:4965 ../src/protocols/oscar/oscar.c:4970
-#: ../src/protocols/oscar/oscar.c:5028 ../src/protocols/oscar/oscar.c:5032
+#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
+#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../src/protocols/oscar/oscar.c:4968
+#: src/protocols/oscar/oscar.c:4964
 #, 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:5028
+#: src/protocols/oscar/oscar.c:5024
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5027
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5054
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../src/protocols/oscar/oscar.c:5063
-#: ../src/protocols/yahoo/yahoo_profile.c:1126
+#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../src/protocols/oscar/oscar.c:5145
+#: src/protocols/oscar/oscar.c:5142
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5331
+#: src/protocols/oscar/oscar.c:5328
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8242,11 +8235,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../src/protocols/oscar/oscar.c:5557
+#: src/protocols/oscar/oscar.c:5554
 msgid "Rate limiting error."
 msgstr "Määrärajoitusvirhe"
 
-#: ../src/protocols/oscar/oscar.c:5558
+#: src/protocols/oscar/oscar.c:5555
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8254,107 +8247,105 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:5634
+#: src/protocols/oscar/oscar.c:5631
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:5647 ../src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5644 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:5672
+#: src/protocols/oscar/oscar.c:5669
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../src/protocols/oscar/oscar.c:5940
+#: src/protocols/oscar/oscar.c:5951
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/oscar/oscar.c:5966 ../src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/protocols/oscar/oscar.c:5968 ../src/protocols/trepia/trepia.c:282
-#: ../src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5979
 msgid "Female"
 msgstr "Nainen"
 
-#: ../src/protocols/oscar/oscar.c:5968 ../src/protocols/trepia/trepia.c:281
-#: ../src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5979
 msgid "Male"
 msgstr "Mies"
 
-#: ../src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5995
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:5988
+#: src/protocols/oscar/oscar.c:5999
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../src/protocols/oscar/oscar.c:5993
+#: src/protocols/oscar/oscar.c:6004
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../src/protocols/oscar/oscar.c:5997 ../src/protocols/oscar/oscar.c:6005
+#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:6012
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../src/protocols/oscar/oscar.c:6009
+#: src/protocols/oscar/oscar.c:6020
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../src/protocols/oscar/oscar.c:6010
+#: src/protocols/oscar/oscar.c:6021
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6022
 msgid "Division"
 msgstr "Osasto"
 
-#: ../src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6023
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/protocols/oscar/oscar.c:6014
+#: src/protocols/oscar/oscar.c:6025
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:6071
+#: src/protocols/oscar/oscar.c:6082
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
 #. TODO: Need to use ngettext() here
-#: ../src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6111
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../src/protocols/oscar/oscar.c:6129
+#: src/protocols/oscar/oscar.c:6140
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:6161
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../src/protocols/oscar/oscar.c:6152
+#: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6194
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../src/protocols/oscar/oscar.c:6186
+#: src/protocols/oscar/oscar.c:6197
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8363,14 +8354,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6200
 #, 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:6192
+#: src/protocols/oscar/oscar.c:6203
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8379,7 +8370,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:6195
+#: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8388,7 +8379,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:6198
+#: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8397,7 +8388,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:6201
+#: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8406,12 +8397,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:6204
+#: src/protocols/oscar/oscar.c:6215
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6225
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8420,27 +8411,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6215 ../src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../src/protocols/oscar/oscar.c:6220
+#: src/protocols/oscar/oscar.c:6231
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../src/protocols/oscar/oscar.c:6287
+#: src/protocols/oscar/oscar.c:6298
 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:6471
+#: src/protocols/oscar/oscar.c:6480
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../src/protocols/oscar/oscar.c:6472
+#: src/protocols/oscar/oscar.c:6481
 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 "
@@ -8450,7 +8441,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../src/protocols/oscar/oscar.c:6486
+#: src/protocols/oscar/oscar.c:6495
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8463,11 +8454,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:6491
+#: src/protocols/oscar/oscar.c:6500
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:6514 ../src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8480,15 +8471,15 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:6519 ../src/protocols/oscar/oscar.c:6592
+#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:6551
+#: src/protocols/oscar/oscar.c:6560
 msgid "Unable to set AIM away message."
 msgstr "AIM-poissaoloviestin asettaminen epäonnistui."
 
-#: ../src/protocols/oscar/oscar.c:6552
+#: src/protocols/oscar/oscar.c:6561
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8498,7 +8489,7 @@
 "sisäänkirjautumisen päättymistä. Pysyt edelleen nykyisessä tilassa; yritä "
 "asettaa viesti kun kirjautumisprosessi on päättynyt."
 
-#: ../src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6691
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8509,16 +8500,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:6694 ../src/protocols/oscar/oscar.c:7092
-#: ../src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
+#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6798
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../src/protocols/oscar/oscar.c:6799
+#: src/protocols/oscar/oscar.c:6799
 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 "
@@ -8527,13 +8518,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../src/protocols/oscar/oscar.c:6983 ../src/protocols/oscar/oscar.c:6984
-#: ../src/protocols/oscar/oscar.c:6989 ../src/protocols/oscar/oscar.c:7150
-#: ../src/protocols/oscar/oscar.c:7151 ../src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
+#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
+#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../src/protocols/oscar/oscar.c:7090
+#: src/protocols/oscar/oscar.c:7090
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8542,11 +8533,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:7090 ../src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7104
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8556,7 +8547,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:7187
+#: src/protocols/oscar/oscar.c:7187
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8565,11 +8556,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:7193
+#: src/protocols/oscar/oscar.c:7193
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: ../src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7237
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8580,17 +8571,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7282
 #, 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:7283
+#: src/protocols/oscar/oscar.c:7283
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7286
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8601,96 +8592,96 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7287
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../src/protocols/oscar/oscar.c:7360
+#: src/protocols/oscar/oscar.c:7360
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7430
 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:7565
+#: src/protocols/oscar/oscar.c:7565
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../src/protocols/oscar/oscar.c:7854
+#: src/protocols/oscar/oscar.c:7854
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../src/protocols/oscar/oscar.c:7855
+#: src/protocols/oscar/oscar.c:7855
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:7874
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../src/protocols/oscar/oscar.c:7880
+#: src/protocols/oscar/oscar.c:7880
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../src/protocols/oscar/oscar.c:7892
+#: src/protocols/oscar/oscar.c:7892
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:7909
+#: src/protocols/oscar/oscar.c:7909
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../src/protocols/oscar/oscar.c:7969
+#: src/protocols/oscar/oscar.c:7969
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:7972
+#: src/protocols/oscar/oscar.c:7972
 msgid "Hide IP address"
 msgstr "Piilota IP-osoite"
 
-#: ../src/protocols/oscar/oscar.c:7975
+#: src/protocols/oscar/oscar.c:7975
 msgid "Web aware"
 msgstr "Net-tietoisena"
 
-#: ../src/protocols/oscar/oscar.c:7980
+#: src/protocols/oscar/oscar.c:7980
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../src/protocols/oscar/oscar.c:7997
+#: src/protocols/oscar/oscar.c:7997
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:7998
+#: src/protocols/oscar/oscar.c:7998
 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:8005
+#: src/protocols/oscar/oscar.c:8005
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: ../src/protocols/oscar/oscar.c:8057
+#: src/protocols/oscar/oscar.c:8057
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../src/protocols/oscar/oscar.c:8102
+#: src/protocols/oscar/oscar.c:8102
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../src/protocols/oscar/oscar.c:8105
+#: src/protocols/oscar/oscar.c:8105
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../src/protocols/oscar/oscar.c:8106
+#: src/protocols/oscar/oscar.c:8106
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8698,81 +8689,81 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../src/protocols/oscar/oscar.c:8123
+#: src/protocols/oscar/oscar.c:8123
 msgid "Find Buddy by E-mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8124
+#: src/protocols/oscar/oscar.c:8124
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8125
+#: src/protocols/oscar/oscar.c:8125
 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:8212 ../src/protocols/silc/silc.c:825
+#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
-#: ../src/protocols/oscar/oscar.c:8218
+#: src/protocols/oscar/oscar.c:8218
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8223 ../src/protocols/silc/silc.c:821
+#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
-#: ../src/protocols/oscar/oscar.c:8229
+#: src/protocols/oscar/oscar.c:8229
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8233
+#: src/protocols/oscar/oscar.c:8233
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8243
+#: src/protocols/oscar/oscar.c:8243
 msgid "Show privacy options..."
 msgstr "Näytä yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8250
+#: src/protocols/oscar/oscar.c:8250
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: ../src/protocols/oscar/oscar.c:8254
+#: src/protocols/oscar/oscar.c:8254
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../src/protocols/oscar/oscar.c:8258
+#: src/protocols/oscar/oscar.c:8258
 msgid "Display Currently Registered Address"
 msgstr "Näytä rekisteröity osoite"
 
-#: ../src/protocols/oscar/oscar.c:8262
+#: src/protocols/oscar/oscar.c:8262
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekisteröityä osoitetta"
 
-#: ../src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:8269
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:8275
+#: src/protocols/oscar/oscar.c:8275
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8280
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8350
+#: src/protocols/oscar/oscar.c:8350
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../src/protocols/oscar/oscar.c:8353
+#: src/protocols/oscar/oscar.c:8353
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../src/protocols/oscar/oscar.c:8362
+#: src/protocols/oscar/oscar.c:8362
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr ""
 "Käytä AIM/ICQ-välipalvelinta (hitaampi/turvallisempi/toimii useimmiten)"
@@ -8787,70 +8778,178 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8476 ../src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokollaliitännäinen"
 
-#: ../src/protocols/oscar/oscar.c:8497
+#: src/protocols/oscar/oscar.c:8497
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: ../src/protocols/oscar/oscar.c:8500
+#: src/protocols/oscar/oscar.c:8500
 msgid "Auth port"
 msgstr "Portti"
 
-#: ../src/protocols/oscar/oscar.c:8503 ../src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Merkistö"
 
-#: ../src/protocols/silc/buddy.c:51 ../src/protocols/silc/buddy.c:419
-#: ../src/protocols/silc/buddy.c:544 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: src/protocols/sametime/sametime.c:1134
+#, fuzzy
+msgid "Sending Handshake"
+msgstr "Lähetetään evästettä"
+
+#: src/protocols/sametime/sametime.c:1139
+#, fuzzy
+msgid "Waiting for Handshake Acknowledgement"
+msgstr "Odotetaan lähetyksen alkamista"
+
+#: src/protocols/sametime/sametime.c:1144
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1149
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1154
+#, fuzzy
+msgid "Login Redirected"
+msgstr "Sisäänkirjautumispalvelin"
+
+#: src/protocols/sametime/sametime.c:1159
+#, fuzzy
+msgid "Forcing Login"
+msgstr "Kirjaudutaan sisään"
+
+#: src/protocols/sametime/sametime.c:1163
+msgid "Login Acknowledged"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1168
+#, fuzzy
+msgid "Connected to Sametime Community Server"
+msgstr "Yhdistetään SILC-palvelimelle"
+
+#. * @todo Admin alerts should probably be in a conversation window
+#. rather than a gaim_notify_message. Or in some sort of updating
+#. dialog, or something.
+#: src/protocols/sametime/sametime.c:1263
+msgid "Admin Alert"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:2758
+msgid "Active"
+msgstr "Aktiivinen"
+
+#: src/protocols/simple/simple.c:202
+#, c-format
+msgid ""
+"Could not add the buddy %s because every simple user has to start with "
+"'sip:'."
+msgstr ""
+
+#: src/protocols/simple/simple.c:1209
+#, fuzzy
+msgid "Could not create listen socket"
+msgstr "Pistokkeen luominen epäonnistui"
+
+#: src/protocols/simple/simple.c:1263
+#, fuzzy
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/simple/simple.c:1408
+#, fuzzy
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SILC-protokollaliitännäinen"
+
+#. *  summary
+#: src/protocols/simple/simple.c:1409
+#, fuzzy
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SILC-protokollaliitännäinen"
+
+#. *  description
+#: src/protocols/simple/simple.c:1410
+msgid "Thomas Butter <butter@uni-mannheim.de>"
+msgstr ""
+
+#: src/protocols/simple/simple.c:1431
+msgid "Publish Status (note: everyone may watch you)"
+msgstr ""
+
+#: src/protocols/simple/simple.c:1434
+#, fuzzy
+msgid "Use UDP"
+msgstr "Käyttäjän ID"
+
+#: src/protocols/simple/simple.c:1436
+#, fuzzy
+msgid "Use Proxy"
+msgstr "Ei välipalvelinta"
+
+#: src/protocols/simple/simple.c:1438
+#, fuzzy
+msgid "Proxy"
+msgstr "Ei välipalvelinta"
+
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
+#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+#: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Käyttäjä %s ei ole läsnä verkossa"
 
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:114
-#: ../src/protocols/silc/buddy.c:119 ../src/protocols/silc/buddy.c:123
-#: ../src/protocols/silc/buddy.c:128 ../src/protocols/silc/buddy.c:133
-#: ../src/protocols/silc/buddy.c:138 ../src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
+#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
+#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
 msgid "Key Agreement"
 msgstr "Avainsopimus"
 
-#: ../src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
 msgstr "Ei voida suorittaa avainsopimusta"
 
-#: ../src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:115
 msgid "Error occurred during key agreement"
 msgstr "Virhe tapahtui avainsopimuksen aikana"
 
-#: ../src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:119
 msgid "Key Agreement failed"
 msgstr "Avainsopimus epäonnistui"
 
-#: ../src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:124
 msgid "Timeout during key agreement"
 msgstr "Aikakatkaisu avainsopimuksen aikana"
 
-#: ../src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:129
 msgid "Key agreement was aborted"
 msgstr "Avainsopimus peruutettiin"
 
-#: ../src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:134
 msgid "Key agreement is already started"
 msgstr "Avainsopimus on jo aloitettu"
 
-#: ../src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:139
 msgid "Key agreement cannot be started with yourself"
 msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
 
-#: ../src/protocols/silc/buddy.c:257 ../src/protocols/silc/buddy.c:387
-#: ../src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:512
 msgid "The remote user is not present in the network any more"
 msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
 
-#: ../src/protocols/silc/buddy.c:293
+#: src/protocols/silc/buddy.c:293
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8859,7 +8958,7 @@
 "Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
 "avainsopimuksen?"
 
-#: ../src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:297
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8870,59 +8969,59 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:310
 msgid "Key Agreement Request"
 msgstr "Avainsopimuspyyntö"
 
-#: ../src/protocols/silc/buddy.c:386 ../src/protocols/silc/buddy.c:421
-#: ../src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
+#: src/protocols/silc/buddy.c:463
 msgid "IM With Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:422
 msgid "Cannot set IM key"
 msgstr "Ei voida asettaa pikaviestiavainta"
 
-#: ../src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:464
 msgid "Set IM Password"
 msgstr "Aseta pikaviestin salasana"
 
-#: ../src/protocols/silc/buddy.c:511 ../src/protocols/silc/buddy.c:546
-#: ../src/protocols/silc/ops.c:1278 ../src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
+#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: ../src/protocols/silc/buddy.c:547 ../src/protocols/silc/ops.c:1279
-#: ../src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
+#: src/protocols/silc/ops.c:1290
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:994
-#: ../src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:873
-#: ../src/protocols/silc/ops.c:945 ../src/protocols/silc/ops.c:1080
-#: ../src/protocols/silc/ops.c:1081 ../src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:946
-#: ../src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
+#: src/protocols/silc/ops.c:1100
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
-#: ../src/protocols/silc/buddy.c:734
+#: src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Käyttäjä %s ei ole luotettu"
 
-#: ../src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8931,16 +9030,16 @@
 "Voit käyttää Hae julkinen avain -komentoa saadaksesi julkisen avaimen."
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1028
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1037
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Tuttava %s ei ole kirjautuneena verkossa"
 
-#: ../src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1040
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8948,15 +9047,15 @@
 "Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
 "tuodaksesi julkisen avaimen."
 
-#: ../src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1043
 msgid "Import..."
 msgstr "Tuo..."
 
-#: ../src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1130
 msgid "Select correct user"
 msgstr "Valitse oikea käyttäjä"
 
-#: ../src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/buddy.c:1132
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8964,7 +9063,7 @@
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
 "käyttäjä listalta."
 
-#: ../src/protocols/silc/buddy.c:1134
+#: src/protocols/silc/buddy.c:1134
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8972,213 +9071,213 @@
 "Useammalla kuin yhdellä käyttäjällä on sama nimi. Valitse oikea käyttäjä "
 "listalta."
 
-#: ../src/protocols/silc/buddy.c:1415
+#: src/protocols/silc/buddy.c:1415
 msgid "Detached"
 msgstr "Irroitettu"
 
-#: ../src/protocols/silc/buddy.c:1419 ../src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Vastahakoinen"
 
-#: ../src/protocols/silc/buddy.c:1423 ../src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Herätä minut"
 
-#: ../src/protocols/silc/buddy.c:1425 ../src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Hyperaktiivinen"
 
-#: ../src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1427
 msgid "Robot"
 msgstr "Robotti"
 
-#: ../src/protocols/silc/buddy.c:1434 ../src/protocols/silc/silc.c:642
-#: ../src/protocols/silc/util.c:472
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
+#: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Onnellinen"
 
-#: ../src/protocols/silc/buddy.c:1436 ../src/protocols/silc/silc.c:644
-#: ../src/protocols/silc/util.c:474
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
+#: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Surullinen"
 
-#: ../src/protocols/silc/buddy.c:1438 ../src/protocols/silc/silc.c:646
-#: ../src/protocols/silc/util.c:476
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
+#: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Vihainen"
 
-#: ../src/protocols/silc/buddy.c:1440 ../src/protocols/silc/silc.c:648
-#: ../src/protocols/silc/util.c:478
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
+#: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
-#: ../src/protocols/silc/buddy.c:1442 ../src/protocols/silc/silc.c:650
-#: ../src/protocols/silc/util.c:480
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
+#: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Häpeää"
 
-#: ../src/protocols/silc/buddy.c:1444 ../src/protocols/silc/silc.c:652
-#: ../src/protocols/silc/util.c:482
+#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
+#: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: ../src/protocols/silc/buddy.c:1446 ../src/protocols/silc/silc.c:654
-#: ../src/protocols/silc/util.c:484
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
+#: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Rakastunut"
 
-#: ../src/protocols/silc/buddy.c:1448 ../src/protocols/silc/silc.c:656
-#: ../src/protocols/silc/util.c:486
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
+#: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Unelias"
 
-#: ../src/protocols/silc/buddy.c:1450 ../src/protocols/silc/silc.c:658
-#: ../src/protocols/silc/util.c:488
+#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
+#: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Tylsistynyt"
 
-#: ../src/protocols/silc/buddy.c:1452 ../src/protocols/silc/silc.c:660
-#: ../src/protocols/silc/util.c:490
+#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
+#: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Innostunut"
 
-#: ../src/protocols/silc/buddy.c:1454 ../src/protocols/silc/silc.c:662
-#: ../src/protocols/silc/util.c:492
+#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
+#: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Levoton"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
-#: ../src/protocols/silc/buddy.c:1495 ../src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../src/protocols/silc/buddy.c:1499 ../src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: ../src/protocols/silc/buddy.c:1509 ../src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
-#: ../src/protocols/silc/buddy.c:1514 ../src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Laite"
 
-#: ../src/protocols/silc/buddy.c:1519 ../src/protocols/silc/ops.c:1018
-#: ../src/protocols/silc/silc.c:710 ../src/protocols/silc/silc.c:712
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../src/protocols/silc/buddy.c:1524 ../src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: ../src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1567
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: ../src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1572
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: ../src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1576
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1588
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: ../src/protocols/silc/buddy.c:1595 ../src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
-#: ../src/protocols/silc/chat.c:38
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "_Salasana:"
 
-#: ../src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:79
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanavaa %s ei ole verkossa"
 
-#: ../src/protocols/silc/chat.c:80 ../src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Kanavatiedot"
 
-#: ../src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "Ei saada kanavatietoja"
 
-#: ../src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanavan nimi:</b> %s"
 
-#: ../src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Käyttäjämäärä:</b> %d"
 
-#: ../src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanavan perustaja:</b> %s"
 
-#: ../src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:137
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanavan salausalgoritmi:<b> %s"
 
-#: ../src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanavan HMAC:</b> %s"
 
-#: ../src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:150
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanavan tilat:</b> "
 
-#: ../src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Fingerprint</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Babbleprint:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: ../src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: ../src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:405
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: ../src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9192,317 +9291,317 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: ../src/protocols/silc/chat.c:419 ../src/protocols/silc/chat.c:420
-#: ../src/protocols/silc/chat.c:457 ../src/protocols/silc/chat.c:458
-#: ../src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Lisää / poista"
 
-#: ../src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../src/protocols/silc/chat.c:580 ../src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: ../src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:591
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: ../src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:593
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: ../src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "Käyttäjäraja"
 
-#: ../src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: ../src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: ../src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: ../src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: ../src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: ../src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:902
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: ../src/protocols/silc/chat.c:910
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: ../src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: ../src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:921
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: ../src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:928
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: ../src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: ../src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: ../src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: ../src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:1008
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:1012
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <<I>%s</I> on <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1071
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1267 ../src/protocols/silc/silc.c:925
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../src/protocols/silc/chat.c:1268 ../src/protocols/silc/silc.c:926
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Turvallinen tiedostosiirto"
 
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Virhe tiedostosiirrossa"
 
-#: ../src/protocols/silc/ft.c:94
+#: src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Pääsy evätty"
 
-#: ../src/protocols/silc/ft.c:98
+#: src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Avain sopimus epäonnistui"
 
-#: ../src/protocols/silc/ft.c:102
+#: src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Tiedostonsiirtosessiota ei ole"
 
-#: ../src/protocols/silc/ft.c:206
+#: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Ei aktiivista tiedostosiirtosessiota"
 
-#: ../src/protocols/silc/ft.c:211
+#: src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Tiedostosiirto on jo aloitettu"
 
-#: ../src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ei voitu suorittaa avainsopimusta tiedostonsiirtoa varten"
 
-#: ../src/protocols/silc/ft.c:222
+#: src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ei voitu aloittaa tiedostosiirtoa"
 
-#: ../src/protocols/silc/ft.c:341
+#: src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Tiedoston lähetys ei onnistu"
 
-#: ../src/protocols/silc/ops.c:341 ../src/protocols/silc/ops.c:350
-#: ../src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:359
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: ../src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:425
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: ../src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:429
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: ../src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:462
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: ../src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:470
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: ../src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:499
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: ../src/protocols/silc/ops.c:529 ../src/protocols/silc/ops.c:534
-#: ../src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: ../src/protocols/silc/ops.c:560 ../src/protocols/silc/ops.c:565
-#: ../src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Poistettu käyttäjän %s toimesta (%s)"
 
-#: ../src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:616
 msgid "Server signoff"
 msgstr "Kirjaudu ulos palvelimelta"
 
-#: ../src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:803
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:826
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:830
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:834
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: ../src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:838
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:842
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:861
 msgid "EMail"
 msgstr "Sähköposti"
 
-#: ../src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:866
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:914
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/protocols/silc/ops.c:1070 ../src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen sormenjälki"
 
-#: ../src/protocols/silc/ops.c:1071 ../src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen \"babbleprint\""
 
-#: ../src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1084
 msgid "More..."
 msgstr "Lisää..."
 
-#: ../src/protocols/silc/ops.c:1155 ../src/protocols/silc/silc.c:813
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
-#: ../src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "Ei voida irroittaa"
 
-#: ../src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "Ei voida asettaa aihetta"
 
-#: ../src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1198
 msgid "Failed to change nickname"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1246
 msgid "Roomlist"
 msgstr "Huonelista"
 
-#: ../src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1246
 msgid "Cannot get room list"
 msgstr "Huonelistaa ei saatu"
 
-#: ../src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1291
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: ../src/protocols/silc/ops.c:1304 ../src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1305
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: ../src/protocols/silc/ops.c:1334 ../src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Palvelimen tilastoja"
 
-#: ../src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "Ei saatu palvelimen tilastoja"
 
-#: ../src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "Palvelimen tilastoja ei saatavilla."
 
-#: ../src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9537,103 +9636,103 @@
 "Palvelinoperaattorit yhteensä: %d\n"
 "Reititinoperaattorit yhteensä: %d\n"
 
-#: ../src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
-#: ../src/protocols/silc/ops.c:1397 ../src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
-#: ../src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1402
 msgid "Ping reply received from server"
 msgstr "Ping-vastaus saatu palvelimelta"
 
-#: ../src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1410
 msgid "Could not kill user"
 msgstr "Ei voitu poistaa käyttäjää"
 
-#: ../src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1494
 msgid "Error during connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
-#: ../src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1499
 msgid "Key Exchange failed"
 msgstr "Avaintenvaihto epäonnistui"
 
-#: ../src/protocols/silc/ops.c:1508
+#: src/protocols/silc/ops.c:1508
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-#: ../src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1543
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-#: ../src/protocols/silc/ops.c:1605 ../src/protocols/silc/ops.c:1652
-#: ../src/protocols/silc/silc.c:202
+#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
+#: src/protocols/silc/silc.c:194
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: ../src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1607
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: ../src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1654
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: ../src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1695
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: ../src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1724
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
 
-#: ../src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
-#: ../src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
-#: ../src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
 
-#: ../src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:a"
 
-#: ../src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Virhe: Etäkone ei tue ehdotettua hash-funktiota"
 
-#: ../src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
-#: ../src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1744
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
-#: ../src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1746
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
-#: ../src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1757
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
-#: ../src/protocols/silc/pk.c:103
+#: src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9642,12 +9741,12 @@
 "Vastaanotettiin käyttäjän %s julkinen avain. Paikallinen kopiosi ei täsmää. "
 "Haluatko silti hyväksyä tämän julkisen avaimen?"
 
-#: ../src/protocols/silc/pk.c:108
+#: src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Vastaanotettiin julkinen avain käyttäjältä %s. Hyväksytäänkö se?"
 
-#: ../src/protocols/silc/pk.c:112
+#: src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9660,48 +9759,48 @@
 "%s\n"
 "%s\n"
 
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Tarkista julkinen avain"
 
-#: ../src/protocols/silc/pk.c:119
+#: src/protocols/silc/pk.c:119
 msgid "View..."
 msgstr "Näytä..."
 
-#: ../src/protocols/silc/pk.c:141
+#: src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
-#: ../src/protocols/silc/silc.c:162
+#: src/protocols/silc/silc.c:154
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: ../src/protocols/silc/silc.c:194
+#: src/protocols/silc/silc.c:186
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
 
-#: ../src/protocols/silc/silc.c:205
+#: src/protocols/silc/silc.c:197
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-#: ../src/protocols/silc/silc.c:278
+#: src/protocols/silc/silc.c:270
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:317
+#: src/protocols/silc/silc.c:309
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
-#: ../src/protocols/silc/silc.c:638
+#: src/protocols/silc/silc.c:630
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../src/protocols/silc/silc.c:640
+#: src/protocols/silc/silc.c:632
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/protocols/silc/silc.c:665
+#: src/protocols/silc/silc.c:657
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9709,43 +9808,43 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../src/protocols/silc/silc.c:673 ../src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:675 ../src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:677 ../src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:674
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: ../src/protocols/silc/silc.c:689
+#: src/protocols/silc/silc.c:681
 msgid "Online Services"
 msgstr "Online-palvelut"
 
-#: ../src/protocols/silc/silc.c:692
+#: src/protocols/silc/silc.c:684
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: ../src/protocols/silc/silc.c:698
+#: src/protocols/silc/silc.c:690
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: ../src/protocols/silc/silc.c:705
+#: src/protocols/silc/silc.c:697
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
-#: ../src/protocols/silc/silc.c:718 ../src/protocols/silc/silc.c:719
+#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
-#: ../src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:712
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9755,147 +9854,147 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../src/protocols/silc/silc.c:760 ../src/protocols/silc/silc.c:766
-#: ../src/protocols/silc/silc.c:1170
+#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
+#: src/protocols/silc/silc.c:1162
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../src/protocols/silc/silc.c:760
+#: src/protocols/silc/silc.c:752
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../src/protocols/silc/silc.c:761 ../src/protocols/silc/silc.c:1165
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../src/protocols/silc/silc.c:808
+#: src/protocols/silc/silc.c:800
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../src/protocols/silc/silc.c:817
+#: src/protocols/silc/silc.c:809
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../src/protocols/silc/silc.c:890
+#: src/protocols/silc/silc.c:882
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../src/protocols/silc/silc.c:1041
+#: src/protocols/silc/silc.c:1033
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../src/protocols/silc/silc.c:1122
+#: src/protocols/silc/silc.c:1114
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1216
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../src/protocols/silc/silc.c:1229
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../src/protocols/silc/silc.c:1231
+#: src/protocols/silc/silc.c:1223
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../src/protocols/silc/silc.c:1244
+#: src/protocols/silc/silc.c:1236
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../src/protocols/silc/silc.c:1274
+#: src/protocols/silc/silc.c:1266
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti Gaimin virhe)"
 
-#: ../src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1329
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1341
+#: src/protocols/silc/silc.c:1333
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1345
+#: src/protocols/silc/silc.c:1337
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [<uusi aihe>]: Näytä tai aseta aihe"
 
-#: ../src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1342
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join <kanava> [<salasana>]: Liity kanavalle tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1354
+#: src/protocols/silc/silc.c:1346
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1350
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1362 ../src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg <nimi> <viesti>: Lähetä yksityisviesti käyttäjälle"
 
-#: ../src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1358
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query <nimi> [<viesti>]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1362
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1366
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../src/protocols/silc/silc.c:1378
+#: src/protocols/silc/silc.c:1370
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../src/protocols/silc/silc.c:1382
+#: src/protocols/silc/silc.c:1374
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call <komento>: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1380
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill <nimi> [-pubkey|<syy>]: Tuhoa nimi"
 
-#: ../src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1384
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1388
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1392
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 "cmode <kanava> [+|-<tilagt;] [argumentit]: Aseta tai näytä kanavan tilat."
 
-#: ../src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1396
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr "cumode <kanava> +|-<tilagt;: Muuta nimen tilaa kanavalla."
 
-#: ../src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1400
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode <käyttäjätilat>: Aseta omat tilasi verkossa"
 
-#: ../src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1404
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper <nimi> [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1408
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9903,35 +10002,35 @@
 "invite <kanava> [-|+]<nimi>: Kutsu käyttäjä tai lisää/poista kanavan kutsu- "
 "listalta"
 
-#: ../src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1412
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick <kanava> <nimi> [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1416
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1420
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban <kanava> +|-<nimi>]: Kiellä käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1424
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey <nimi|palvelin>: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../src/protocols/silc/silc.c:1436
+#: src/protocols/silc/silc.c:1428
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../src/protocols/silc/silc.c:1440
+#: src/protocols/silc/silc.c:1432
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../src/protocols/silc/silc.c:1445
+#: src/protocols/silc/silc.c:1437
 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:1449
+#: src/protocols/silc/silc.c:1441
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9939,27 +10038,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] <kanava(t)>: Näytä tietyt "
 "käyttäjät kanavilla"
 
-#: ../src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1453
 msgid "Instant Messages"
 msgstr "Pikaviestit"
 
-#: ../src/protocols/silc/silc.c:1466
+#: src/protocols/silc/silc.c:1458
 msgid "Digitally sign all IM messages"
 msgstr "Allekirjoita kaikki pikaviestit digitaalisesti"
 
-#: ../src/protocols/silc/silc.c:1471
+#: src/protocols/silc/silc.c:1463
 msgid "Verify all IM message signatures"
 msgstr "Tarkista kaikki pikaviestiallekirjoitukset"
 
-#: ../src/protocols/silc/silc.c:1474
+#: src/protocols/silc/silc.c:1466
 msgid "Channel Messages"
 msgstr "Kanavaviestit"
 
-#: ../src/protocols/silc/silc.c:1479
+#: src/protocols/silc/silc.c:1471
 msgid "Digitally sign all channel messages"
 msgstr "Allekirjoita kaikki kanavaviestit digitaalisesti"
 
-#: ../src/protocols/silc/silc.c:1484
+#: src/protocols/silc/silc.c:1476
 msgid "Verify all channel message signatures"
 msgstr "Tarkista kaikki kanavan viestiallekirjoitukset"
 
@@ -9972,91 +10071,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1572
+#: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokollaliitännäinen"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1574
+#: src/protocols/silc/silc.c:1566
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokolla"
 
-#: ../src/protocols/silc/silc.c:1608
+#: src/protocols/silc/silc.c:1600
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1612
+#: src/protocols/silc/silc.c:1604
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1615
+#: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../src/protocols/silc/silc.c:1619
+#: src/protocols/silc/silc.c:1611
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: ../src/protocols/silc/silc.c:1622
+#: src/protocols/silc/silc.c:1614
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: ../src/protocols/silc/silc.c:1625
+#: src/protocols/silc/silc.c:1617
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../src/protocols/silc/silc.c:1628
+#: src/protocols/silc/silc.c:1620
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolotilan pyynnöt"
 
-#: ../src/protocols/silc/util.c:205 ../src/protocols/silc/util.c:230
+#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:313
+#: src/protocols/silc/util.c:313
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi:\t%s\n"
 
-#: ../src/protocols/silc/util.c:315
+#: src/protocols/silc/util.c:315
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi:\t%s\n"
 
-#: ../src/protocols/silc/util.c:317
+#: src/protocols/silc/util.c:317
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Sähköposti:\t%s\n"
 
-#: ../src/protocols/silc/util.c:319
+#: src/protocols/silc/util.c:319
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Palvelin:\t%s\n"
 
-#: ../src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:321
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio:\t%s\n"
 
-#: ../src/protocols/silc/util.c:323
+#: src/protocols/silc/util.c:323
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa:\t%s\n"
 
-#: ../src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi:\t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus:\t%d bits\n"
 
-#: ../src/protocols/silc/util.c:327
+#: src/protocols/silc/util.c:327
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10067,7 +10166,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:328
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10076,140 +10175,140 @@
 "Julkisen avaimen babbleprint\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:332 ../src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../src/protocols/silc/util.c:515
+#: src/protocols/silc/util.c:515
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../src/protocols/silc/util.c:539
+#: src/protocols/silc/util.c:539
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../src/protocols/silc/util.c:543
+#: src/protocols/silc/util.c:543
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:545
+#: src/protocols/silc/util.c:545
 msgid "Terminal"
 msgstr "Pääte"
 
-#: ../src/protocols/toc/toc.c:139
+#: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Etsitään %s"
 
-#: ../src/protocols/toc/toc.c:148
+#: src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
-#: ../src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Kirjautuminen: %s"
 
-#: ../src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
 
-#: ../src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: ../src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Viesti on liian pitkä, viimeiset %s tavua katkaistu."
 
-#: ../src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ei ole parhaillaan kirjautuneena sisään."
 
-#: ../src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s:n varoittaminen ei ole sallittua."
 
-#: ../src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
 
-#: ../src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Ryhmäkeskustelu %s ei ole käytettävissä."
 
-#: ../src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Lähetät viestejä %s:lle liian nopeasti."
 
-#: ../src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
 
-#: ../src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
 
-#: ../src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Epäonnistuminen."
 
-#: ../src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Liian monta tulosta."
 
-#: ../src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lisää määritteitä."
 
-#: ../src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
-#: ../src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
-#: ../src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei välitetty."
 
-#: ../src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
-#: ../src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "Käyttäjällä ei ole hakemistotietoja."
 
-#: ../src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Maa ei tuettu."
 
-#: ../src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tunnistamaton epäonnistuminen: %s."
 
-#: ../src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
 
-#: ../src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:552
 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."
@@ -10218,41 +10317,41 @@
 "ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
 
-#: ../src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
-#: ../src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
 msgstr "Epäkelpo ryhmän nimi"
 
-#: ../src/protocols/toc/toc.c:668
+#: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Yhteys suljettu"
 
-#: ../src/protocols/toc/toc.c:708
+#: src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Odotetaan vastausta..."
 
-#: ../src/protocols/toc/toc.c:786
+#: src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
 
-#: ../src/protocols/toc/toc.c:989
+#: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../src/protocols/toc/toc.c:993
+#: src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC on lähettänyt PAUSE-komennon."
 
-#: ../src/protocols/toc/toc.c:994
+#: src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10262,45 +10361,45 @@
 "voi potkaista sinut ulos jos lähetät viestin. Gaim estää kaiken läpimenon. "
 "Tämä on vain väliaikaista, ole kärsivällinen."
 
-#: ../src/protocols/toc/toc.c:1549
+#: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: ../src/protocols/toc/toc.c:1689
+#: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Aseta hakemistotiedot"
 
-#: ../src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#: ../src/protocols/toc/toc.c:1847
+#: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa."
 
-#: ../src/protocols/toc/toc.c:2089
+#: src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
 
-#: ../src/protocols/toc/toc.c:2189
+#: src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimellä..."
 
-#: ../src/protocols/toc/toc.c:2223
+#: src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
 msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
 
-#: ../src/protocols/toc/toc.c:2230
+#: src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
@@ -10315,134 +10414,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2316 ../src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokollaliitännäinen"
 
-#: ../src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2337
 msgid "TOC host"
 msgstr "TOC-isäntä"
 
-#: ../src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2341
 msgid "TOC port"
 msgstr "TOC-portti"
 
-#. Basic Profile group.
-#: ../src/protocols/trepia/trepia.c:264
-msgid "Basic Profile"
-msgstr "Perusprofiili"
-
-#. E-Mail Address
-#: ../src/protocols/trepia/trepia.c:295
-msgid "E-Mail Address"
-msgstr "Sähköpostiosoite"
-
-#: ../src/protocols/trepia/trepia.c:301
-msgid "Profile Information"
-msgstr "Profiilitiedot"
-
-#. Instant Messagers
-#: ../src/protocols/trepia/trepia.c:307
-msgid "Instant Messagers"
-msgstr "Pikaviestittäjät"
-
-#. AIM
-#: ../src/protocols/trepia/trepia.c:311
-msgid "AIM"
-msgstr "AIM"
-
-#. ICQ
-#: ../src/protocols/trepia/trepia.c:315
-msgid "ICQ UIN"
-msgstr "ICQ UIN"
-
-#. MSN
-#: ../src/protocols/trepia/trepia.c:319
-msgid "MSN"
-msgstr "MSN"
-
-#. Yahoo
-#: ../src/protocols/trepia/trepia.c:323
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#. I'm From
-#: ../src/protocols/trepia/trepia.c:328
-msgid "I'm From"
-msgstr "Olen kotoisin"
-
-#. Call the dialog.
-#: ../src/protocols/trepia/trepia.c:345
-msgid "Set your Trepia profile data."
-msgstr "Aseta Trepia-profiilitietosi."
-
-#: ../src/protocols/trepia/trepia.c:425
-msgid "Profile"
-msgstr "Profiili"
-
-#: ../src/protocols/trepia/trepia.c:439
-msgid "Set Profile"
-msgstr "Aseta profiili"
-
-#: ../src/protocols/trepia/trepia.c:476
-msgid "Visit Homepage"
-msgstr "Vieraile kotisivulla"
-
-#: ../src/protocols/trepia/trepia.c:822 ../src/protocols/trepia/trepia.c:825
-msgid "Local Users"
-msgstr "Paikalliset käyttäjät"
-
-#: ../src/protocols/trepia/trepia.c:1032
-msgid "Logging in"
-msgstr "Kirjaudutaan sisään"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/trepia/trepia.c:1278 ../src/protocols/trepia/trepia.c:1280
-msgid "Trepia Protocol Plugin"
-msgstr "Trepia-protokollaliitännäinen"
-
-#: ../src/protocols/yahoo/yahoo.c:702
+#: src/protocols/yahoo/yahoo.c:706
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../src/protocols/yahoo/yahoo.c:746 ../src/protocols/yahoo/yahoo.c:3497
+#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
 msgid "Buzz!!"
 msgstr "Huomio!"
 
-#: ../src/protocols/yahoo/yahoo.c:791
+#: src/protocols/yahoo/yahoo.c:797
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
 
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
-#. *
-#: ../src/protocols/yahoo/yahoo.c:881
+#.
+#: src/protocols/yahoo/yahoo.c:887
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:887
+#: src/protocols/yahoo/yahoo.c:893
 msgid "Message (optional) :"
 msgstr "Viesti (valinnainen) :"
 
-#: ../src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:935
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: ../src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:938
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10451,11 +10467,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:941
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../src/protocols/yahoo/yahoo.c:1687
+#: src/protocols/yahoo/yahoo.c:1684
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10466,11 +10482,11 @@
 "versio ei todennäköisesti pysty kirjautumaan Yahoo-palveluun. Tarkista "
 "päivitykset osoitteesta: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1690
+#: src/protocols/yahoo/yahoo.c:1687
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1760
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10480,19 +10496,19 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1763
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../src/protocols/yahoo/yahoo.c:1800
+#: src/protocols/yahoo/yahoo.c:1797
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: ../src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:1808
 msgid "Normal authentication failed!"
 msgstr "Tavallinen tunnistautumismenetelmä epäonnistui!"
 
-#: ../src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/yahoo/yahoo.c:1809
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10504,120 +10520,124 @@
 "muuttunut. Gaim yrittää nyt kirjautua käyttäen Web Messenger- "
 "tunnistautumista josta seuraa vähentynyt toiminnallisuus ja ominaisuudet."
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: src/protocols/yahoo/yahoo.c:1817
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../src/protocols/yahoo/yahoo.c:1823
+#: src/protocols/yahoo/yahoo.c:1820
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../src/protocols/yahoo/yahoo.c:1826
+#: src/protocols/yahoo/yahoo.c:1823
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../src/protocols/yahoo/yahoo.c:1880
+#: src/protocols/yahoo/yahoo.c:1877
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1883
+#: src/protocols/yahoo/yahoo.c:1880
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../src/protocols/yahoo/yahoo.c:2126 ../src/protocols/yahoo/yahoo.c:2272
-#: ../src/protocols/yahoo/ycht.c:415
+#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: ../src/protocols/yahoo/yahoo.c:2294 ../src/protocols/yahoo/yahoo.c:2422
-#: ../src/protocols/yahoo/yahoo.c:2507 ../src/protocols/yahoo/yahoo.c:2517
-#: ../src/protocols/yahoo/yahoochat.c:1418
-#: ../src/protocols/yahoo/yahoochat.c:1485 ../src/protocols/yahoo/ycht.c:519
+#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
+#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/yahoo/yahoo.c:2618 ../src/protocols/yahoo/yahoo.c:3227
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
 msgid "Not At Home"
 msgstr "Poissa kotoa"
 
-#: ../src/protocols/yahoo/yahoo.c:2620 ../src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
 msgid "Not At Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../src/protocols/yahoo/yahoo.c:2622 ../src/protocols/yahoo/yahoo.c:3233
+#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
 msgid "Not In Office"
 msgstr "Poissa toimistolta"
 
-#: ../src/protocols/yahoo/yahoo.c:2626 ../src/protocols/yahoo/yahoo.c:3239
+#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2630 ../src/protocols/yahoo/yahoo.c:3245
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:2749
+#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2772 ../src/protocols/yahoo/yahoo.c:2832
+#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2775 ../src/protocols/yahoo/yahoo.c:2854
+#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2794
 msgid "Stealth"
 msgstr "Stealth"
 
-#: ../src/protocols/yahoo/yahoo.c:2848
+#: src/protocols/yahoo/yahoo.c:2849
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2896
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/protocols/yahoo/yahoo.c:2892
+#: src/protocols/yahoo/yahoo.c:2901
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/yahoo/yahoo.c:2917
+#: src/protocols/yahoo/yahoo.c:2926
 msgid "Stealth Settings"
 msgstr "Piiloasetukset"
 
-#: ../src/protocols/yahoo/yahoo.c:2950
+#: src/protocols/yahoo/yahoo.c:2932
+msgid "Start Doodling"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/yahoo/yahoo.c:2982
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2986
 msgid "Join user in chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../src/protocols/yahoo/yahoo.c:3540
+#: src/protocols/yahoo/yahoo.c:3541
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: <huone>: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3544
+#: src/protocols/yahoo/yahoo.c:3545
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../src/protocols/yahoo/yahoo.c:3549
+#: src/protocols/yahoo/yahoo.c:3550
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittaa Doodle-istunto"
 
@@ -10631,68 +10651,68 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3639 ../src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokollaliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:3660
+#: src/protocols/yahoo/yahoo.c:3658
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3663
+#: src/protocols/yahoo/yahoo.c:3661
 msgid "Pager host"
 msgstr "Isäntä"
 
-#: ../src/protocols/yahoo/yahoo.c:3666
+#: src/protocols/yahoo/yahoo.c:3664
 msgid "Japan Pager host"
 msgstr "Isäntä (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3669
+#: src/protocols/yahoo/yahoo.c:3667
 msgid "Pager port"
 msgstr "Portti"
 
-#: ../src/protocols/yahoo/yahoo.c:3672
+#: src/protocols/yahoo/yahoo.c:3670
 msgid "File transfer host"
 msgstr "Tiedostosiirtopalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3675
+#: src/protocols/yahoo/yahoo.c:3673
 msgid "Japan File transfer host"
 msgstr "Tiedostosiirtopalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3678
+#: src/protocols/yahoo/yahoo.c:3676
 msgid "File transfer port"
 msgstr "Tiedostosiirtoportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3681
+#: src/protocols/yahoo/yahoo.c:3679
 msgid "Chat Room Locale"
 msgstr "Keskusteluhuoneen"
 
-#: ../src/protocols/yahoo/yahoo.c:3684
+#: src/protocols/yahoo/yahoo.c:3682
 msgid "Chat Room List Url"
 msgstr "Keskusteluhuonelista URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3687
+#: src/protocols/yahoo/yahoo.c:3685
 msgid "YCHT Host"
 msgstr "YCHT-isäntä"
 
-#: ../src/protocols/yahoo/yahoo.c:3690
+#: src/protocols/yahoo/yahoo.c:3688
 msgid "YCHT Port"
 msgstr "YCHT-portti"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:677
+#: src/protocols/yahoo/yahoo_profile.c:672
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-osoite:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:753
+#: src/protocols/yahoo/yahoo_profile.c:748
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan -profiili"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:754
+#: src/protocols/yahoo/yahoo_profile.c:749
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profiili"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:793
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10700,7 +10720,7 @@
 "Tällä hetkellä profiileja jotka on merkitty sisältämään aikuisviihdettä, ei "
 "tueta."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:800
+#: src/protocols/yahoo/yahoo_profile.c:795
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10708,53 +10728,53 @@
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:977
+#: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
-#: ../src/protocols/yahoo/yahoo_profile.c:1055
-#: ../src/protocols/yahoo/yahoo_profile.c:1059
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1069
-#: ../src/protocols/yahoo/yahoo_profile.c:1073
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1109
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1114
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1131
+#: src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Update"
 msgstr "Edellinen päivitys"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1137
+#: src/protocols/yahoo/yahoo_profile.c:1129
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1143
+#: src/protocols/yahoo/yahoo_profile.c:1135
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "Tämä profiili näyttää käyttävän kieltä jota ei tueta tällä hetkellä."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: src/protocols/yahoo/yahoo_profile.c:1151
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10762,7 +10782,7 @@
 "Ei voitu hakea käyttäjän profiilia. Tämä on todennäköisesti väliaikainen "
 "palvelimen ongelma. Ole hyvä ja yritä myöhemmin uudestaan."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1162
+#: src/protocols/yahoo/yahoo_profile.c:1154
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10773,66 +10793,65 @@
 "käyttäjän profiilin. Jos olet varma että käyttäjä on olemassa, yritä "
 "myöhemmin uudelleen."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/yahoo/yahoo_profile.c:1162
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
-#: ../src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:202
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
 
-#: ../src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:204
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: ../src/protocols/yahoo/yahoochat.c:359
+#: src/protocols/yahoo/yahoochat.c:358
 msgid "Failed to join chat"
 msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
 
-#: ../src/protocols/yahoo/yahoochat.c:359
+#: src/protocols/yahoo/yahoochat.c:358
 msgid "Maybe the room is full?"
 msgstr "Ehkä huone on täynnä?"
 
-#: ../src/protocols/yahoo/yahoochat.c:437
+#: src/protocols/yahoo/yahoochat.c:435
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: ../src/protocols/yahoo/yahoochat.c:614
+#: src/protocols/yahoo/yahoochat.c:608
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
 
-#: ../src/protocols/yahoo/yahoochat.c:615
+#: src/protocols/yahoo/yahoochat.c:609
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
 
-#: ../src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/yahoo/yahoochat.c:1326
 msgid "Fetching the room list failed."
 msgstr "Huonelistan haku epäonnistui."
 
-#: ../src/protocols/yahoo/yahoochat.c:1404
+#: src/protocols/yahoo/yahoochat.c:1379
 msgid "Voices"
 msgstr "Äänet"
 
-#: ../src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/yahoo/yahoochat.c:1382
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: ../src/protocols/yahoo/yahoochat.c:1418
-#: ../src/protocols/yahoo/yahoochat.c:1485
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
 msgid "Unable to fetch room list."
 msgstr "Huonelistaa ei voida hakea."
 
-#: ../src/protocols/yahoo/yahoochat.c:1478
+#: src/protocols/yahoo/yahoochat.c:1453
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
-#: ../src/protocols/yahoo/ycht.c:402
+#: src/protocols/yahoo/ycht.c:400
 msgid "Connection problem with the YCHT server."
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10840,79 +10859,79 @@
 "(Tämän viestin muunnoksessa oli virhe.\t Katso \"koodaus\"-optio "
 "tilieditorista)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ei voida lähettää ryhmäkeskusteluun %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Käyttäjä:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Näkymättömänä tai poissa linjoilta"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1471 ../src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: ../src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2273
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: ../src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2279
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: ../src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
-#: ../src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2296
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Yritys tilata %s,%s,%s epäonnistui"
 
-#: ../src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/zephyr/zephyr.c:2602
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2607
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: src/protocols/zephyr/zephyr.c:2622
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2628
+#: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Liity uuteen "
 "ryhmäkeskusteluun"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
+#: src/protocols/zephyr/zephyr.c:2633
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ilmentymä&gt;: Lähetä viesti &lt;viesti,<i>ilmentymä</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2639
+#: src/protocols/zephyr/zephyr.c:2639
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10920,7 +10939,7 @@
 "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,"
 "<i>ilmentymä</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2645
+#: src/protocols/zephyr/zephyr.c:2645
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10928,7 +10947,7 @@
 "zcir &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti "
 "&lt;<i>luokka</i>,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2651
+#: src/protocols/zephyr/zephyr.c:2651
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10936,15 +10955,15 @@
 "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,"
 "<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;luokka&gt;: Lähetä viesti &lt;<i>luokka</i>,YKSITYINEN,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2762
+#: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
 msgstr "Uudelleentilaa"
 
-#: ../src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2765
 msgid "Retrieve subscriptions from server"
 msgstr "Hae tilaukset palvelimelta"
 
@@ -10958,51 +10977,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2847 ../src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokollaliitännäinen"
 
-#: ../src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2874
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2877
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2880
+#: src/protocols/zephyr/zephyr.c:2880
 msgid "Import from .anyone"
 msgstr "Tuo tiedostosta .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2883
+#: src/protocols/zephyr/zephyr.c:2883
 msgid "Import from .zephyr.subs"
 msgstr "Tuo tiedostosta .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2886
+#: src/protocols/zephyr/zephyr.c:2886
 msgid "Realm"
 msgstr "Alue(realm)"
 
-#: ../src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2889
 msgid "Exposure"
 msgstr "Altistus"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: ../src/proxy.c:1036
+#: src/proxy.c:1036
 #, 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:1040
+#: src/proxy.c:1040
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Välipalvelimen yhteysvirhe %d"
 
-#: ../src/proxy.c:1874
+#: src/proxy.c:1874
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../src/proxy.c:1874
+#: src/proxy.c:1874
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11012,27 +11031,27 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1341
+#: src/request.h:1341
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../src/server.c:350
+#: src/server.c:243
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../src/server.c:732
+#: src/server.c:625
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d viesti)"
 msgstr[1] "(%d viestiä)"
 
-#: ../src/server.c:746
+#: src/server.c:639
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: ../src/server.c:1007
+#: src/server.c:859
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11041,49 +11060,54 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../src/server.c:1012
+#: src/server.c:864
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../src/server.c:1016
+#: src/server.c:868
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
-#: ../src/status.c:153
+#: src/status.c:153
 msgid "Unset"
 msgstr "Poista asetus"
 
-#: ../src/status.c:156
+#: src/status.c:156
 msgid "Unavailable"
 msgstr "Tavoittamattomissa"
 
-#: ../src/status.c:625
+#: src/status.c:621
 #, c-format
 msgid "%s came back"
 msgstr "%s palasi"
 
-#: ../src/status.c:630
+#: src/status.c:626
 #, c-format
 msgid "%s went away"
 msgstr "%s on poissa"
 
-#: ../src/status.c:1311
+#: src/status.c:1308
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../src/status.c:1327
+#: src/status.c:1323
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../src/util.c:2124
+#: src/status.c:1697
+#, fuzzy
+msgid "Default auto-away"
+msgstr "Automaattinen poissaoloasetus"
+
+#: src/util.c:2121
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../src/util.c:2125
+#: src/util.c:2122
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11092,42 +11116,219 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../src/util.c:2562
+#: src/util.c:2567
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../src/util.c:2565
+#: src/util.c:2570
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../src/util.c:2595
+#: src/util.c:2600
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunti"
 msgstr[1] "sekuntia"
 
-#: ../src/util.c:2609
+#: src/util.c:2614
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: ../src/util.c:2617
+#: src/util.c:2622
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../src/util.c:2625
+#: src/util.c:2630
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../src/util.c:3048
+#: src/util.c:3053
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
+#~ msgid "New..."
+#~ msgstr "Uusi..."
+
+#~ msgid "Back"
+#~ msgstr "Palaa"
+
+#~ msgid "Tray Icon Configuration"
+#~ msgstr "Tarjotinkuvakeasetukset"
+
+#~ msgid "_Hide new messages until tray icon is clicked"
+#~ msgstr "_Piilota uudet viestit kunnes tarjotinkuvaketta on napsautettu"
+
+#~ msgid "Show user details"
+#~ msgstr "Näytä käyttäjän yksityiskohdat"
+
+#~ msgid "_Apply"
+#~ msgstr "_Toteuta"
+
+#~ msgid "/Tools/Pl_ugin Actions"
+#~ msgstr "/Työkalut/_Liitännäistoiminnot"
+
+#~ msgid "/Tools/_Statuses"
+#~ msgstr "/Työkalut/_Tilat"
+
+#~ msgid "%s could not connect"
+#~ msgstr "%s ei voinut yhdistää"
+
+#~ msgid "Show transfer details"
+#~ msgstr "Näytä tiedostosiirron yksityiskohdat"
+
+#~ msgid "Expander Size"
+#~ msgstr "Laajentajan koko"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Laajennusnuolen koko"
+
+# NOTE source: gftt glossary
+#~ msgid "Buddy List Sorting"
+#~ msgstr "Tuttavalistan lajittelu"
+
+#~ msgid "_Sorting:"
+#~ msgstr "_Järjestys:"
+
+#~ msgid "Buddy Display"
+#~ msgstr "Tuttavien näyttö"
+
+#~ msgid "Show more buddy details"
+#~ msgstr "Näytä lisää käyttäjän yksityiskohtia"
+
+#~ msgid "Message Logs"
+#~ msgstr "Viestilokit"
+
+#~ msgid "System Logs"
+#~ msgstr "Järjestelmälokit"
+
+#~ msgid "_Enable system log"
+#~ msgstr "Ota järjestelmäloki _käyttöön"
+
+#~ msgid "Log when buddies log in/log _out"
+#~ msgstr "Kirjaa lokiin tuttavien kirjautumiset _sisään/ulos"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "Kirjaa lokiin tuttavien siirtymiset _jouten-/paikallaoleviksi"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "Kirjaa lokiin tuttavien poistumiset/_palaamiset"
+
+#~ msgid "Log your own _signons/idleness/awayness"
+#~ msgstr "Kirjaa lokiin _omat sisäänkirjautumiset/joutenolot/poissaolot"
+
+#~ msgid "Idle _Tracking:"
+#~ msgstr "Jouto_aikaseuranta:"
+
+#~ msgid "Gaim usage"
+#~ msgstr "Gaimin käyttö"
+
+#~ msgid "X usage"
+#~ msgstr "X:n käyttö"
+
+#~ msgid "Windows usage"
+#~ msgstr "Windowsin käyttö"
+
+#~ msgid "Away m_essage:"
+#~ msgstr "Poissaolovi_esti:"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">File name:</span>\t%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Tekijä/Tekijät:</span>\t%s\n"
+#~ "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Tekijä/Tekijät:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">Tiedostopolku:</span>  %s"
+
+#~ msgid "Load"
+#~ msgstr "Lataa"
+
+#~ msgid "Summary"
+#~ msgstr "Yhteenveto"
+
+#~ msgid "Details"
+#~ msgstr "Yksityiskohdat"
+
+#~ msgid "Plugins"
+#~ msgstr "Liitännäiset"
+
+#~ msgid "Out of the office"
+#~ msgstr "Poissa toimistolta"
+
+#~ msgid "Slightly less boring default"
+#~ msgstr "Hieman vähemmän tylsä oletusviesti"
+
+#~ msgid "IRC"
+#~ msgstr "IRC"
+
+#~ msgid "Quit message"
+#~ msgstr "Poistumisviesti"
+
+#~ msgid "Basic Profile"
+#~ msgstr "Perusprofiili"
+
+#~ msgid "Profile Information"
+#~ msgstr "Profiilitiedot"
+
+#~ msgid "Instant Messagers"
+#~ msgstr "Pikaviestittäjät"
+
+#~ msgid "AIM"
+#~ msgstr "AIM"
+
+#~ msgid "ICQ UIN"
+#~ msgstr "ICQ UIN"
+
+#~ msgid "MSN"
+#~ msgstr "MSN"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "I'm From"
+#~ msgstr "Olen kotoisin"
+
+#~ msgid "Set your Trepia profile data."
+#~ msgstr "Aseta Trepia-profiilitietosi."
+
+#~ msgid "Profile"
+#~ msgstr "Profiili"
+
+#~ msgid "Set Profile"
+#~ msgstr "Aseta profiili"
+
+#~ msgid "Visit Homepage"
+#~ msgstr "Vieraile kotisivulla"
+
+#~ msgid "Local Users"
+#~ msgstr "Paikalliset käyttäjät"
+
+#~ msgid "Trepia Protocol Plugin"
+#~ msgstr "Trepia-protokollaliitännäinen"
+
 #~ msgid "Reconnect"
 #~ msgstr "Uudelleenyhdistä"
 
@@ -11145,9 +11346,6 @@
 #~ msgid "Reason Unknown."
 #~ msgstr "Tuntematon syy."
 
-#~ msgid "Disconnected"
-#~ msgstr "Yhteys katkennut"
-
 #~ msgid "_Reconnect"
 #~ msgstr "_Uudelleenyhdistä"
 
@@ -11295,9 +11493,6 @@
 #~ msgid "Sa_ve & Use"
 #~ msgstr "Tallenna ja _käytä"
 
-#~ msgid "_Use"
-#~ msgstr "_Käytä"
-
 #~ msgid "Buddy List Error"
 #~ msgstr "Tuttavalistan virhe"
 
@@ -11524,9 +11719,6 @@
 #~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
 #~ msgstr "Vladimira Girginova ja Vladimir (Kaladan) Petkov"
 
-#~ msgid "Estonian"
-#~ msgstr "viro"
-
 #~ msgid "Burmese"
 #~ msgstr "burma"
 
@@ -11812,9 +12004,6 @@
 #~ msgid "Couldn't get search results"
 #~ msgstr "Ei kyetty noutamaan hakutuloksia"
 
-#~ msgid "Active"
-#~ msgstr "Aktiivinen"
-
 #~ msgid "Birth Year"
 #~ msgstr "Syntymävuosi"
 
@@ -12003,9 +12192,6 @@
 #~ "Sinut on kirjattu ulos koska olet kirjautunut sisään toisesta paikasta "
 #~ "tai laitteesta."
 
-#~ msgid "Custom"
-#~ msgstr "Oma"
-
 #~ msgid "Please enter your password"
 #~ msgstr "Anna salasanasi"