changeset 13289:545848e03189

[gaim-migrate @ 15655] 2 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 14 Feb 2006 19:37:42 +0000 (2006-02-14)
parents b68897cff861
children 04e78ed1669b
files po/fi.po po/he.po
diffstat 2 files changed, 2585 insertions(+), 2209 deletions(-) [+]
line wrap: on
line diff
--- a/po/fi.po	Tue Feb 14 18:38:45 2006 +0000
+++ b/po/fi.po	Tue Feb 14 19:37:42 2006 +0000
@@ -1,7 +1,7 @@
 # Gaim Finnish translation
 # Copyright (C) 2002 Tero Kuusela <teroajk@subdimension.com>
 # Copyright (C) 2003-2005 Arto Alakulju <arto@alakulju.net>
-# Copyright (C) 2005 Timo Jyrinki <timo.jyrinki@iki.fi>
+# Copyright (C) 2005-2006 Timo Jyrinki <timo.jyrinki@iki.fi>
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 20:09+0200\n"
-"PO-Revision-Date: 2006-01-19 20:20+0200\n"
+"POT-Creation-Date: 2006-02-14 19:07+0200\n"
+"PO-Revision-Date: 2006-02-14 19:10+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ../gaim.desktop.in.h:1
+msgid "Gaim Internet Messenger"
+msgstr "Gaim-pikaviestin"
+
+#: ../gaim.desktop.in.h:2
+msgid "Internet Messenger"
+msgstr "Pikaviestin"
+
+#: ../gaim.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "L辰het辰 pikaviestej辰 monilla eri yhteysk辰yt辰nn旦ill辰"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -146,7 +158,7 @@
 msgstr "Piirteiden tarkistus"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2240
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
 #: ../src/gtkplugin.c:577
 msgid "Enabled"
 msgstr "K辰yt旦ss辰"
@@ -177,121 +189,122 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "N辰yt辰 lis辰辰 viestej辰 hiiren oikealla painikkeella...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3284
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3286
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lukematon viesti k辰ytt辰j辰lt辰 %s\n"
 msgstr[1] "%d lukematonta viesti辰 k辰ytt辰j辰lt辰 %s\n"
 
-#: ../plugins/docklet/docklet.c:401
+#: ../plugins/docklet/docklet.c:432
 msgid "Change Status"
 msgstr "Vaihda tila"
 
-#: ../plugins/docklet/docklet.c:404 ../src/gtkstatusbox.c:492
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:663
 #: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
 #: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/sametime/sametime.c:3260
-#: ../src/protocols/yahoo/yahoo.c:2675 ../src/status.c:155
+#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
+#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:155
 msgid "Available"
 msgstr "Tavoitettavissa"
 
 #. Away stuff
-#: ../plugins/docklet/docklet.c:408 ../src/gtkprefs.c:1742
-#: ../src/gtkstatusbox.c:493 ../src/protocols/irc/irc.c:456
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:664 ../src/protocols/irc/irc.c:520
 #: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2849 ../src/protocols/oscar/oscar.c:726
-#: ../src/protocols/oscar/oscar.c:6773 ../src/protocols/oscar/oscar.c:7820
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3130
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:729
+#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3187
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Poissa"
 
-#: ../plugins/docklet/docklet.c:412 ../src/gtkstatusbox.c:494
-#: ../src/protocols/oscar/oscar.c:730 ../src/protocols/yahoo/yahoo.c:2669
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:665
+#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "N辰kym辰t旦n"
 
-#: ../plugins/docklet/docklet.c:416 ../src/gtkstatusbox.c:495
-#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/novell/novell.c:2858
-#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7792
-#: ../src/protocols/yahoo/yahoo.c:2673 ../src/status.c:154
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3016
+#: ../src/gtkstatusbox.c:666 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:154
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../plugins/docklet/docklet.c:436
-msgid "Custom Status..."
-msgstr "Mukautettu tila..."
-
-#: ../plugins/docklet/docklet.c:437
-msgid "Saved Status..."
-msgstr "Tallennettu tila..."
-
-#: ../plugins/docklet/docklet.c:453
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:671
+msgid "New..."
+msgstr "Uusi..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:672
+msgid "Saved..."
+msgstr "Tallennettu..."
+
+#: ../plugins/docklet/docklet.c:484
 msgid "Show Buddy List"
 msgstr "N辰yt辰 tuttavalista"
 
-#: ../plugins/docklet/docklet.c:458
+#: ../plugins/docklet/docklet.c:489
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../plugins/docklet/docklet.c:479
+#: ../plugins/docklet/docklet.c:510
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../plugins/docklet/docklet.c:488 ../src/gtkaccount.c:2465
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
 msgid "Accounts"
 msgstr "K辰ytt辰j辰tilit"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
 msgid "Plugins"
 msgstr "Liit辰nn辰iset"
 
-#: ../plugins/docklet/docklet.c:490 ../src/gtkprefs.c:1883
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../plugins/docklet/docklet.c:494
+#: ../plugins/docklet/docklet.c:525
 msgid "Mute Sounds"
 msgstr "Vaimenna 辰辰net"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../plugins/docklet/docklet.c:507
+#: ../plugins/docklet/docklet.c:538
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../plugins/docklet/docklet.c:648
+#: ../plugins/docklet/docklet.c:679
 msgid "Blink tray icon for unread..."
 msgstr "Vilkuta tarjotinkuvaketta, kun uusia..."
 
-#: ../plugins/docklet/docklet.c:651
+#: ../plugins/docklet/docklet.c:682
 msgid "_Instant Messages:"
 msgstr "_Pikaviestej辰:"
 
-#: ../plugins/docklet/docklet.c:653 ../plugins/docklet/docklet.c:661
-#: ../plugins/win32/winprefs/winprefs.c:411 ../src/gtkprefs.c:816
-#: ../src/gtkprefs.c:1732 ../src/gtkprefs.c:1746
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:411 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../plugins/docklet/docklet.c:654
+#: ../plugins/docklet/docklet.c:685
 msgid "In hidden conversations"
 msgstr "Piilotetuissa keskusteluissa"
 
-#: ../plugins/docklet/docklet.c:655 ../plugins/docklet/docklet.c:663
-#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:818
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Aina"
 
-#: ../plugins/docklet/docklet.c:659
+#: ../plugins/docklet/docklet.c:690
 msgid "C_hat Messages:"
 msgstr "_Ryhm辰keskusteluviestej辰:"
 
-#: ../plugins/docklet/docklet.c:662
+#: ../plugins/docklet/docklet.c:693
 msgid "When my nick is said"
 msgstr "Kun tuttavanimeni mainitaan"
 
@@ -301,19 +314,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/docklet/docklet.c:689
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "Tarjotinkuvake"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/docklet/docklet.c:692
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "N辰ytt辰辰 Gaim-kuvakkeen j辰rjestelm辰n kuvaketarjottimella."
 
 #. *  description
-#: ../plugins/docklet/docklet.c:694
+#: ../plugins/docklet/docklet.c:725
 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, "
@@ -436,78 +449,98 @@
 msgid "Hyperlink Color"
 msgstr "Hyperlinkin v辰ri"
 
-#: ../plugins/gaimrc.c:58
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
 msgstr "Laajentajan koko"
 
-#: ../plugins/gaimrc.c:59
-msgid "GtkTreeView Expander Indentation"
-msgstr "GtkTreeView - laajentajan sisennys"
-
-#: ../plugins/gaimrc.c:60
+#: ../plugins/gaimrc.c:57
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView - leveyssuuntainen erotus"
 
-#: ../plugins/gaimrc.c:79
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
 msgstr "Keskustelumerkint辰"
 
+#: ../plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Keskusteluhistoria"
+
+#: ../plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Lokikatselin"
+
+#: ../plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Pyynt旦valintaikkuna"
+
 #: ../plugins/gaimrc.c:80
-msgid "Conversation History"
-msgstr "Keskusteluhistoria"
-
-#: ../plugins/gaimrc.c:81
-msgid "Log Viewer"
-msgstr "Lokikatselin"
-
-#: ../plugins/gaimrc.c:82
-msgid "Request Dialog"
-msgstr "Pyynt旦valintaikkuna"
-
-#: ../plugins/gaimrc.c:83
 msgid "Notify Dialog"
 msgstr "Huomautusvalintaikunna"
 
-#: ../plugins/gaimrc.c:286
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Sisenn辰 laajentajat"
+
+#: ../plugins/gaimrc.c:287
 #, c-format
 msgid "Select Color for %s"
 msgstr "Valitse %s:n v辰ri"
 
-#: ../plugins/gaimrc.c:288
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
 msgstr "Valitse v辰ri"
 
-#: ../plugins/gaimrc.c:323
+#: ../plugins/gaimrc.c:324
 #, c-format
 msgid "Select Font for %s"
 msgstr "Valitse %s:n kirjasin"
 
-#: ../plugins/gaimrc.c:361
+#: ../plugins/gaimrc.c:362
 msgid "Select Interface Font"
 msgstr "Valitse k辰ytt旦liittym辰n kirjasin"
 
-#: ../plugins/gaimrc.c:419
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "Yleinen"
+
+#: ../plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
 msgstr "GTK+-k辰ytt旦liittym辰n kirjasin"
 
-#: ../plugins/gaimrc.c:439
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
-#: ../plugins/gaimrc.c:528
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "K辰ytt旦liittym辰n v辰rit"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "S辰辰dinkoot"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "Kirjasimet"
+
+#: ../plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "Ty旦kalut"
+
+#: ../plugins/gaimrc.c:548
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
 
-#: ../plugins/gaimrc.c:536
+#: ../plugins/gaimrc.c:556
 msgid "Re-read gtkrc files"
 msgstr "Lue uudelleen gtkrc-tiedostot"
 
-#: ../plugins/gaimrc.c:563
+#: ../plugins/gaimrc.c:583
 msgid "Gaim GTK+ Theme Control"
 msgstr "Gaimin GTK+-teemanhallinta"
 
-#: ../plugins/gaimrc.c:565 ../plugins/gaimrc.c:566
+#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Antaa p辰辰syn usein k辰ytettyihin gtkrc-asetuksiin."
 
@@ -565,8 +598,8 @@
 
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:686
-#: ../src/protocols/msn/msn.c:1521
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
+#: ../src/protocols/msn/msn.c:1524
 msgid "Name"
 msgstr "Nimi"
 
@@ -575,32 +608,32 @@
 msgstr "Pikaviestint辰"
 
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 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:471
+#: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/oscar/oscar.c:8352
-#: ../src/protocols/sametime/sametime.c:5539
+#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/sametime/sametime.c:5533
 msgid "Search"
 msgstr "Etsi"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:552
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4435
-#: ../src/gtkblist.c:4799
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4919
 msgid "Group:"
 msgstr "Ryhm辰:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:578
+#: ../plugins/gevolution/add_buddy_dialog.c:574
 #: ../plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Uusi henkil旦"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 msgid "Select Buddy"
 msgstr "Valitse tuttava"
 
@@ -624,13 +657,13 @@
 msgstr "_Yhdist辰 tuttava"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1037
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "None"
 msgstr "Ei mit辰辰n"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1269 ../src/blist.c:1494
-#: ../src/gtkblist.c:4244 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
+#: ../src/gtkblist.c:4364 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Tuttavat"
 
@@ -676,7 +709,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/gevolution/gevolution.c:534
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution-integrointi"
 
@@ -684,8 +717,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/gevolution/gevolution.c:537
-#: ../plugins/gevolution/gevolution.c:539
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
@@ -701,7 +734,7 @@
 msgid "Account type:"
 msgstr "K辰ytt辰j辰tilin tyyppi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:767
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
 msgid "Screen name:"
 msgstr "N辰ytt旦nimi:"
 
@@ -711,8 +744,8 @@
 msgstr "Valinnaisia tietoja:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:407
-#: ../src/gtkaccount.c:429 ../src/protocols/oscar/oscar.c:632
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
@@ -734,7 +767,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/gtk-signals-test.c:158
+#: ../plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK-signaalitesti"
 
@@ -742,16 +775,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/gtk-signals-test.c:161 ../plugins/gtk-signals-test.c:163
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 "Kokeile n辰hd辰ksesi, ett辰 kaikki k辰ytt旦liittym辰signaalit toimivat oikein."
 
-#: ../plugins/history.c:146
+#: ../plugins/history.c:143
 msgid "History Plugin Requires Logging"
 msgstr "Historia-liit辰nn辰inen vaatii lokiinkirjauksen k辰ytt旦辰"
 
-#: ../plugins/history.c:147
+#: ../plugins/history.c:144
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -764,15 +797,15 @@
 "Lokien k辰ytt旦旦notto pikaviesteille ja/tai ryhm辰keskusteluille ottaa k辰ytt旦旦n "
 "historiatoiminnon vastaaville keskustelutyypeille."
 
-#: ../plugins/history.c:187
+#: ../plugins/history.c:184
 msgid "History"
 msgstr "Historia"
 
-#: ../plugins/history.c:189
+#: ../plugins/history.c:186
 msgid "Shows recently logged conversations in new conversations."
 msgstr "N辰ytt辰辰 osan edellist辰 keskustelua uudessa keskustelussa."
 
-#: ../plugins/history.c:190
+#: ../plugins/history.c:187
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -891,30 +924,30 @@
 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/log_reader.c:1403
+#: ../plugins/log_reader.c:1407
 msgid "User is offline."
 msgstr "K辰ytt辰j辰 on poissa linjoilta."
 
-#: ../plugins/log_reader.c:1409
+#: ../plugins/log_reader.c:1413
 msgid "Auto-response sent:"
 msgstr "Automaattinen vastaus l辰hetetty:"
 
-#: ../plugins/log_reader.c:1419 ../plugins/log_reader.c:1422
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: ../plugins/log_reader.c:1436
+#: ../plugins/log_reader.c:1440
 msgid "One or more messages may have been undeliverable."
 msgstr "Yksi tai useampi viesti on saattanut j辰辰d辰 l辰hett辰m辰tt辰."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1446 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
-#: ../plugins/log_reader.c:1454
+#: ../plugins/log_reader.c:1458
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -922,49 +955,49 @@
 "Yhteytt辰 ei t辰ll辰 hetkell辰 ole. Viestej辰 ei vastaanoteta ellet olet "
 "kirjautuneena sis辰辰n."
 
-#: ../plugins/log_reader.c:1469
+#: ../plugins/log_reader.c:1473
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Viesti辰 ei voitu l辰hett辰辰 koska suurin viestin koko ylitettiin."
 
-#: ../plugins/log_reader.c:1474
+#: ../plugins/log_reader.c:1478
 msgid "Message could not be sent."
 msgstr "Viesti辰si ei voitu l辰hetett辰辰."
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1908
+#: ../plugins/log_reader.c:1912
 msgid "General Log Reading Configuration"
 msgstr "Yleiset lokikatselimen asetukset"
 
-#: ../plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1916
 msgid "Fast size calculations"
 msgstr "Nopeat koon laskemiset"
 
-#: ../plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1920
 msgid "Use name heuristics"
 msgstr "K辰yt辰 nimiheuristiikkaa"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1922
+#: ../plugins/log_reader.c:1926
 msgid "Log Directory"
 msgstr "Lokihakemisto"
 
-#: ../plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1930
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1930
+#: ../plugins/log_reader.c:1934
 msgid "Fire"
 msgstr "Fire"
 
-#: ../plugins/log_reader.c:1934
+#: ../plugins/log_reader.c:1938
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1938
+#: ../plugins/log_reader.c:1942
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1942
+#: ../plugins/log_reader.c:1946
 msgid "Trillian"
 msgstr "Trillian"
 
@@ -974,19 +1007,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1965
+#: ../plugins/log_reader.c:1969
 msgid "Log Reader"
 msgstr "Lokikatselin"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1973
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sis辰llytt辰辰 muiden pikaviestinohjelmien lokit lokikatselimeen."
 
 #. * description
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1977
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1017,83 +1050,141 @@
 msgid "Loads .NET plugins with Mono."
 msgstr "Lataa .NET-liit辰nn辰isi辰 Monon avulla."
 
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Musiikkiviestint辰istunto pyydetty aloitettavaksi. Napsauta MM-kuvaketta "
+"hyv辰ksy辰ksesi pyynn旦n."
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Musiikkiviestint辰istunto varmistettu."
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "Musiikkiviestint辰"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "Tapahtui virhe suoritettaessa komentoa:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "Virhe ajettaessa muokkainta"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "Seuraava virhe esiintyi:"
+
 #. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:622
+#: ../plugins/musicmessaging/musicmessaging.c:623
 msgid "Music Messaging Configuration"
 msgstr "Musiikkiviestinn辰n asetukset"
 
 #: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "S辰vellysmuokkaimen polku"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
 msgid "_Apply"
 msgstr "_Toteuta"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Musiikkiviestint辰liit辰nn辰inen yhdess辰 s辰velt辰mist辰 varten."
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"Musiikkiviestint辰liit辰nn辰inen sallii usean k辰ytt辰j辰n ty旦skennell辰 yht辰 aikaa "
+"musiikkikappaleen parissa, muokkaamalla samaa s辰vellyst辰 yhdess辰, "
+"reaaliaikaisesti."
+
 #. ---------- "Notify For" ----------
-#: ../plugins/notify.c:628
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "Huomautus"
 
-#: ../plugins/notify.c:632
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "_Pikaviesti-ikkunoille"
 
-#: ../plugins/notify.c:639
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "_Ryhm辰keskusteluikkunoille"
 
-#: ../plugins/notify.c:646
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t_Vain kun joku sanoo kutsumanimesi"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "_Kohdistetuille ikkunoille"
 
 #. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:654
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "Ilmoitustavat"
 
-#: ../plugins/notify.c:661
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "Lis辰辰 _merkkijono ikkunaotsikon eteen:"
 
 #. Count method button
-#: ../plugins/notify.c:680
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "Lis辰辰 uusien _viestien m辰辰r辰 ikkunaotsikkoon"
 
 #. Urgent method button
-#: ../plugins/notify.c:688
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aseta ikkunointiohjelman \"_URGENT\"(kiireellinen)-lippu"
 
 #. Raise window method button
-#: ../plugins/notify.c:696
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
 msgstr "N_osta keskusteluikkuna"
 
 #. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:704
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "Huomautuksen poisto"
 
 #. Remove on focus button
-#: ../plugins/notify.c:709
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "Poista kun keskusteluikkuna on _aktiivinen"
 
 #. Remove on click button
-#: ../plugins/notify.c:716
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "Poista kun keskusteluikkunaa _napsautetaan"
 
 #. Remove on type button
-#: ../plugins/notify.c:724
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "Poista kun keskusteluikkunaan _kirjoitetaan"
 
 #. Remove on message send button
-#: ../plugins/notify.c:732
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "Poista kun viesti _l辰hetet辰辰n"
 
 #. Remove on conversation switch button
-#: ../plugins/notify.c:741
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "Poista kun _v辰lilehti vaihtuu"
 
@@ -1103,7 +1194,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/notify.c:830
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "Viestihuomautus"
 
@@ -1111,7 +1202,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/notify.c:833 ../plugins/notify.c:835
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteist辰 monilla tavoilla."
 
@@ -1121,17 +1212,50 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/perl/perl.c:591
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Perl-liit辰nn辰isten lataaja"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../plugins/perl/perl.c:593 ../plugins/perl/perl.c:594
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-liit辰nn辰isi辰."
 
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "Meediotila"
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "Meediotila sis辰辰ntuleville keskusteluille"
+
+#: ../plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Keskusteluikkunat ilmestyv辰t, kun muut k辰ytt辰j辰t alkavat kirjoittaa viesti辰 "
+"sinulle. T辰m辰 toimii AIM-, ICQ-, Jabber-, Sametime- ja Yahoo!-"
+"yhteisk辰yt辰nn旦ill辰."
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr "Tunnet h辰iri旦n voimassa..."
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "Salli vain tuttavalistassa oleville k辰ytt辰jille"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "Pois k辰yt旦st辰 poissaollessa"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "N辰yt辰 ilmoitusviesti keskusteluissa"
+
 #: ../plugins/raw.c:175
 msgid "Raw"
 msgstr "Raakasy旦tt旦"
@@ -1140,16 +1264,16 @@
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Mahdollistaa raakamuotoisen sy旦tteen antamisen tekstipohjaisille "
-"protokollille"
+"yhteysk辰yt辰nn旦ille."
 
 #: ../plugins/raw.c:178
 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."
 msgstr ""
-"Antaa sinun l辰hett辰辰 raakamuotoista sy旦tett辰 tekstipohjaisilla protokollilla "
-"(Jabber MSN, IRC, TOC). Paina \"Enter\" viestinsy旦tt旦laatikossa "
-"l辰hett辰辰ksesi. Katso debug-ikkunaa."
+"Antaa sinun l辰hett辰辰 raakamuotoista sy旦tett辰 tekstipohjaisilla  "
+"yhteysk辰yt辰nn旦ill辰 (Jabber MSN, IRC, TOC). Paina \"Enter\" "
+"viestinsy旦tt旦laatikossa l辰hett辰辰ksesi. Tarkkaile virheenj辰ljitysikkunaa."
 
 #: ../plugins/relnot.c:63
 #, c-format
@@ -1210,7 +1334,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/signals-test.c:671
+#: ../plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Signaalitesti"
 
@@ -1218,7 +1342,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/signals-test.c:674 ../plugins/signals-test.c:676
+#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Kokeile n辰hd辰ksesi ett辰 kaikki signaalit toimivat oikein."
 
@@ -1240,70 +1364,70 @@
 msgid "Tests to see that most things are working."
 msgstr "Kokeilee ett辰 useimmat asiat toimivat."
 
-#: ../plugins/spellchk.c:1902
+#: ../plugins/spellchk.c:1917
 msgid "Duplicate Correction"
 msgstr "Korjauksen toisinto"
 
-#: ../plugins/spellchk.c:1903
+#: ../plugins/spellchk.c:1918
 msgid "The specified word already exists in the correction list."
 msgstr "M辰辰ritetty sana on jo korjauslistassa."
 
-#: ../plugins/spellchk.c:2112
+#: ../plugins/spellchk.c:2127
 msgid "Text Replacements"
 msgstr "Tekstin korvaus"
 
-#: ../plugins/spellchk.c:2135
+#: ../plugins/spellchk.c:2150
 msgid "You type"
 msgstr "Kirjoitettu"
 
-#: ../plugins/spellchk.c:2149
+#: ../plugins/spellchk.c:2164
 msgid "You send"
 msgstr "L辰hetetty"
 
-#: ../plugins/spellchk.c:2163
+#: ../plugins/spellchk.c:2178
 msgid "Whole words only"
 msgstr "Vain kokonaiset sanat"
 
-#: ../plugins/spellchk.c:2175
+#: ../plugins/spellchk.c:2190
 msgid "Case sensitive"
 msgstr "Sama kirjainkoko"
 
-#: ../plugins/spellchk.c:2201
+#: ../plugins/spellchk.c:2216
 msgid "Add a new text replacement"
 msgstr "Lis辰辰 uusi korvausehto"
 
-#: ../plugins/spellchk.c:2217
+#: ../plugins/spellchk.c:2232
 msgid "You _type:"
 msgstr "_Kirjoitettu:"
 
-#: ../plugins/spellchk.c:2234
+#: ../plugins/spellchk.c:2249
 msgid "You _send:"
 msgstr "_L辰hetetty:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2246
+#: ../plugins/spellchk.c:2261
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "_Ehdoton kirjainkoon t辰sm辰ys (poista valinta jos haluat automaattisen "
 "kirjainkoon hallinnan)"
 
-#: ../plugins/spellchk.c:2248
+#: ../plugins/spellchk.c:2263
 msgid "Only replace _whole words"
 msgstr "Korvaa vain _kokonaiset sanat"
 
-#: ../plugins/spellchk.c:2273
+#: ../plugins/spellchk.c:2288
 msgid "General Text Replacement Options"
 msgstr "Tekstin korvauksen yleiset valinnat"
 
-#: ../plugins/spellchk.c:2274
+#: ../plugins/spellchk.c:2289
 msgid "Enable replacement of last word on send"
 msgstr "Salli viimeisen sanan korvaus l辰hetett辰ess辰"
 
-#: ../plugins/spellchk.c:2299
+#: ../plugins/spellchk.c:2314
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../plugins/spellchk.c:2301 ../plugins/spellchk.c:2302
+#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
 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."
 
@@ -1313,7 +1437,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1321,7 +1445,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-gnutls.c:230 ../plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -1331,7 +1455,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1339,7 +1463,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-nss.c:322 ../plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -1429,11 +1553,11 @@
 "Ilmoittaa keskusteluikkunassa kun tuttava on poissa tai jouten ja kun h辰n "
 "palaa."
 
-#: ../plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-liit辰nn辰isten lataaja"
 
-#: ../plugins/tcl/tcl.c:365 ../plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcl-liit辰nn辰isten latauksen."
 
@@ -1443,7 +1567,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ticker/ticker.c:75 ../plugins/ticker/ticker.c:324
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Rullaava tuttavataulu"
 
@@ -1451,7 +1575,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ticker/ticker.c:327 ../plugins/ticker/ticker.c:329
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
 
@@ -1485,6 +1609,60 @@
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Lis辰辰 iChat-tyylisen aikaleiman keskusteluihin N minuutin v辰lein."
 
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Aikaleiman muotoiluasetukset"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Pakota (Gaimin perinteinen) 24 tunnin aikamuoto"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "N辰yt辰 p辰iv辰m辰辰r辰t..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Ke_skustelut:"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Viiv辰stetyille viesteille"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Viiv辰stetyille viesteille, ja ryhm辰keskusteluissa"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "_Viestilokit:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Viestin aikaleimamuodot"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Muokkaa viestin aikaleimamuotoja."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"T辰m辰 liit辰nn辰inen mahdollistaa keskustelu- ja lokiviestien aikaleimamuotojen "
+"muokkaamisen."
+
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
 #: ../plugins/win32/transparency/win2ktrans.c:616
@@ -1575,7 +1753,7 @@
 msgstr "_K辰ynnist辰 Gaim Windowsin k辰ynnistyess辰."
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:404 ../src/gtkblist.c:3500
+#: ../plugins/win32/winprefs/winprefs.c:404 ../src/gtkblist.c:3608
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1594,8 +1772,8 @@
 msgstr "Vain telakoituna"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:418 ../src/gtkprefs.c:812
-#: ../src/gtkprefs.c:1847
+#: ../plugins/win32/winprefs/winprefs.c:418 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1640,77 +1818,72 @@
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:564
-#: ../src/gtkdialogs.c:701 ../src/gtkdialogs.c:769 ../src/gtkrequest.c:287
-#: ../src/protocols/gg/gg.c:463 ../src/protocols/gg/gg.c:604
-#: ../src/protocols/gg/gg.c:740 ../src/protocols/jabber/jabber.c:1236
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:571
+#: ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:776 ../src/gtkrequest.c:287
+#: ../src/protocols/gg/gg.c:454 ../src/protocols/gg/gg.c:595
+#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1322
 #: ../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:2976
-#: ../src/protocols/oscar/oscar.c:4509 ../src/protocols/oscar/oscar.c:4590
-#: ../src/protocols/oscar/oscar.c:8083 ../src/protocols/oscar/oscar.c:8206
-#: ../src/protocols/oscar/oscar.c:8231 ../src/protocols/oscar/oscar.c:8283
+#: ../src/protocols/msn/msn.c:295 ../src/protocols/oscar/oscar.c:2999
+#: ../src/protocols/oscar/oscar.c:4542 ../src/protocols/oscar/oscar.c:4623
+#: ../src/protocols/oscar/oscar.c:8051 ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:8199 ../src/protocols/oscar/oscar.c:8251
 #: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1182
 #: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
 #: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1297
 #: ../src/protocols/silc/ops.c:1910 ../src/protocols/silc/silc.c:749
-#: ../src/protocols/yahoo/yahoo.c:3004 ../src/protocols/yahoo/yahoo.c:3013
-#: ../src/request.h:1340
+#: ../src/protocols/yahoo/yahoo.c:3061 ../src/protocols/yahoo/yahoo.c:3070
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1178
-#: ../src/gtkaccount.c:2160 ../src/gtkaccount.c:2633 ../src/gtkblist.c:4840
-#: ../src/gtkdialogs.c:565 ../src/gtkdialogs.c:702 ../src/gtkdialogs.c:770
-#: ../src/gtkdialogs.c:789 ../src/gtkdialogs.c:811 ../src/gtkdialogs.c:831
-#: ../src/gtkdialogs.c:875 ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:967
-#: ../src/gtkdialogs.c:992 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:567
-#: ../src/gtkprivacy.c:580 ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
-#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:298
-#: ../src/protocols/gg/gg.c:464 ../src/protocols/gg/gg.c:605
-#: ../src/protocols/gg/gg.c:741 ../src/protocols/gg/gg.c:830
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4960
+#: ../src/gtkdialogs.c:572 ../src/gtkdialogs.c:709 ../src/gtkdialogs.c:777
+#: ../src/gtkdialogs.c:796 ../src/gtkdialogs.c:818 ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:882 ../src/gtkdialogs.c:937 ../src/gtkdialogs.c:974
+#: ../src/gtkdialogs.c:999 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
 #: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1412
 #: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:755 ../src/protocols/jabber/jabber.c:1237
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1323
 #: ../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:1640 ../src/protocols/oscar/oscar.c:2977
-#: ../src/protocols/oscar/oscar.c:4467 ../src/protocols/oscar/oscar.c:4510
-#: ../src/protocols/oscar/oscar.c:4547 ../src/protocols/oscar/oscar.c:4591
-#: ../src/protocols/oscar/oscar.c:8084 ../src/protocols/oscar/oscar.c:8207
-#: ../src/protocols/oscar/oscar.c:8232 ../src/protocols/oscar/oscar.c:8284
-#: ../src/protocols/oscar/oscar.c:8353
-#: ../src/protocols/sametime/sametime.c:3361
-#: ../src/protocols/sametime/sametime.c:3444
-#: ../src/protocols/sametime/sametime.c:3571
-#: ../src/protocols/sametime/sametime.c:5337
-#: ../src/protocols/sametime/sametime.c:5423
-#: ../src/protocols/sametime/sametime.c:5540 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:1641 ../src/protocols/oscar/oscar.c:3000
+#: ../src/protocols/oscar/oscar.c:4500 ../src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4580 ../src/protocols/oscar/oscar.c:4624
+#: ../src/protocols/oscar/oscar.c:8052 ../src/protocols/oscar/oscar.c:8175
+#: ../src/protocols/oscar/oscar.c:8200 ../src/protocols/oscar/oscar.c:8252
+#: ../src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5321
+#: ../src/protocols/sametime/sametime.c:5410
+#: ../src/protocols/sametime/sametime.c:5534 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
-#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3005
-#: ../src/protocols/yahoo/yahoo.c:3014 ../src/request.h:1340
-#: ../src/request.h:1350
+#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3062
+#: ../src/protocols/yahoo/yahoo.c:3071
 msgid "Cancel"
 msgstr "Peru"
 
 #: ../src/account.c:994 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s-protokollaliit辰nn辰inen puuttuu"
-
-#: ../src/account.c:996 ../src/connection.c:99
+msgstr "%s-yhteysk辰yt辰nt旦liit辰nn辰inen puuttuu"
+
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3496
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:645
-#: ../src/protocols/jabber/jabber.c:1189
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eiv辰t t辰sm辰辰."
 
@@ -1744,14 +1917,14 @@
 msgid "Change user information for %s"
 msgstr "Vaihda k辰ytt辰j辰tietoja - %s"
 
-#: ../src/account.c:1177 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/account.c:1672 ../src/gtkft.c:157
+#: ../src/account.c:1679 ../src/gtkft.c:157
 #: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2861
+#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -1759,26 +1932,28 @@
 msgid "buddy list"
 msgstr "tuttavalista"
 
-#: ../src/blist.c:1172
+#: ../src/blist.c:1173
 msgid "Chats"
 msgstr "Ryhm辰keskustelut"
 
-#: ../src/blist.c:1885
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1886
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
 msgstr[0] ""
-"%d tuttava ryhm辰st辰 %s ei poistettu koska sen k辰ytt辰j辰 ei ollut "
-"kirjautuneena sis辰辰n. T辰t辰 tuttavaa ja ryhm辰辰 ei poistettu.\n"
+"%d tuttava ryhm辰st辰 %s ei poistettu koska se kuuluu tilille joka on poissa "
+"k辰yt旦st辰 tai ei kirjautuneena sis辰辰n. T辰t辰 tuttavaa ja ryhm辰辰 ei poistettu.\n"
 msgstr[1] ""
-"%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:1894
+"%d tuttavaa ryhm辰st辰 %s ei poistettu koska se kuuluu tilille joka on poissa "
+"k辰yt旦st辰 tai ei kirjautuneena sis辰辰n. N辰it辰 tuttavia ja ryhmi辰 ei "
+"poistettu.\n"
+
+#: ../src/blist.c:1896
 msgid "Group not removed"
 msgstr "Ryhm辰辰 ei poistettu"
 
@@ -1796,49 +1971,49 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
-#: ../src/conversation.c:182
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
 msgstr "Viesti辰 ei voitu l辰hett辰辰: viesti on liian suuri."
 
-#: ../src/conversation.c:185 ../src/conversation.c:198
+#: ../src/conversation.c:166 ../src/conversation.c:179
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Viesti辰 ei voitu l辰hett辰辰 k辰ytt辰j辰lle %s."
 
-#: ../src/conversation.c:186
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../src/conversation.c:195
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "Viesti辰 ei voitu l辰hett辰辰."
 
-#: ../src/conversation.c:1510
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../src/conversation.c:1513
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../src/conversation.c:1620
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimelt辰si %s"
 
-#: ../src/conversation.c:1640
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimelt辰辰n %s"
 
-#: ../src/conversation.c:1713
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../src/conversation.c:1716
+#: ../src/conversation.c:1723
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -1913,65 +2088,65 @@
 "Et辰kone: %s\n"
 "Portti: %d"
 
-#: ../src/ft.c:383
+#: ../src/ft.c:391
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../src/ft.c:427
+#: ../src/ft.c:442
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../src/ft.c:448
+#: ../src/ft.c:463
 #, 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:459
+#: ../src/ft.c:474
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto k辰ytt辰j辰lt辰 %s"
 
-#: ../src/ft.c:613
+#: ../src/ft.c:628
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../src/ft.c:616
+#: ../src/ft.c:631
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../src/ft.c:1000
+#: ../src/ft.c:1022
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../src/ft.c:1005
+#: ../src/ft.c:1027
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
-#: ../src/ft.c:1062
+#: ../src/ft.c:1084
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../src/ft.c:1067
+#: ../src/ft.c:1089
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "K辰ytt辰j辰 %s peruutti tiedostonsiirron"
 
-#: ../src/ft.c:1124
+#: ../src/ft.c:1146
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto k辰ytt辰j辰lle %s ep辰onnistui."
 
-#: ../src/ft.c:1126
+#: ../src/ft.c:1148
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto k辰ytt辰j辰lt辰 %s ep辰onnistui."
 
-#: ../src/gtkaccount.c:357
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1983,154 +2158,154 @@
 "<b>Kuvan koko:</b> %d � %d"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:745
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "Sis辰辰nkirjautumisvalinnat"
 
-#: ../src/gtkaccount.c:762 ../src/gtkft.c:640
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
 msgid "Protocol:"
-msgstr "Protokolla:"
-
-#: ../src/gtkaccount.c:841
+msgstr "Yhteysk辰yt辰nt旦:"
+
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gtkaccount.c:846 ../src/gtkblist.c:4418 ../src/gtkblist.c:4784
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4538 ../src/gtkblist.c:4904
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../src/gtkaccount.c:850
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "Muista salasana"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:902
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "K辰ytt辰j辰n valinnat"
 
-#: ../src/gtkaccount.c:915
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta s辰hk旦postista"
 
-#: ../src/gtkaccount.c:924
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "Tuttavakuvake:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1015
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../src/gtkaccount.c:1216
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "K辰yt辰 yleist辰 v辰lipalvelimen asetusta"
 
-#: ../src/gtkaccount.c:1222
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "Ei v辰lipalvelinta"
 
-#: ../src/gtkaccount.c:1228
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1234
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1240
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1246 ../src/gtkprefs.c:1032
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "K辰yt辰 ymp辰rist旦asetuksia"
 
-#: ../src/gtkaccount.c:1280
+#: ../src/gtkaccount.c:1297
 msgid "you can see the butterflies mating"
 msgstr "voit n辰hd辰 perhosten parittelevan"
 
-#: ../src/gtkaccount.c:1284
+#: ../src/gtkaccount.c:1301
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
-#: ../src/gtkaccount.c:1300
+#: ../src/gtkaccount.c:1317
 msgid "Proxy Options"
 msgstr "V辰lipalvelinvalinnat"
 
-#: ../src/gtkaccount.c:1314 ../src/gtkprefs.c:1026
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
 msgstr "V辰lipalvelimen _tyyppi:"
 
-#: ../src/gtkaccount.c:1323 ../src/gtkprefs.c:1047
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../src/gtkaccount.c:1327 ../src/gtkprefs.c:1065
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../src/gtkaccount.c:1335
+#: ../src/gtkaccount.c:1352
 msgid "_Username:"
 msgstr "_K辰ytt辰j辰nimi:"
 
-#: ../src/gtkaccount.c:1341 ../src/gtkprefs.c:1102
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../src/gtkaccount.c:1719
+#: ../src/gtkaccount.c:1736
 msgid "Add Account"
 msgstr "Lis辰辰 tili"
 
-#: ../src/gtkaccount.c:1721
+#: ../src/gtkaccount.c:1738
 msgid "Modify Account"
 msgstr "Muokkaa tili辰"
 
-#: ../src/gtkaccount.c:1743
+#: ../src/gtkaccount.c:1760
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../src/gtkaccount.c:1754
+#: ../src/gtkaccount.c:1771
 msgid "_Advanced"
 msgstr "_Lis辰asetukset"
 
 #. Register button
-#: ../src/gtkaccount.c:1769 ../src/protocols/jabber/jabber.c:754
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "Rekister旦i"
 
-#: ../src/gtkaccount.c:2154 ../src/gtksavedstatuses.c:295
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../src/gtkaccount.c:2159 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
-#: ../src/gtksavedstatuses.c:297
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gtkaccount.c:2217 ../src/gtksavedstatuses.c:875
-#: ../src/protocols/oscar/oscar.c:5154
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5187
 msgid "Screen Name"
 msgstr "N辰ytt旦nimi"
 
-#: ../src/gtkaccount.c:2248
+#: ../src/gtkaccount.c:2259
 msgid "Protocol"
-msgstr "Protokolla"
-
-#: ../src/gtkaccount.c:2581
+msgstr "Yhteysk辰yt辰nt旦"
+
+#: ../src/gtkaccount.c:2586
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt k辰ytt辰j辰st辰 %s tuttavansa%s%s"
 
-#: ../src/gtkaccount.c:2630
+#: ../src/gtkaccount.c:2635
 msgid "Add buddy to your list?"
 msgstr "Lis辰辰 tuttava listalle?"
 
-#: ../src/gtkaccount.c:2632 ../src/gtkblist.c:4839 ../src/gtkconv.c:1615
-#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:829
-#: ../src/protocols/oscar/oscar.c:4779
-#: ../src/protocols/sametime/sametime.c:5422 ../src/protocols/silc/chat.c:595
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4959 ../src/gtkconv.c:1616
+#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4812
+#: ../src/protocols/sametime/sametime.c:5409 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Lis辰辰"
 
@@ -2144,7 +2319,7 @@
 "join.\n"
 msgstr "Sy旦t辰 tiedot ryhm辰keskustelusta, johon haluaisit liitty辰.\n"
 
-#: ../src/gtkblist.c:710 ../src/gtkpounce.c:528 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:710 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_K辰ytt辰j辰tili:"
 
@@ -2152,7 +2327,7 @@
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../src/gtkblist.c:957 ../src/gtkstock.c:142
+#: ../src/gtkblist.c:957 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Pikaviesti"
 
@@ -2177,7 +2352,7 @@
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:999 ../src/gtkconv.c:1612 ../src/gtkrequest.c:293
+#: ../src/gtkblist.c:999 ../src/gtkconv.c:1613 ../src/gtkrequest.c:293
 msgid "Remove"
 msgstr "Poista"
 
@@ -2207,7 +2382,7 @@
 
 #. join button
 #: ../src/gtkblist.c:1080 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:140
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Liity"
 
@@ -2223,16 +2398,16 @@
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../src/gtkblist.c:1426 ../src/gtkblist.c:1438 ../src/gtkblist.c:3640
-#: ../src/gtkblist.c:3650
+#: ../src/gtkblist.c:1426 ../src/gtkblist.c:1438 ../src/gtkblist.c:3753
+#: ../src/gtkblist.c:3763
 msgid "/Tools/Mute Sounds"
 msgstr "/Ty旦kalut/Vaimenna 辰辰net"
 
-#: ../src/gtkblist.c:1901 ../src/gtkconv.c:4212 ../src/gtkpounce.c:427
+#: ../src/gtkblist.c:1901 ../src/gtkconv.c:4215 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Et ole kirjautuneena mill辰辰n protokollalla jolla voisi lis辰t辰 kyseisen "
+"Et ole kirjautuneena mill辰辰n k辰ytt辰j辰tilill辰 jolla voisi lis辰t辰 kyseisen "
 "tuttavan."
 
 #. Buddies menu
@@ -2297,7 +2472,7 @@
 msgid "/_Accounts"
 msgstr "/_K辰ytt辰j辰tilit"
 
-#: ../src/gtkblist.c:2495 ../src/gtkblist.c:5416
+#: ../src/gtkblist.c:2495 ../src/gtkblist.c:5538
 msgid "/Accounts/Add\\/Edit"
 msgstr "/K辰ytt辰j辰tilit/Lis辰辰\\/Muokkaa"
 
@@ -2364,7 +2539,7 @@
 "\n"
 "<b>K辰ytt辰j辰tili:</b> %s"
 
-#: ../src/gtkblist.c:2626
+#: ../src/gtkblist.c:2627
 #, c-format
 msgid ""
 "\n"
@@ -2373,7 +2548,7 @@
 "\n"
 "<b>Tuttavan lempinimi:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../src/gtkblist.c:2639
 #, c-format
 msgid ""
 "\n"
@@ -2382,7 +2557,7 @@
 "\n"
 "<b>Kutsumanimi:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2648
 #, c-format
 msgid ""
 "\n"
@@ -2409,7 +2584,7 @@
 "\n"
 "<b>Viimeksi n辰hty:</b> %s sitten"
 
-#: ../src/gtkblist.c:2702
+#: ../src/gtkblist.c:2703
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2417,7 +2592,7 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: ../src/gtkblist.c:2725
+#: ../src/gtkblist.c:2714
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2425,7 +2600,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: ../src/gtkblist.c:2727
+#: ../src/gtkblist.c:2716
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2433,7 +2608,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: ../src/gtkblist.c:2729
+#: ../src/gtkblist.c:2718
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2441,111 +2616,117 @@
 "\n"
 "<b>Tila</b>: Rokkaava"
 
-#: ../src/gtkblist.c:3018
+#: ../src/gtkblist.c:3007
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../src/gtkblist.c:3020
+#: ../src/gtkblist.c:3009
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3023 ../src/gtkprefs.c:1728
-#: ../src/protocols/bonjour/bonjour.c:325 ../src/protocols/msn/msn.c:554
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:5175 ../src/protocols/yahoo/yahoo.c:2671
-#: ../src/protocols/yahoo/yahoo_profile.c:680
+#: ../src/gtkblist.c:3012 ../src/gtkprefs.c:1745
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
+#: ../src/protocols/oscar/oscar.c:5208 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../src/gtkblist.c:3027
-msgid "Offline "
-msgstr "Poissa linjoilta "
-
-#: ../src/gtkblist.c:3143
+#: ../src/gtkblist.c:3144
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../src/gtkblist.c:3144 ../src/gtkblist.c:3177
+#: ../src/gtkblist.c:3145 ../src/gtkblist.c:3178
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhm辰keskusteluun..."
 
-#: ../src/gtkblist.c:3145
+#: ../src/gtkblist.c:3146
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae k辰ytt辰j辰tiedot..."
 
-#: ../src/gtkblist.c:3146
+#: ../src/gtkblist.c:3147
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lis辰辰 tuttava..."
 
-#: ../src/gtkblist.c:3147 ../src/gtkblist.c:3180
+#: ../src/gtkblist.c:3148 ../src/gtkblist.c:3181
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lis辰辰 ryhm辰keskustelu..."
 
-#: ../src/gtkblist.c:3148
+#: ../src/gtkblist.c:3149
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lis辰辰 ryhm辰..."
 
-#: ../src/gtkblist.c:3183
+#: ../src/gtkblist.c:3184
 msgid "/Tools/Buddy Pounces"
 msgstr "/Ty旦kalut/Tuttavailmoittimet"
 
-#: ../src/gtkblist.c:3186
+#: ../src/gtkblist.c:3187
 msgid "/Tools/Privacy"
 msgstr "/Ty旦kalut/Yksityisyys"
 
-#: ../src/gtkblist.c:3188
+#: ../src/gtkblist.c:3190
 msgid "/Tools/Room List"
 msgstr "/Ty旦kalut/Huonelista"
 
-#: ../src/gtkblist.c:3380
+#: ../src/gtkblist.c:3384
 msgid "Manually"
 msgstr "K辰sin"
 
-#: ../src/gtkblist.c:3382
+#: ../src/gtkblist.c:3386
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../src/gtkblist.c:3383
+#: ../src/gtkblist.c:3387
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../src/gtkblist.c:3384
+#: ../src/gtkblist.c:3388
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../src/gtkblist.c:3534
+#: ../src/gtkblist.c:3493 ../src/gtkconn.c:191
+#, c-format
+msgid "%s disconnected"
+msgstr "Yhteys katkennut kohteeseen %s"
+
+#: ../src/gtkblist.c:3515
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
+
+#: ../src/gtkblist.c:3642
 msgid "/Accounts"
 msgstr "/K辰ytt辰j辰tilit"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3634
+#: ../src/gtkblist.c:3747
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/N辰yt辰 poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:3637
+#: ../src/gtkblist.c:3750
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/N辰yt辰 tyhj辰t ryhm辰t"
 
-#: ../src/gtkblist.c:3643
+#: ../src/gtkblist.c:3756
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/N辰yt辰 tuttavien tiedot"
 
-#: ../src/gtkblist.c:3646
+#: ../src/gtkblist.c:3759
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/N辰yt辰 joutenoloajat"
 
-#: ../src/gtkblist.c:4351 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4471 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2919
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2976
 msgid "Add Buddy"
 msgstr "Lis辰辰 tuttava"
 
-#: ../src/gtkblist.c:4375
+#: ../src/gtkblist.c:4495
 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. "
@@ -2555,32 +2736,32 @@
 "my旦s valita lempinimen tuttavalle. Lempinimi n辰ytet辰辰n n辰ytt旦nimen sijasta "
 "aina kuin mahdollista.\n"
 
-#: ../src/gtkblist.c:4397
+#: ../src/gtkblist.c:4517
 msgid "Screen Name:"
 msgstr "N辰ytt旦nimi:"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4445 ../src/gtkblist.c:4764
+#: ../src/gtkblist.c:4565 ../src/gtkblist.c:4884
 msgid "Account:"
 msgstr "K辰ytt辰j辰tili:"
 
-#: ../src/gtkblist.c:4697
+#: ../src/gtkblist.c:4817
 msgid "This protocol does not support chat rooms."
-msgstr "T辰m辰 protokolla ei tue keskusteluhuoneita."
-
-#: ../src/gtkblist.c:4713
+msgstr "T辰m辰 yhteysk辰yt辰nt旦 ei tue keskusteluhuoneita."
+
+#: ../src/gtkblist.c:4833
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Et ole kirjautuneena mill辰辰n protokollalla jolla voisi k辰ytt辰辰 "
+"Et ole kirjautuneena mill辰辰n yhteysk辰yt辰nn旦ll辰 jolla voisi k辰ytt辰辰 "
 "ryhm辰keskustelua."
 
-#: ../src/gtkblist.c:4730
+#: ../src/gtkblist.c:4850
 msgid "Add Chat"
 msgstr "Lis辰辰 ryhm辰keskustelu"
 
-#: ../src/gtkblist.c:4754
+#: ../src/gtkblist.c:4874
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2588,36 +2769,36 @@
 "Anna lempinimi, ja tiedot ryhm辰keskustelusta jonka haluat lis辰t辰 "
 "tuttavalistalle.\n"
 
-#: ../src/gtkblist.c:4836 ../src/protocols/sametime/sametime.c:5336
-#: ../src/protocols/sametime/sametime.c:5420
+#: ../src/gtkblist.c:4956 ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5407
 msgid "Add Group"
 msgstr "Lis辰辰 ryhm辰"
 
-#: ../src/gtkblist.c:4837
+#: ../src/gtkblist.c:4957
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lis辰tt辰v辰n ryhm辰n nimi."
 
-#: ../src/gtkblist.c:5458
+#: ../src/gtkblist.c:5578
 msgid "_Edit Account"
 msgstr "_Muokaa k辰ytt辰j辰tili辰"
 
-#: ../src/gtkblist.c:5491 ../src/gtkblist.c:5497
+#: ../src/gtkblist.c:5611 ../src/gtkblist.c:5617
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../src/gtkblist.c:5505
+#: ../src/gtkblist.c:5625
 msgid "_Disable"
 msgstr "_Poista k辰yt旦st辰"
 
-#: ../src/gtkblist.c:5517
+#: ../src/gtkblist.c:5637
 msgid "Enable Account"
 msgstr "Ota tili k辰ytt旦旦n"
 
-#: ../src/gtkblist.c:5572
+#: ../src/gtkblist.c:5690
 msgid "/Tools"
 msgstr "/Ty旦kalut"
 
-#: ../src/gtkblist.c:5667
+#: ../src/gtkblist.c:5785
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -2693,19 +2874,16 @@
 msgid "Whether combobox dropdowns should look like lists rather than menus"
 msgstr "N辰kyyk旦 alasvedot luettelona valikon sijaan"
 
-#: ../src/gtkconn.c:189
-#, c-format
-msgid "%s disconnected"
-msgstr "Yhteys katkennut kohteeseen %s"
-
-#: ../src/gtkconn.c:190
-#, 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 nyt pois k辰yt旦st辰. "
-"Korjaa ongelma ja ota k辰ytt辰j辰tili j辰lleen k辰ytt旦旦n yhdist辰辰ksesi."
+#: ../src/gtkconn.c:192
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
+msgstr ""
+"Katkaistiin yhteys %s virheen vuoksi: %s\n"
+"Gaim ei yrit辰 uudelleenyhdist辰辰 k辰ytt辰j辰tili辰 kunnes korjaat virheen ja otat "
+"tilin uudelleen k辰ytt旦旦n."
 
 #: ../src/gtkconv.c:364
 #, c-format
@@ -2725,7 +2903,7 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Kirjoita \"/help &alt;komento>\" saadaksesi ohjeen tietyst辰 komennosta.\n"
+"Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietyst辰 komennosta.\n"
 "Seuraavat komennot ovat saatavilla t辰ss辰 kontekstissa:\n"
 
 #: ../src/gtkconv.c:484
@@ -2751,11 +2929,11 @@
 
 #: ../src/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
-msgstr "T辰m辰 komento ei toimi t辰lle protokollalle."
+msgstr "T辰m辰 komento ei toimi t辰lle yhteysk辰yt辰nn旦lle."
 
 #: ../src/gtkconv.c:744 ../src/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Tuttava ei k辰yt辰 samaa protokollaa kuin t辰m辰 ryhm辰keskustelu."
+msgstr "Tuttava ei k辰yt辰 samaa yhteysk辰yt辰nt旦辰 kuin t辰m辰 ryhm辰keskustelu."
 
 #: ../src/gtkconv.c:764
 msgid ""
@@ -2779,12 +2957,12 @@
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1079
-#: ../src/gtksavedstatuses.c:1402
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2406 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2399 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen ep辰onnistui."
@@ -2798,334 +2976,336 @@
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../src/gtkconv.c:1092 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/gtkconv.c:1118 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../src/gtkconv.c:1289
+#: ../src/gtkconv.c:1290
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. T辰m辰n keskustelun viestit kirjataan nyt lokiin."
 
-#: ../src/gtkconv.c:1297
+#: ../src/gtkconv.c:1298
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. T辰m辰n keskustelun viestej辰 ei en辰辰 kirjata "
 "lokiin."
 
-#: ../src/gtkconv.c:1577
+#: ../src/gtkconv.c:1578
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../src/gtkconv.c:1583 ../src/protocols/oscar/oscar.c:647
+#: ../src/gtkconv.c:1584 ../src/protocols/oscar/oscar.c:650
 msgid "Send File"
 msgstr "L辰het辰 tiedosto"
 
-#: ../src/gtkconv.c:1590
+#: ../src/gtkconv.c:1591
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../src/gtkconv.c:1593
+#: ../src/gtkconv.c:1594
 msgid "Ignore"
 msgstr "J辰t辰 huomiotta"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1600
 msgid "Info"
 msgstr "Tietoja"
 
-#: ../src/gtkconv.c:1605
+#: ../src/gtkconv.c:1606
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../src/gtkconv.c:1620
+#: ../src/gtkconv.c:1621
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../src/gtkconv.c:2414
+#: ../src/gtkconv.c:2407
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../src/gtkconv.c:2437
+#: ../src/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../src/gtkconv.c:2486
+#: ../src/gtkconv.c:2479
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../src/gtkconv.c:2491
+#: ../src/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../src/gtkconv.c:2497
+#: ../src/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimell辰..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2638
+#: ../src/gtkconv.c:2631
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../src/gtkconv.c:2640
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../src/gtkconv.c:2645
+#: ../src/gtkconv.c:2638
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../src/gtkconv.c:2647
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/N辰yt辰 _loki..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimell辰..."
 
-#: ../src/gtkconv.c:2650
+#: ../src/gtkconv.c:2643
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjenn辰 takaisinvieritys"
 
-#: ../src/gtkconv.c:2654
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_L辰het辰 tiedosto..."
 
-#: ../src/gtkconv.c:2655
+#: ../src/gtkconv.c:2648
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lis辰辰 tuttava_ilmoitin..."
 
+#: ../src/gtkconv.c:2650
+msgid "/Conversation/_Get Info"
+msgstr "/Keskustelu/_Hae tiedot..."
+
+#: ../src/gtkconv.c:2652
+msgid "/Conversation/In_vite..."
+msgstr "/Keskustelu/Kut_su..."
+
 #: ../src/gtkconv.c:2657
-msgid "/Conversation/_Get Info"
-msgstr "/Keskustelu/_Hae tiedot..."
+msgid "/Conversation/Al_ias..."
+msgstr "/Keskustelu/_Alias..."
 
 #: ../src/gtkconv.c:2659
-msgid "/Conversation/In_vite..."
-msgstr "/Keskustelu/Kut_su..."
-
-#: ../src/gtkconv.c:2664
-msgid "/Conversation/Al_ias..."
-msgstr "/Keskustelu/_Alias..."
-
-#: ../src/gtkconv.c:2666
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_st辰..."
 
+#: ../src/gtkconv.c:2661
+msgid "/Conversation/_Add..."
+msgstr "/Keskustelu/_Lis辰辰..."
+
+#: ../src/gtkconv.c:2663
+msgid "/Conversation/_Remove..."
+msgstr "/Keskustelu/_Poista..."
+
 #: ../src/gtkconv.c:2668
-msgid "/Conversation/_Add..."
-msgstr "/Keskustelu/_Lis辰辰..."
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Keskustelu/Lis辰辰 lin_kki..."
 
 #: ../src/gtkconv.c:2670
-msgid "/Conversation/_Remove..."
-msgstr "/Keskustelu/_Poista..."
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Keskustelu/Liit辰 _kuva..."
 
 #: ../src/gtkconv.c:2675
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Keskustelu/Lis辰辰 lin_kki..."
-
-#: ../src/gtkconv.c:2677
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Keskustelu/Liit辰 _kuva..."
-
-#: ../src/gtkconv.c:2682
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../src/gtkconv.c:2686
+#: ../src/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../src/gtkconv.c:2687
+#: ../src/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2688
+#: ../src/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkki辰辰net"
 
-#: ../src/gtkconv.c:2689
+#: ../src/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/N辰yt辰 tuttava_kuvake"
 
-#: ../src/gtkconv.c:2691
+#: ../src/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/N辰yt辰 muokkaus-_ty旦kalurivit"
 
-#: ../src/gtkconv.c:2692
+#: ../src/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/N辰yt辰 aika_leima"
 
-#: ../src/gtkconv.c:2784
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/N辰yt辰 loki..."
 
-#: ../src/gtkconv.c:2790
+#: ../src/gtkconv.c:2783
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/L辰het辰 tiedosto..."
 
-#: ../src/gtkconv.c:2794
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lis辰辰 tuttavailmoitin..."
 
-#: ../src/gtkconv.c:2800
+#: ../src/gtkconv.c:2793
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../src/gtkconv.c:2804
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../src/gtkconv.c:2810
+#: ../src/gtkconv.c:2803
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../src/gtkconv.c:2814
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Est辰..."
 
-#: ../src/gtkconv.c:2818
+#: ../src/gtkconv.c:2811
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lis辰辰..."
 
-#: ../src/gtkconv.c:2822
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2821
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lis辰辰 linkki..."
 
-#: ../src/gtkconv.c:2832
+#: ../src/gtkconv.c:2825
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lis辰辰 kuva..."
 
-#: ../src/gtkconv.c:2838
+#: ../src/gtkconv.c:2831
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2841
+#: ../src/gtkconv.c:2834
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkki辰辰net"
 
-#: ../src/gtkconv.c:2854
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/N辰yt辰 muokkausty旦kalurivit"
 
-#: ../src/gtkconv.c:2857
+#: ../src/gtkconv.c:2850
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/N辰yt辰 aikaleima"
 
-#: ../src/gtkconv.c:2860
+#: ../src/gtkconv.c:2853
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/N辰yt辰 tuttava_kuvake"
 
-#: ../src/gtkconv.c:2939
+#: ../src/gtkconv.c:2933
 msgid "User is typing..."
 msgstr "K辰ytt辰j辰 kirjoittaa..."
 
-#: ../src/gtkconv.c:2942
+#: ../src/gtkconv.c:2936
 msgid "User has typed something and stopped"
 msgstr "K辰ytt辰j辰 kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3128
+#: ../src/gtkconv.c:3119
 msgid "_Send To"
 msgstr "_L辰het辰 k辰ytt辰j辰lle"
 
-#: ../src/gtkconv.c:3780
+#: ../src/gtkconv.c:3771
 msgid "_Send"
 msgstr "_L辰het辰"
 
-#: ../src/gtkconv.c:3833 ../src/protocols/sametime/sametime.c:3513
+#: ../src/gtkconv.c:3826 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3881
+#: ../src/gtkconv.c:3878
 msgid "0 people in room"
 msgstr "0 ihmist辰 huoneessa"
 
-#: ../src/gtkconv.c:3960
+#: ../src/gtkconv.c:3957
 msgid "IM the user"
 msgstr "L辰het辰 pikaviesti k辰ytt辰j辰lle"
 
-#: ../src/gtkconv.c:3973
+#: ../src/gtkconv.c:3970
 msgid "Ignore the user"
 msgstr "�l辰 huomioi k辰ytt辰j辰辰"
 
-#: ../src/gtkconv.c:3985
+#: ../src/gtkconv.c:3982
 msgid "Get the user's information"
 msgstr "Hae k辰ytt辰j辰tiedot"
 
-#: ../src/gtkconv.c:4954 ../src/gtkconv.c:5064
+#: ../src/gtkconv.c:4954 ../src/gtkconv.c:5063
 #, 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:6520
+#: ../src/gtkconv.c:6533
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say <viesti>: L辰het辰 viesti normaalisti, niin kuin et olisi k辰ytt辰m辰ss辰 "
-"komentoa."
-
-#: ../src/gtkconv.c:6523
+"say &lt;viesti&gt;: L辰het辰 viesti normaalisti, niin kuin et olisi "
+"k辰ytt辰m辰ss辰 komentoa."
+
+#: ../src/gtkconv.c:6536
 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:6526
+"me &lt;toiminta&gt;: L辰het辰 IRC-tyylinen toiminta tuttavalle tai "
+"keskusteluun."
+
+#: ../src/gtkconv.c:6539
 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:6529
+msgstr ""
+"debug &lt;valinta&gt;: L辰het辰 eri debug-tietoja senhetkiseen keskusteluun."
+
+#: ../src/gtkconv.c:6542
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjent辰辰 keskustelun"
 
-#: ../src/gtkconv.c:6532
+#: ../src/gtkconv.c:6545
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../src/gtkconv.c:6691
+#: ../src/gtkconv.c:6704
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../src/gtkconv.c:6723
+#: ../src/gtkconv.c:6736
 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:7525
+#: ../src/gtkconv.c:7540
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../src/gtkconv.c:7989
+#: ../src/gtkconv.c:8004
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../src/gtkconv.c:7991
+#: ../src/gtkconv.c:8006
 msgid "Separate IM and Chat windows"
 msgstr "N辰yt辰 pikaviestit ja ryhm辰keskustelut eri ikkunoissa"
 
-#: ../src/gtkconv.c:7993 ../src/gtkprefs.c:1232
+#: ../src/gtkconv.c:8008 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../src/gtkconv.c:7995
+#: ../src/gtkconv.c:8010
 msgid "By group"
 msgstr "Ryhm辰n mukaan"
 
-#: ../src/gtkconv.c:7997
+#: ../src/gtkconv.c:8012
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -3208,7 +3388,7 @@
 msgid "original author"
 msgstr "alkuper辰inen tekij辰"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -3220,11 +3400,11 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:158 ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161
 msgid "Czech"
 msgstr "t邸ekki"
 
@@ -3232,7 +3412,7 @@
 msgid "Danish"
 msgstr "tanska"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162
 msgid "German"
 msgstr "saksa"
 
@@ -3252,17 +3432,17 @@
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:162 ../src/gtkdialogs.c:163
-#: ../src/gtkdialogs.c:164 ../src/gtkdialogs.c:165
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:163 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:168 ../src/gtkdialogs.c:169
-#: ../src/gtkdialogs.c:170 ../src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "French"
 msgstr "ranska"
 
@@ -3278,20 +3458,20 @@
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173
 msgid "Italian"
 msgstr "italia"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
-#: ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176
 msgid "Japanese"
 msgstr "japani"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178
 msgid "Korean"
 msgstr "korea"
 
@@ -3299,7 +3479,7 @@
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
 msgid "Lithuanian"
 msgstr "liettua"
 
@@ -3315,7 +3495,7 @@
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
 msgid "Polish"
 msgstr "puola"
 
@@ -3331,7 +3511,7 @@
 msgid "Romanian"
 msgstr "romania"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Russian"
 msgstr "ven辰j辰"
 
@@ -3343,7 +3523,7 @@
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184
 msgid "Swedish"
 msgstr "ruotsi"
 
@@ -3356,158 +3536,163 @@
 msgstr "telugu"
 
 #: ../src/gtkdialogs.c:147
+msgid "Turkish"
+msgstr "turkki"
+
+#: ../src/gtkdialogs.c:148
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:148
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-ty旦ryhm辰"
 
-#: ../src/gtkdialogs.c:148 ../src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../src/gtkdialogs.c:156
+#: ../src/gtkdialogs.c:157
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:183
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../src/gtkdialogs.c:226
+#: ../src/gtkdialogs.c:227
 msgid "About Gaim"
 msgstr "Tietoja Gaimista"
 
-#: ../src/gtkdialogs.c:250
+#: ../src/gtkdialogs.c:251
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once.  It is written using GTK+.  You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
-"Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
 msgstr ""
 "Gaim on modulaarinen pikaviestinsovellus, joka kykenee k辰ytt辰m辰辰n AIM-, "
 "MSN-, Yahoo!-, Jabber-, ICQ-, IRC-, SILC-, Novell GroupWise-, Lotus "
-"Sametime-, Napster-, Zephyr- ja Gadu-Gadu-protokollia yht辰aikaisesti. Se on "
-"ohjelmoitu k辰ytt辰en Gtk+-kirjastoa. Voit muokata ja jakaa ohjelmaa GPL-"
-"lisenssin (versio 2 tai my旦hempi) ehdoilla. Kopio GPL:st辰 on sis辰llytetty "
-"'COPYING'-tiedostoon, joka tulee Gaimin mukana. T辰ydellinen luettelo "
-"ohjelman tekemiseen osallistuneista l旦ytyy 'COPYRIGHT'-tiedostosta. T辰m辰n "
-"ohjelman tekij辰t eiv辰t anna ohjelmalle mink辰辰nlaista takuuta.<BR><BR>"
-
-#: ../src/gtkdialogs.c:264
+"Sametime-, Napster-, Zephyr- ja Gadu-Gadu-yhteysk辰yt辰nt旦j辰 yht辰aikaisesti. "
+"Se on ohjelmoitu k辰ytt辰en Gtk+-kirjastoa.<BR><BR>Voit muokata ja jakaa "
+"ohjelmaa GPL-lisenssin (versio 2 tai my旦hempi) ehdoilla. Kopio GPL:st辰 on "
+"sis辰llytetty 'COPYING'-tiedostoon, joka tulee Gaimin mukana. Gaimin "
+"tekij辰noikeudet on sen tekemiseen osallistuneilla. T辰ydellinen luettelo "
+"osallistuneista l旦ytyy 'COPYRIGHT'-tiedostosta. Emme anna ohjelmalle "
+"mink辰辰nlaista takuuta.<BR><BR>"
+
+#: ../src/gtkdialogs.c:265
 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:267
+#: ../src/gtkdialogs.c:268
 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:273
+#: ../src/gtkdialogs.c:274
 msgid "Current Developers"
 msgstr "Nykyiset kehitt辰j辰t"
 
-#: ../src/gtkdialogs.c:288
+#: ../src/gtkdialogs.c:289
 msgid "Crazy Patch Writers"
 msgstr "Villit korjausp辰ivitysten kirjoittajat"
 
-#: ../src/gtkdialogs.c:303
+#: ../src/gtkdialogs.c:304
 msgid "Retired Developers"
 msgstr "Lopettaneet kehitt辰j辰t"
 
-#: ../src/gtkdialogs.c:318
+#: ../src/gtkdialogs.c:319
 msgid "Current Translators"
 msgstr "Nykyiset kielenk辰辰nt辰j辰t"
 
-#: ../src/gtkdialogs.c:338
+#: ../src/gtkdialogs.c:339
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenk辰辰nt辰j辰t"
 
-#: ../src/gtkdialogs.c:356
+#: ../src/gtkdialogs.c:357
 msgid "Debugging Information"
 msgstr "Virheenj辰ljitystietoja"
 
-#: ../src/gtkdialogs.c:546 ../src/gtkdialogs.c:683 ../src/gtkdialogs.c:750
+#: ../src/gtkdialogs.c:553 ../src/gtkdialogs.c:690 ../src/gtkdialogs.c:757
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:551 ../src/gtkdialogs.c:688 ../src/gtkdialogs.c:755
+#: ../src/gtkdialogs.c:558 ../src/gtkdialogs.c:695 ../src/gtkdialogs.c:762
 msgid "_Account"
 msgstr "_K辰ytt辰j辰tili"
 
-#: ../src/gtkdialogs.c:559
+#: ../src/gtkdialogs.c:566
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../src/gtkdialogs.c:561
+#: ../src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Sy旦t辰 sen henkil旦n n辰ytt旦nimi tai lempinimi, jolle haluat l辰hett辰辰 "
 "pikaviestin."
 
-#: ../src/gtkdialogs.c:696
+#: ../src/gtkdialogs.c:703
 msgid "Get User Info"
 msgstr "Hae k辰ytt辰j辰tiedot"
 
-#: ../src/gtkdialogs.c:698
+#: ../src/gtkdialogs.c:705
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Sy旦t辰 sen henkil旦n n辰ytt旦nimi tai lempinimi, jonka tiedot haluat n辰hd辰."
 
-#: ../src/gtkdialogs.c:764
+#: ../src/gtkdialogs.c:771
 msgid "View User Log"
 msgstr "N辰yt辰 k辰ytt辰j辰loki"
 
-#: ../src/gtkdialogs.c:766
+#: ../src/gtkdialogs.c:773
 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:785
+#: ../src/gtkdialogs.c:792
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhm辰lle lempinimi"
 
-#: ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:793
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi t辰lle kontaktiryhm辰lle."
 
-#: ../src/gtkdialogs.c:788 ../src/gtkdialogs.c:810 ../src/gtkdialogs.c:830
+#: ../src/gtkdialogs.c:795 ../src/gtkdialogs.c:817 ../src/gtkdialogs.c:837
 #: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:806
+#: ../src/gtkdialogs.c:813
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../src/gtkdialogs.c:808
+#: ../src/gtkdialogs.c:815
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../src/gtkdialogs.c:827
+#: ../src/gtkdialogs.c:834
 msgid "Alias Chat"
 msgstr "Anna ryhm辰keskustelulle lempinimi"
 
-#: ../src/gtkdialogs.c:828
+#: ../src/gtkdialogs.c:835
 msgid "Enter an alias for this chat."
 msgstr "Sy旦t辰 lempinimi t辰lle ryhm辰keskustelulle."
 
-#: ../src/gtkdialogs.c:865
+#: ../src/gtkdialogs.c:872
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3522,15 +3707,15 @@
 "Olet poistamassa kontaktin, jossa on %s sek辰 %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:873
+#: ../src/gtkdialogs.c:880
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../src/gtkdialogs.c:874
+#: ../src/gtkdialogs.c:881
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../src/gtkdialogs.c:925
+#: ../src/gtkdialogs.c:932
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3538,29 +3723,29 @@
 msgstr ""
 "Olet poistamassa ryhm辰辰 nimelt辰 \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:928
+#: ../src/gtkdialogs.c:935
 msgid "Remove Group"
 msgstr "Poista ryhm辰"
 
-#: ../src/gtkdialogs.c:929
+#: ../src/gtkdialogs.c:936
 msgid "_Remove Group"
 msgstr "_Poista ryhm辰"
 
-#: ../src/gtkdialogs.c:962
+#: ../src/gtkdialogs.c:969
 #, 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:965
+#: ../src/gtkdialogs.c:972
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../src/gtkdialogs.c:966
+#: ../src/gtkdialogs.c:973
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../src/gtkdialogs.c:987
+#: ../src/gtkdialogs.c:994
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3569,11 +3754,11 @@
 "Olet poistamassa ryhm辰keskustelun nimelt辰 \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../src/gtkdialogs.c:990
+#: ../src/gtkdialogs.c:997
 msgid "Remove Chat"
 msgstr "Poista ryhm辰keskustelu"
 
-#: ../src/gtkdialogs.c:991
+#: ../src/gtkdialogs.c:998
 msgid "_Remove Chat"
 msgstr "_Poista ryhm辰keskustelu"
 
@@ -3673,7 +3858,7 @@
 msgid "Time Remaining:"
 msgstr "Aikaa j辰ljell辰:"
 
-#: ../src/gtkft.c:708 ../src/protocols/oscar/oscar.c:8578
+#: ../src/gtkft.c:708 ../src/protocols/oscar/oscar.c:8546
 msgid "File Transfers"
 msgstr "Tiedostonsiirrot"
 
@@ -3691,7 +3876,7 @@
 msgstr "Tiedostonsiirron yksityiskohdat"
 
 #. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:147
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Tauko"
 
@@ -3736,7 +3921,7 @@
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/gtkimhtml.c:3263
+#: ../src/gtkimhtml.c:3261
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3746,7 +3931,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3266
+#: ../src/gtkimhtml.c:3264
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3756,7 +3941,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3279
+#: ../src/gtkimhtml.c:3277
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3767,7 +3952,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3282
+#: ../src/gtkimhtml.c:3280
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3778,11 +3963,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3362 ../src/gtkimhtml.c:3374
+#: ../src/gtkimhtml.c:3360 ../src/gtkimhtml.c:3372
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/gtkimhtml.c:3402
+#: ../src/gtkimhtml.c:3400
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimell辰..."
 
@@ -3888,17 +4073,22 @@
 msgid "Insert smiley"
 msgstr "Lis辰辰 hymi旦"
 
-#: ../src/gtklog.c:214
-#, c-format
-msgid "Conversation in %s on %s"
-msgstr "Keskustelu paikassa %s aiheesta %s"
-
-#: ../src/gtklog.c:216
-#, c-format
-msgid "Conversation with %s on %s"
-msgstr "Keskustelu tuttavan %s kanssa aiheesta %s"
-
-#: ../src/gtklog.c:329
+#: ../src/gtklog.c:202
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Keskustelu huoneessa %s: %s</span>"
+
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+"<span size='larger' weight='bold'>Keskustelu k辰ytt辰j辰n %s kanssa: %s</span>"
+
+#: ../src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:311
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -3906,7 +4096,7 @@
 "J辰rjestelm辰tapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
 "tilamuutokset j辰rjestelm辰lokiin\" on asetettu."
 
-#: ../src/gtklog.c:333
+#: ../src/gtklog.c:315
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -3914,41 +4104,41 @@
 "Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
 "on asetettu."
 
-#: ../src/gtklog.c:336
+#: ../src/gtklog.c:318
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Ryhm辰keskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhm辰keskustelut "
 "lokiin\" on asetettu."
 
-#: ../src/gtklog.c:340
+#: ../src/gtklog.c:322
 msgid "No logs were found"
 msgstr "Lokeja ei l旦ytynyt"
 
-#: ../src/gtklog.c:416
+#: ../src/gtklog.c:398
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../src/gtklog.c:492
+#: ../src/gtklog.c:474
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../src/gtklog.c:500 ../src/gtklog.c:551
+#: ../src/gtklog.c:482 ../src/gtklog.c:533
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut tuttavan %s kanssa"
 
-#: ../src/gtklog.c:576
+#: ../src/gtklog.c:558
 msgid "System Log"
 msgstr "J辰rjestelm辰loki"
 
-#: ../src/gtkmain.c:317
+#: ../src/gtkmain.c:312
 #, 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:319
+#: ../src/gtkmain.c:314
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3973,55 +4163,44 @@
 "                      m辰辰rittelee k辰ytett辰v辰t tilit pilkuin eroteltuina)\n"
 "  -v, --version       n辰yt辰 nykyinen versionumero ja poistu\n"
 
-#: ../src/gtkmain.c:496
+#: ../src/gtkmain.c:497
+#, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"It is possible that this bug is already fixed in CVS.\n"
 "If you can reproduce the crash, please notify the gaim\n"
 "developers by reporting a bug at\n"
-msgstr ""
-"Gaim on kaatunut ja yritt辰nyt tallentaa muistivedoksen.\n"
-"T辰m辰 on ohjelmavirhe ja se ei tapahtunut mink辰辰n\n"
-"k辰ytt辰j辰n tekem辰n toiminnon takia.\n"
-"\n"
-"On mahdollista ett辰 t辰m辰 virhe on jo korjattu CVS:ss辰.\n"
-"Jos voit toistaa ongelman, ilmoita siit辰 Gaimin\n"
-"kehitt辰jille raportoimalla virheest辰 osoitteessa\n"
-
-#: ../src/gtkmain.c:502
-msgid ""
-"bug.php\n"
+"%sbug.php\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-msgstr ""
-"bug.php\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"Gaim on kaatunut ja yritt辰nyt tallentaa muistivedoksen.\n"
+"T辰m辰 on ohjelmavirhe ja se ei tapahtunut mink辰辰n\n"
+"tekem辰si virheen takia.\n"
+"\n"
+"Jos voit toistaa ongelman, ilmoita siit辰 Gaimin\n"
+"kehitt辰jille raportoimalla virheest辰 osoitteessa\n"
+"%sbug.php\n"
 "\n"
 "Varmista ett辰 kerrot mit辰 teit vian ilmetess辰 ja l辰het辰 my旦s\n"
 "pinolistaus muistivedostiedostosta. Jos et tied辰 kuinka\n"
 "pinolistaus (backtrace) haetaan, lue ohjeita osoitteessa\n"
-
-#: ../src/gtkmain.c:506
-msgid ""
-"gdb.php.  If you need further\n"
-"assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
-"Contact information for Sean and Luke on other protocols is at\n"
-msgstr ""
-"gdb.php.  Jos tarvitset lis辰apua,\n"
-"l辰het辰 pikaviesti joko tunnukselle SeanEgn tai LSchiere (AIMissa).\n"
-"Seanin ja Luken yhteystiedot muilla protokollilla ovat osoitteessa\n"
-
-#: ../src/gtkmain.c:509
-msgid "contactinfo.php.\n"
-msgstr "contactinfo.php.\n"
-
-#: ../src/gtkmain.c:720 ../src/gtkmain.c:722
-msgid "Default"
-msgstr "Oletus"
+"%sgdb.php.\n"
+"\n"
+"Jos tarvitset lis辰apua, l辰het辰 pikaviesti joko tunnukselle SeanEgn tai "
+"LSchiere (AIMissa). Seanin ja Luken yhteystiedot muilla yhteysk辰yt辰nn旦ill辰 "
+"ovat osoitteessa\n"
+"%scontactinfo.php.\n"
 
 #: ../src/gtkmedia.c:52
 msgid "Call ended."
@@ -4066,7 +4245,7 @@
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1030
+#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1118
 msgid "From"
 msgstr "L辰hett辰j辰"
 
@@ -4078,14 +4257,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../src/gtknotify.c:455
+#: ../src/gtknotify.c:451
 #, 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:460
+#: ../src/gtknotify.c:456
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4096,35 +4275,35 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:645 ../src/protocols/sametime/sametime.c:5470
+#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5460
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../src/gtknotify.c:801 ../src/protocols/oscar/oscar.c:4963
+#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: ../src/gtknotify.c:802 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: ../src/gtknotify.c:842
+#: ../src/gtknotify.c:840
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Selainkomento <b>%s</b> on virheellinen."
 
-#: ../src/gtknotify.c:844 ../src/gtknotify.c:856 ../src/gtknotify.c:869
-#: ../src/gtknotify.c:994
+#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
+#: ../src/gtknotify.c:992
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen ep辰onnistui"
 
-#: ../src/gtknotify.c:854 ../src/gtknotify.c:867
+#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Virhe k辰ynnistett辰ess辰 <b>%s</b>: %s"
 
-#: ../src/gtknotify.c:995
+#: ../src/gtknotify.c:993
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento-optio valittu mutta komentoa ei ole asetettu."
@@ -4175,115 +4354,115 @@
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/gtkpounce.c:260
+#: ../src/gtkpounce.c:259
 msgid "Please enter a buddy to pounce."
 msgstr "Sy旦t辰 ilmoitettava tuttava."
 
-#: ../src/gtkpounce.c:504
+#: ../src/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../src/gtkpounce.c:504
+#: ../src/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:521
+#: ../src/gtkpounce.c:520
 msgid "Pounce on Whom"
 msgstr "Kenest辰 ilmoitetaan"
 
-#: ../src/gtkpounce.c:548
+#: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:572
+#: ../src/gtkpounce.c:571
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../src/gtkpounce.c:580
+#: ../src/gtkpounce.c:579
 msgid "Si_gns on"
 msgstr "_kirjautuu sis辰辰n"
 
-#: ../src/gtkpounce.c:582
+#: ../src/gtkpounce.c:581
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../src/gtkpounce.c:584
+#: ../src/gtkpounce.c:583
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../src/gtkpounce.c:586
+#: ../src/gtkpounce.c:585
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../src/gtkpounce.c:588
+#: ../src/gtkpounce.c:587
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../src/gtkpounce.c:590
+#: ../src/gtkpounce.c:589
 msgid "Is no longer i_dle"
 msgstr "ei en辰辰 ole j_outen"
 
-#: ../src/gtkpounce.c:592
+#: ../src/gtkpounce.c:591
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../src/gtkpounce.c:594
+#: ../src/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../src/gtkpounce.c:596
+#: ../src/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "l辰hett辰辰 _viestin"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:628
+#: ../src/gtkpounce.c:627
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../src/gtkpounce.c:636
+#: ../src/gtkpounce.c:635
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../src/gtkpounce.c:638
+#: ../src/gtkpounce.c:637
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../src/gtkpounce.c:640
+#: ../src/gtkpounce.c:639
 msgid "Send a _message"
 msgstr "L辰het辰 _viesti"
 
-#: ../src/gtkpounce.c:642
+#: ../src/gtkpounce.c:641
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../src/gtkpounce.c:644
+#: ../src/gtkpounce.c:643
 msgid "P_lay a sound"
 msgstr "S_oita 辰辰ni"
 
-#: ../src/gtkpounce.c:649
+#: ../src/gtkpounce.c:648
 msgid "Brows_e..."
 msgstr "_Selaa"
 
+#: ../src/gtkpounce.c:650
+msgid "Br_owse..."
+msgstr "S_elaa"
+
 #: ../src/gtkpounce.c:651
-msgid "Br_owse..."
-msgstr "S_elaa"
-
-#: ../src/gtkpounce.c:652
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:764
+#: ../src/gtkpounce.c:763
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../src/gtkpounce.c:772
+#: ../src/gtkpounce.c:771
 msgid "P_ounce only when my status is not available"
 msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
 
-#: ../src/gtkpounce.c:777
+#: ../src/gtkpounce.c:776
 msgid "_Recurring"
 msgstr "_Toistuva"
 
@@ -4357,7 +4536,7 @@
 msgid "Smiley theme failed to unpack."
 msgstr "Hymi旦teeman purkaminen ep辰onnistui."
 
-#: ../src/gtkprefs.c:631
+#: ../src/gtkprefs.c:638
 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."
@@ -4365,214 +4544,214 @@
 "Valitse haluamasi hymi旦teema alla olevasta listasta. Uudet teemat voi "
 "asentaa ved辰&pudota-menetelm辰ll辰 pudottamalla ne teemalistaan."
 
-#: ../src/gtkprefs.c:666
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../src/gtkprefs.c:673 ../src/protocols/jabber/buddy.c:267
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
 #: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../src/gtkprefs.c:814
+#: ../src/gtkprefs.c:821
 msgid "_Hide new IM conversations"
 msgstr "_Piilota uudet keskustelut"
 
-#: ../src/gtkprefs.c:817 ../src/gtkprefs.c:1747
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
 msgid "When away"
 msgstr "Poissaollessa"
 
-#: ../src/gtkprefs.c:821
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "L辰het辰 _tuntemattomia \"kauttaviiva\"-komentoja viestein辰"
 
-#: ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
 msgstr "N辰yt辰 _muotoilu tulevissa viesteiss辰"
 
-#: ../src/gtkprefs.c:826
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "N辰yt辰 tuttavien _kuvakkeet"
 
-#: ../src/gtkprefs.c:828
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "N辰yt辰 tuttavakuvakkeen a_nimaatio"
 
-#: ../src/gtkprefs.c:835
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../src/gtkprefs.c:838
+#: ../src/gtkprefs.c:845
 msgid "Highlight _misspelled words"
 msgstr "Korosta _v辰辰rinkirjoitetut sanat"
 
-#: ../src/gtkprefs.c:842
+#: ../src/gtkprefs.c:849
 msgid "Use smooth-scrolling"
 msgstr "K辰yt辰 portaatonta tekstinvierityst辰"
 
-#: ../src/gtkprefs.c:858
+#: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr ""
-"T辰lt辰 ulosmenev辰 viesti n辰ytt辰辰 kun k辰yt辰t protokollaa joka tukee "
+"T辰lt辰 ulosmenev辰 viesti n辰ytt辰辰 kun k辰yt辰t yhteysk辰yt辰nt旦辰 joka tukee "
 "muotoiluja. :)"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:880
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "V辰lilehtivalinnat"
 
-#: ../src/gtkprefs.c:882
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "N辰yt辰 pikaviestit ja ryhm辰keskustelut _jaetuissa ikkunoissa"
 
-#: ../src/gtkprefs.c:896
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "N辰yt辰 _sulkemispainikkeet v辰lilehdiss辰"
 
-#: ../src/gtkprefs.c:902
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
 msgstr "_Asettelu:"
 
-#: ../src/gtkprefs.c:904
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "Ylh辰辰ll辰"
 
-#: ../src/gtkprefs.c:905
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: ../src/gtkprefs.c:906
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: ../src/gtkprefs.c:907
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../src/gtkprefs.c:909
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
 msgstr "Vasemmalla pystysuuntaisesti"
 
-#: ../src/gtkprefs.c:910
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
 msgstr "Oikealla pystysuuntaisesti"
 
-#: ../src/gtkprefs.c:915
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../src/gtkprefs.c:966 ../src/protocols/oscar/oscar.c:802
-#: ../src/protocols/oscar/oscar.c:6122
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:805
+#: ../src/protocols/oscar/oscar.c:6107
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../src/gtkprefs.c:968
+#: ../src/gtkprefs.c:975
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../src/gtkprefs.c:970
+#: ../src/gtkprefs.c:977
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../src/gtkprefs.c:979
+#: ../src/gtkprefs.c:986
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1014
 msgid "Ports"
 msgstr "Portit"
 
-#: ../src/gtkprefs.c:1006
+#: ../src/gtkprefs.c:1017
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../src/gtkprefs.c:1009
+#: ../src/gtkprefs.c:1020
 msgid "_Start port:"
 msgstr "_Ensimm辰inen portti:"
 
-#: ../src/gtkprefs.c:1016
+#: ../src/gtkprefs.c:1027
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../src/gtkprefs.c:1024
+#: ../src/gtkprefs.c:1035
 msgid "Proxy Server"
 msgstr "V辰lipalvelin"
 
-#: ../src/gtkprefs.c:1028
+#: ../src/gtkprefs.c:1039
 msgid "No proxy"
 msgstr "Ei v辰lipalvelinta"
 
-#: ../src/gtkprefs.c:1084
+#: ../src/gtkprefs.c:1095
 msgid "_User:"
 msgstr "_K辰ytt辰j辰:"
 
-#: ../src/gtkprefs.c:1146
+#: ../src/gtkprefs.c:1157
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../src/gtkprefs.c:1147
+#: ../src/gtkprefs.c:1158
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../src/gtkprefs.c:1148
+#: ../src/gtkprefs.c:1159
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/gtkprefs.c:1149
+#: ../src/gtkprefs.c:1160
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/gtkprefs.c:1150
+#: ../src/gtkprefs.c:1161
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../src/gtkprefs.c:1151
+#: ../src/gtkprefs.c:1162
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1152
+#: ../src/gtkprefs.c:1163
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1153
+#: ../src/gtkprefs.c:1164
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../src/gtkprefs.c:1154
+#: ../src/gtkprefs.c:1165
 msgid "Opera"
 msgstr "Opera"
 
-#: ../src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1174
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../src/gtkprefs.c:1216
+#: ../src/gtkprefs.c:1227
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1231
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../src/gtkprefs.c:1228
+#: ../src/gtkprefs.c:1239
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../src/gtkprefs.c:1230
+#: ../src/gtkprefs.c:1241
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1242
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../src/gtkprefs.c:1233
+#: ../src/gtkprefs.c:1244
 msgid "New tab"
 msgstr "Uuteen v辰lilehteen"
 
-#: ../src/gtkprefs.c:1247
+#: ../src/gtkprefs.c:1258
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4581,55 +4760,83 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../src/gtkprefs.c:1283 ../src/gtkprefs.c:1858
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: ../src/gtkprefs.c:1286
+#: ../src/gtkprefs.c:1297
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../src/gtkprefs.c:1291
+#: ../src/gtkprefs.c:1302
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../src/gtkprefs.c:1293
+#: ../src/gtkprefs.c:1304
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhm辰_keskustelut lokiin"
 
-#: ../src/gtkprefs.c:1295
+#: ../src/gtkprefs.c:1306
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset j辰rjestelm辰lokiin"
 
-#: ../src/gtkprefs.c:1443
+#: ../src/gtkprefs.c:1454
 msgid "Sound Selection"
 msgstr "�辰nivalinta"
 
-#: ../src/gtkprefs.c:1520
+#: ../src/gtkprefs.c:1462
+msgid "Quietest"
+msgstr "Hiljaisin"
+
+#: ../src/gtkprefs.c:1464
+msgid "Quieter"
+msgstr "Hiljaisempi"
+
+#: ../src/gtkprefs.c:1466
+msgid "Quiet"
+msgstr "Hiljainen"
+
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "Normaali"
+
+#: ../src/gtkprefs.c:1470
+msgid "Loud"
+msgstr "�辰nek辰s"
+
+#: ../src/gtkprefs.c:1472
+msgid "Louder"
+msgstr "�辰nekk辰辰mpi"
+
+#: ../src/gtkprefs.c:1474
+msgid "Loudest"
+msgstr "�辰nekk辰in"
+
+#: ../src/gtkprefs.c:1537
 msgid "Sound Method"
 msgstr "�辰nimenetelm辰"
 
-#: ../src/gtkprefs.c:1521
+#: ../src/gtkprefs.c:1538
 msgid "_Method:"
 msgstr "_Menetelm辰:"
 
-#: ../src/gtkprefs.c:1523
+#: ../src/gtkprefs.c:1540
 msgid "Console beep"
 msgstr "Konsoli辰辰nimerkki"
 
-#: ../src/gtkprefs.c:1525
+#: ../src/gtkprefs.c:1542
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/gtkprefs.c:1530
+#: ../src/gtkprefs.c:1547
 msgid "Command"
 msgstr "Komento"
 
-#: ../src/gtkprefs.c:1531
+#: ../src/gtkprefs.c:1548
 msgid "No sounds"
 msgstr "Ei 辰辰ni辰"
 
-#: ../src/gtkprefs.c:1539
+#: ../src/gtkprefs.c:1556
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4638,113 +4845,113 @@
 "�辰nik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../src/gtkprefs.c:1565
+#: ../src/gtkprefs.c:1582
 msgid "Sound Options"
 msgstr "�辰nivalinnat"
 
-#: ../src/gtkprefs.c:1566
+#: ../src/gtkprefs.c:1583
 msgid "Sounds when conversation has _focus"
 msgstr "�辰net kun keskusteluikkuna on _aktiivinen"
 
-#: ../src/gtkprefs.c:1568
+#: ../src/gtkprefs.c:1585
 msgid "_Sounds while away"
 msgstr "�辰_net poissaollessasi"
 
-#: ../src/gtkprefs.c:1575
+#: ../src/gtkprefs.c:1592
 msgid "Volume:"
 msgstr "�辰nenvoimakkuus:"
 
-#: ../src/gtkprefs.c:1603
+#: ../src/gtkprefs.c:1620
 msgid "Sound Events"
 msgstr "�辰nitapahtumat"
 
-#: ../src/gtkprefs.c:1654
+#: ../src/gtkprefs.c:1671
 msgid "Play"
 msgstr "Soita"
 
-#: ../src/gtkprefs.c:1661
+#: ../src/gtkprefs.c:1678
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/gtkprefs.c:1680
+#: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../src/gtkprefs.c:1684
+#: ../src/gtkprefs.c:1701
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../src/gtkprefs.c:1688
+#: ../src/gtkprefs.c:1705
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../src/gtkprefs.c:1730
+#: ../src/gtkprefs.c:1747
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../src/gtkprefs.c:1733
+#: ../src/gtkprefs.c:1750
 msgid "From last sent message"
 msgstr "Viimeisest辰 l辰hetetyst辰 viestist辰"
 
-#: ../src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1752
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen n辰pp辰imist旦n tai hiiren k辰ytt旦旦n"
 
-#: ../src/gtkprefs.c:1744
+#: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../src/gtkprefs.c:1748
+#: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1754
+#: ../src/gtkprefs.c:1771
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../src/gtkprefs.c:1756
+#: ../src/gtkprefs.c:1773
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../src/gtkprefs.c:1760
+#: ../src/gtkprefs.c:1777
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../src/gtkprefs.c:1768
+#: ../src/gtkprefs.c:1785
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1789
+#: ../src/gtkprefs.c:1806
 msgid "Status at startup"
 msgstr "Tila k辰ynnistett辰ess辰"
 
-#: ../src/gtkprefs.c:1791
+#: ../src/gtkprefs.c:1808
 msgid "Use status from last _exit at startup"
 msgstr "K辰yt辰 viimeksi poistuttaessa ollutta tilaa"
 
-#: ../src/gtkprefs.c:1797
+#: ../src/gtkprefs.c:1814
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota k辰ytet辰辰n k辰ynnistett辰ess辰:"
 
-#: ../src/gtkprefs.c:1848
+#: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
 msgstr "Hymi旦teemat"
 
-#: ../src/gtkprefs.c:1849
+#: ../src/gtkprefs.c:1866
 msgid "Sounds"
 msgstr "�辰net"
 
-#: ../src/gtkprefs.c:1850 ../src/protocols/silc/silc.c:1848
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "Verkko"
 
-#: ../src/gtkprefs.c:1855
+#: ../src/gtkprefs.c:1872
 msgid "Browser"
 msgstr "Selain"
 
-#: ../src/gtkprefs.c:1859
+#: ../src/gtkprefs.c:1876
 msgid "Away / Idle"
 msgstr "Poissa/joutenolot"
 
@@ -4768,87 +4975,82 @@
 msgid "Block only the users below"
 msgstr "Est辰 vain allaolevat k辰ytt辰j辰t"
 
-#: ../src/gtkprivacy.c:371
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/gtkprivacy.c:384
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:396
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../src/gtkprivacy.c:561 ../src/gtkprivacy.c:577
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Salli k辰ytt辰j辰"
 
-#: ../src/gtkprivacy.c:562
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteytt辰 sinuun."
 
-#: ../src/gtkprivacy.c:563
+#: ../src/gtkprivacy.c:564
 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:566 ../src/gtkprivacy.c:579
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../src/gtkprivacy.c:571
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:573
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:600 ../src/gtkprivacy.c:613
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Est辰 k辰ytt辰j辰辰"
 
-#: ../src/gtkprivacy.c:601
-msgid "Type a user to block."
-msgstr "Kirjoita estett辰v辰 k辰ytt辰j辰."
-
 #: ../src/gtkprivacy.c:602
+msgid "Type a user to block."
+msgstr "Kirjoita estett辰v辰 k辰ytt辰j辰."
+
+#: ../src/gtkprivacy.c:603
 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:604 ../src/gtkprivacy.c:615
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Est辰"
 
-#: ../src/gtkprivacy.c:609
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "Estet辰辰nk旦 %s?"
 
-#: ../src/gtkprivacy.c:611
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti est辰辰 %s?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
 #: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:561 ../src/protocols/msn/msn.c:570
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1331
 msgid "Yes"
 msgstr "Kyll辰"
 
 #: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:561 ../src/protocols/msn/msn.c:570
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1331
 msgid "No"
 msgstr "Ei"
 
@@ -4861,19 +5063,19 @@
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/gtkrequest.c:1839
+#: ../src/gtkrequest.c:1851
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../src/gtkrequest.c:1840
+#: ../src/gtkrequest.c:1852
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko ylikirjoittaa sen?"
 
-#: ../src/gtkrequest.c:1884 ../src/gtkrequest.c:1925
+#: ../src/gtkrequest.c:1896 ../src/gtkrequest.c:1937
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../src/gtkrequest.c:1885 ../src/gtkrequest.c:1926
+#: ../src/gtkrequest.c:1897 ../src/gtkrequest.c:1938
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
@@ -4895,86 +5097,86 @@
 msgid "_Add Chat"
 msgstr "_Lis辰辰 ryhm辰keskustelu"
 
-#: ../src/gtksavedstatuses.c:436 ../src/protocols/jabber/buddy.c:264
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
 #: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Nimike"
 
-#: ../src/gtksavedstatuses.c:451
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
 msgstr "Tyyppi"
 
 #. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:462 ../src/gtksavedstatuses.c:905
-#: ../src/protocols/bonjour/bonjour.c:247
-#: ../src/protocols/bonjour/bonjour.c:254 ../src/protocols/gg/gg.c:1426
-#: ../src/protocols/gg/gg.c:1436 ../src/protocols/gg/gg.c:1442
-#: ../src/protocols/gg/gg.c:1450 ../src/protocols/gg/gg.c:1455
-#: ../src/protocols/irc/irc.c:171 ../src/protocols/jabber/jabber.c:1099
-#: ../src/protocols/jabber/jabber.c:1109 ../src/protocols/jabber/jabber.c:1119
-#: ../src/protocols/jabber/jabber.c:1129 ../src/protocols/jabber/jabber.c:1139
-#: ../src/protocols/jabber/jabber.c:1151 ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/novell/novell.c:2977 ../src/protocols/novell/novell.c:2983
-#: ../src/protocols/novell/novell.c:2989 ../src/protocols/oscar/oscar.c:7741
-#: ../src/protocols/oscar/oscar.c:7755 ../src/protocols/oscar/oscar.c:7760
-#: ../src/protocols/oscar/oscar.c:7983 ../src/protocols/oscar/oscar.c:7992
-#: ../src/protocols/sametime/sametime.c:3261
-#: ../src/protocols/sametime/sametime.c:3267
-#: ../src/protocols/sametime/sametime.c:3273
-#: ../src/protocols/sametime/sametime.c:3350
-#: ../src/protocols/silc/buddy.c:1548 ../src/protocols/simple/simple.c:252
-#: ../src/protocols/yahoo/yahoo.c:3221 ../src/protocols/yahoo/yahoo.c:3227
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
+#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
+#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1185
+#: ../src/protocols/jabber/jabber.c:1195 ../src/protocols/jabber/jabber.c:1205
+#: ../src/protocols/jabber/jabber.c:1215 ../src/protocols/jabber/jabber.c:1225
+#: ../src/protocols/jabber/jabber.c:1237 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7723
+#: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:7951 ../src/protocols/oscar/oscar.c:7963
+#: ../src/protocols/sametime/sametime.c:3274
+#: ../src/protocols/sametime/sametime.c:3280
+#: ../src/protocols/sametime/sametime.c:3286
+#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3278 ../src/protocols/yahoo/yahoo.c:3284
 #: ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/gtksavedstatuses.c:525
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:550 ../src/gtksavedstatuses.c:1152
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
 msgid "_Use"
 msgstr "_K辰yt辰"
 
-#: ../src/gtksavedstatuses.c:662
+#: ../src/gtksavedstatuses.c:695
 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:864
+#: ../src/gtksavedstatuses.c:879
 msgid "Different"
 msgstr "Eri辰vyys"
 
-#: ../src/gtksavedstatuses.c:894 ../src/gtksavedstatuses.c:1021
-#: ../src/protocols/gg/gg.c:1406 ../src/protocols/gg/gg.c:1411
+#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1068
-#: ../src/protocols/msn/msn.c:552 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2872 ../src/protocols/oscar/oscar.c:782
-#: ../src/protocols/oscar/oscar.c:788 ../src/protocols/oscar/oscar.c:791
-#: ../src/protocols/yahoo/yahoo.c:2821
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1156
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
+#: ../src/protocols/yahoo/yahoo.c:2880
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/gtksavedstatuses.c:1040
+#: ../src/gtksavedstatuses.c:1073
 msgid "_Title:"
-msgstr "_Arvonimi"
-
-#: ../src/gtksavedstatuses.c:1060 ../src/gtksavedstatuses.c:1367
+msgstr "_Otsikko"
+
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1095
+#: ../src/gtksavedstatuses.c:1124
 msgid "Use a _different status for some accounts"
 msgstr "K辰yt辰 eri tilaa joillekin k辰ytt辰j辰tileille"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1161
+#: ../src/gtksavedstatuses.c:1188
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _k辰yt辰"
 
-#: ../src/gtksavedstatuses.c:1346
+#: ../src/gtksavedstatuses.c:1394
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -5019,12 +5221,12 @@
 msgid "Someone says your name in chat"
 msgstr "Joku sanoo nimesi ryhm辰keskustelussa"
 
-#: ../src/gtksound.c:482
+#: ../src/gtksound.c:488
 #, 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:498
+#: ../src/gtksound.c:504
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5032,7 +5234,7 @@
 "�辰nen soito ei onnistu. \"Komento\"-metodi on valittu mutta komentoa ei ole "
 "asetettu."
 
-#: ../src/gtksound.c:510
+#: ../src/gtksound.c:516
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5040,72 +5242,60 @@
 msgstr ""
 "Ei voitu soittaa 辰辰nt辰, koska asetettua 辰辰nikomentoa ei voitu suorittaa: %s"
 
-#: ../src/gtkstatusbox.c:295
+#: ../src/gtkstatusbox.c:362
 msgid "Typing"
 msgstr "Kirjoittaa"
 
 #. connect to the server
-#: ../src/gtkstatusbox.c:298 ../src/protocols/irc/irc.c:256
-#: ../src/protocols/jabber/jabber.c:893 ../src/protocols/msn/session.c:349
-#: ../src/protocols/napster/napster.c:531
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1860
-#: ../src/protocols/sametime/sametime.c:3633
-#: ../src/protocols/simple/simple.c:1344 ../src/protocols/yahoo/yahoo.c:2517
+#: ../src/gtkstatusbox.c:364 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1503 ../src/protocols/yahoo/yahoo.c:2571
 #: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Yhdistet辰辰n"
 
-#: ../src/gtkstatusbox.c:500
-msgid "Custom..."
-msgstr "Oma..."
-
-#: ../src/gtkstatusbox.c:501
-msgid "Saved..."
-msgstr "Tallennettu..."
-
-#: ../src/gtkstock.c:139
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../src/gtkstock.c:141
+#: ../src/gtkstock.c:140
 msgid "Close _tabs"
 msgstr "Sulje _v辰lilehdet"
 
-#: ../src/gtkstock.c:143
+#: ../src/gtkstock.c:142
 msgid "_Get Info"
 msgstr "_Hae tiedot"
 
-#: ../src/gtkstock.c:144
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../src/gtkstock.c:145
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: ../src/gtkstock.c:146
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "_Avaa s辰hk旦posti"
 
-#: ../src/gtkstock.c:148
-msgid "_Warn"
-msgstr "_Varoita"
-
-#: ../src/gtkutils.c:1311 ../src/gtkutils.c:1336
+#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../src/gtkutils.c:1313 ../src/gtkutils.c:1338
+#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
 msgid "Failed to load image"
 msgstr "Kuvan avaus ep辰onnistui"
 
-#: ../src/gtkutils.c:1413
+#: ../src/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida l辰hett辰辰 kansiota %s."
 
-#: ../src/gtkutils.c:1415
+#: ../src/gtkutils.c:1410
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -5113,11 +5303,11 @@
 "Gaim ei voi siirt辰辰 kansiota. Sinun t辰ytyy l辰hett辰辰 kansion sis辰lt辰m辰t "
 "tiedostot erikseen."
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1452 ../src/gtkutils.c:1457
+#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../src/gtkutils.c:1444
+#: ../src/gtkutils.c:1439
 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."
@@ -5125,23 +5315,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:1448 ../src/gtkutils.c:1463
+#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../src/gtkutils.c:1449 ../src/gtkutils.c:1464
+#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
 msgid "Send image file"
 msgstr "L辰het辰 kuvatiedosto"
 
-#: ../src/gtkutils.c:1450 ../src/gtkutils.c:1464
+#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
 msgid "Insert in message"
 msgstr "Liit辰 viestiin"
 
+#: ../src/gtkutils.c:1448
+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:1453
-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:1458
 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."
@@ -5149,7 +5339,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:1460
+#: ../src/gtkutils.c:1455
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -5162,11 +5352,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:1514
+#: ../src/gtkutils.c:1509
 msgid "Cannot send launcher"
 msgstr "Ei voida l辰hett辰辰 k辰ynnistint辰"
 
-#: ../src/gtkutils.c:1514
+#: ../src/gtkutils.c:1509
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -5181,31 +5371,31 @@
 msgid "Sent Doodle request."
 msgstr "L辰het辰 piirtelypyynt旦 (doodle)."
 
-#: ../src/log.c:129
+#: ../src/log.c:165
 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:511
+#: ../src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:522
+#: ../src/log.c:558
 msgid "Plain text"
 msgstr "Teksti"
 
-#: ../src/log.c:533
+#: ../src/log.c:569
 msgid "Old Gaim"
 msgstr "Vanha Gaim"
 
-#: ../src/log.c:628
+#: ../src/log.c:668
 msgid "Logging of this conversation failed."
 msgstr "T辰m辰n keskustelun kirjaaminen lokiin ep辰onnistui."
 
-#: ../src/log.c:893
+#: ../src/log.c:969
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:957
+#: ../src/log.c:1037
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5214,7 +5404,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:959
+#: ../src/log.c:1039
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5223,40 +5413,40 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1010 ../src/log.c:1127
+#: ../src/log.c:1096 ../src/log.c:1218
 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:1020 ../src/log.c:1139
+#: ../src/log.c:1108 ../src/log.c:1230
 #, 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:1072
+#: ../src/log.c:1161
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../src/plugin.c:278 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5030
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5063
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/plugin.c:421
+#: ../src/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Liit辰nn辰istaikojen ristiriita %d (tarvitaan %d)"
 
-#: ../src/plugin.c:438
+#: ../src/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI-version ristiriita %d.%d.x (tarvitaan %d.%d.x)"
 
-#: ../src/plugin.c:454
+#: ../src/plugin.c:457
 msgid "Plugin does not implement all required functions"
 msgstr "Liit辰nn辰inen ei toteuta kaikkia tarvittavia toimintoja"
 
-#: ../src/plugin.c:510
+#: ../src/plugin.c:514
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5264,40 +5454,41 @@
 msgstr ""
 "Vaadittu liit辰nn辰inen %s puuttuu. Ole hyv辰 ja asenna se ja yrit辰 uudelleen."
 
-#: ../src/plugin.c:515
+#: ../src/plugin.c:519
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Liit辰nn辰ist辰 ladattaessa tapahtui virheit辰."
 
-#: ../src/plugin.c:538
+#: ../src/plugin.c:542
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu liit辰nn辰inen %s ei latautunut."
 
-#: ../src/plugin.c:542
+#: ../src/plugin.c:546
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ei kyennyt lataamaan liit辰nn辰ist辰si."
 
-#: ../src/plugin.c:644
+#: ../src/plugin.c:648
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Riippuvaista liit辰nn辰ista %s ei voitu poistaa k辰yt旦st辰."
 
-#: ../src/plugin.c:649
+#: ../src/plugin.c:653
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Poistettaessa liit辰nn辰ist辰 k辰yt旦st辰 tapahtui virheit辰."
 
 #. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:107
+#: ../src/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Ei voitu kuunnella sis辰辰ntulevia pikaviestint辰yhteyksi辰\n"
 
-#: ../src/protocols/bonjour/bonjour.c:142
+#: ../src/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Ei voitu luoda yhteytt辰 paikalliseen mDNS-palvelimeen. Onko se k辰ynniss辰?"
 
-#: ../src/protocols/bonjour/bonjour.c:330
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
 #, c-format
 msgid ""
 "\n"
@@ -5306,7 +5497,7 @@
 "\n"
 "<b>Tila</b>: %s"
 
-#: ../src/protocols/bonjour/bonjour.c:332
+#: ../src/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5325,350 +5516,373 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:429
-#: ../src/protocols/bonjour/bonjour.c:431
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour-protokollaliit辰nn辰inen"
-
-#: ../src/protocols/bonjour/bonjour.c:463
-#: ../src/protocols/bonjour/bonjour.c:520
+msgstr "Bonjour-yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538
 msgid "Gaim User"
 msgstr "Gaim-k辰ytt辰j辰"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:558 ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:576 ../src/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Is辰nt辰"
 
 #. Creating the options for the protocol
 #. port to connect to
-#: ../src/protocols/bonjour/bonjour.c:562 ../src/protocols/irc/irc.c:829
-#: ../src/protocols/msn/msn.c:1954 ../src/protocols/napster/napster.c:720
-#: ../src/protocols/sametime/sametime.c:5650 ../src/protocols/silc/silc.c:1856
+#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/irc/irc.c:901
+#: ../src/protocols/msn/msn.c:1957 ../src/protocols/napster/napster.c:725
+#: ../src/protocols/sametime/sametime.c:5644 ../src/protocols/silc/silc.c:1856
 msgid "Port"
 msgstr "Portti"
 
-#: ../src/protocols/bonjour/bonjour.c:565 ../src/protocols/gg/gg.c:571
-#: ../src/protocols/gg/gg.c:986
+#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:568 ../src/protocols/gg/gg.c:566
+#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:557
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:571 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/bonjour/bonjour.c:589 ../src/protocols/jabber/buddy.c:261
 #: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
 #: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
 #: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1019
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
 msgstr "S辰hk旦posti"
 
-#: ../src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr "Bonjour"
-
-#: ../src/protocols/gg/gg.c:89 ../src/protocols/gg/gg.c:111
-#: ../src/protocols/gg/gg.c:146
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s on sulkenut keskustelun."
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "Pistoketta ei voida avata"
+
+#: ../src/protocols/bonjour/jabber.c:447
+msgid "Error setting socket options"
+msgstr "Virhe asetettaessa pistokevalintoja"
+
+#: ../src/protocols/bonjour/jabber.c:458
+msgid "Cannot bind socket to port"
+msgstr "Ei voida liitt辰辰 pistoketta porttiin"
+
+#: ../src/protocols/bonjour/jabber.c:465
+msgid "Cannot listen on socket"
+msgstr "Ei voida kuunnella pistoketta"
+
+#: ../src/protocols/bonjour/jabber.c:559
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Viesti辰 ei voida l辰hett辰辰, keskustelua ei voitu aloittaa."
+
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
 msgid "Token Error"
 msgstr "Vastamerkkivirhe"
 
-#: ../src/protocols/gg/gg.c:90 ../src/protocols/gg/gg.c:112
-#: ../src/protocols/gg/gg.c:147
+#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
 msgid "Unable to fetch the token.\n"
 msgstr "Ei voitu hakea vastamerkki辰.\n"
 
-#: ../src/protocols/gg/gg.c:235 ../src/protocols/gg/gg.c:254
+#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
 msgid "Save Buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:236
+#: ../src/protocols/gg/gg.c:227
 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:242 ../src/protocols/gg/gg.c:244
+#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
 msgid "Couldn't open file"
 msgstr "Tiedoston avaus ei onnistunut"
 
-#: ../src/protocols/gg/gg.c:255
+#: ../src/protocols/gg/gg.c:246
 msgid "Buddylist saved successfully!"
 msgstr "Tuttavalista tallennettiin onnistuneesti!"
 
-#: ../src/protocols/gg/gg.c:273 ../src/protocols/gg/gg.c:274
+#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
 msgid "Couldn't load buddylist"
 msgstr "Tuttavalistan lataus ei onnistunut"
 
-#: ../src/protocols/gg/gg.c:290
+#: ../src/protocols/gg/gg.c:281
 msgid "Load Buddylist..."
 msgstr "Avaa tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:291
+#: ../src/protocols/gg/gg.c:282
 msgid "Buddylist loaded successfully!"
 msgstr "Tuttavalista avattiin onnistuneesti!"
 
-#: ../src/protocols/gg/gg.c:302
+#: ../src/protocols/gg/gg.c:293
 msgid "Save buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../src/protocols/gg/gg.c:346
+#: ../src/protocols/gg/gg.c:337
 msgid "Fill in the registration fields."
 msgstr "T辰yt辰 rekister旦itymiskent辰t."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:342
 msgid "Passwords do not match."
 msgstr "Salasanat eiv辰t t辰sm辰辰."
 
-#: ../src/protocols/gg/gg.c:360
+#: ../src/protocols/gg/gg.c:351
 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:373
+#: ../src/protocols/gg/gg.c:364
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uusi Gadu-Gadu-k辰ytt辰j辰tili rekister旦ity"
 
-#: ../src/protocols/gg/gg.c:374
+#: ../src/protocols/gg/gg.c:365
 msgid "Registration completed successfully!"
 msgstr "Rekister旦inti onnistui!"
 
-#: ../src/protocols/gg/gg.c:434
+#: ../src/protocols/gg/gg.c:425
 msgid "e-Mail"
 msgstr "S辰hk旦posti"
 
-#: ../src/protocols/gg/gg.c:439 ../src/protocols/gg/gg.c:713
-#: ../src/protocols/jabber/jabber.c:680 ../src/protocols/jabber/jabber.c:1224
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1310
 msgid "Password"
 msgstr "Salasana"
 
-#: ../src/protocols/gg/gg.c:444 ../src/protocols/gg/gg.c:718
+#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/gg/gg.c:449 ../src/protocols/gg/gg.c:723
+#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
 msgid "Enter current token"
 msgstr "Sy旦t辰 nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
 msgid "Current token"
 msgstr "Nykyinen vastamerkki"
 
-#: ../src/protocols/gg/gg.c:459 ../src/protocols/gg/gg.c:460
+#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekister旦i uusi Gadu-Gadu-k辰ytt辰j辰tili"
 
-#: ../src/protocols/gg/gg.c:461
+#: ../src/protocols/gg/gg.c:452
 msgid "Please, fill in the following fields"
 msgstr "T辰yt辰 seuraavat kent辰t"
 
-#: ../src/protocols/gg/gg.c:556 ../src/protocols/gg/gg.c:1610
+#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
 msgid "Unable to initiate a new search"
 msgstr "Ei voida aloittaa uutta hakua"
 
-#: ../src/protocols/gg/gg.c:557 ../src/protocols/gg/gg.c:1611
+#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "Sinulla on jo meneill辰辰n oleva haku. Odota sen p辰辰ttymist辰."
 
-#: ../src/protocols/gg/gg.c:576 ../src/protocols/gg/gg.c:989
-#: ../src/protocols/gg/gg.c:1993 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1395
-#: ../src/protocols/jabber/jabber.c:696 ../src/protocols/msn/msn.c:1376
-#: ../src/protocols/silc/buddy.c:1532 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
 #: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1024
+#: ../src/protocols/yahoo/yahoo_profile.c:1035
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../src/protocols/gg/gg.c:581 ../src/protocols/gg/gg.c:992
-#: ../src/protocols/jabber/jabber.c:716 ../src/protocols/oscar/oscar.c:6169
-#: ../src/protocols/oscar/oscar.c:6177
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6153
+#: ../src/protocols/oscar/oscar.c:6161
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../src/protocols/gg/gg.c:586
+#: ../src/protocols/gg/gg.c:577
 msgid "Year of birth"
 msgstr "Syntym辰vuosi"
 
-#: ../src/protocols/gg/gg.c:589 ../src/protocols/msn/msn.c:1535
-#: ../src/protocols/oscar/oscar.c:6142
-#: ../src/protocols/yahoo/yahoo_profile.c:1049
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1538
+#: ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../src/protocols/gg/gg.c:590
+#: ../src/protocols/gg/gg.c:581
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/oscar/oscar.c:6142
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6127
 msgid "Male"
 msgstr "Mies"
 
-#: ../src/protocols/gg/gg.c:592 ../src/protocols/oscar/oscar.c:6142
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6127
 msgid "Female"
 msgstr "Nainen"
 
-#: ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:587
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../src/protocols/gg/gg.c:600 ../src/protocols/gg/gg.c:601
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../src/protocols/gg/gg.c:602
+#: ../src/protocols/gg/gg.c:593
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../src/protocols/gg/gg.c:639
+#: ../src/protocols/gg/gg.c:630
 msgid "Fill in the fields."
 msgstr "T辰yt辰 kent辰t."
 
-#: ../src/protocols/gg/gg.c:651
+#: ../src/protocols/gg/gg.c:642
 msgid "Your current password is different from the one that you specified."
 msgstr "Nykyinen salasanasi ei ole se jonka kirjoitit."
 
+#: ../src/protocols/gg/gg.c:656
+msgid "Unable to change password. Error occured.\n"
+msgstr "Ei kyetty muuttamaan salasanaa virheen takia.\n"
+
 #: ../src/protocols/gg/gg.c:665
-msgid "Unable to change password. Error occured.\n"
-msgstr "Ei kyetty muuttamaan salasanaa virheen takia.\n"
-
-#: ../src/protocols/gg/gg.c:674
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Vaihda Gadu-Gadu-k辰ytt辰j辰tilin salasana"
 
-#: ../src/protocols/gg/gg.c:675
+#: ../src/protocols/gg/gg.c:666
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../src/protocols/gg/gg.c:708
+#: ../src/protocols/gg/gg.c:699
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../src/protocols/gg/gg.c:733
+#: ../src/protocols/gg/gg.c:724
 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:737 ../src/protocols/gg/gg.c:738
+#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../src/protocols/gg/gg.c:822
+#. TODO: s/screenname/alias/
+#: ../src/protocols/gg/gg.c:804
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhm辰keskustelu tuttavalle: %s"
 
-#: ../src/protocols/gg/gg.c:825 ../src/protocols/gg/gg.c:826
+#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
 msgid "Add to chat..."
 msgstr "Lis辰辰 ryhm辰keskusteluun..."
 
-#: ../src/protocols/gg/gg.c:965
+#: ../src/protocols/gg/gg.c:950
 msgid "No matching users found"
 msgstr "K辰ytt辰jist辰 ei l旦ytynyt osumia"
 
-#: ../src/protocols/gg/gg.c:966
+#: ../src/protocols/gg/gg.c:951
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia k辰ytt辰ji辰 ei ole."
 
-#: ../src/protocols/gg/gg.c:977 ../src/protocols/gg/gg.c:1044
-#: ../src/protocols/oscar/oscar.c:6280
+#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/oscar/oscar.c:6264
 msgid "Unable to display the search results."
 msgstr "Ei voida n辰ytt辰辰 hakutuloksia."
 
-#: ../src/protocols/gg/gg.c:983 ../src/protocols/oscar/oscar.c:6114
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6099
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:995
+#: ../src/protocols/gg/gg.c:980
 msgid "Birth year"
 msgstr "Syntym辰vuosi"
 
-#: ../src/protocols/gg/gg.c:1035
+#: ../src/protocols/gg/gg.c:1020
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../src/protocols/gg/gg.c:1036
+#: ../src/protocols/gg/gg.c:1021
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../src/protocols/gg/gg.c:1132 ../src/protocols/gg/gg.c:1279
+#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../src/protocols/gg/gg.c:1215
+#: ../src/protocols/gg/gg.c:1201
 msgid "Buddy list downloaded"
 msgstr "Tuttavalista ladattu"
 
-#: ../src/protocols/gg/gg.c:1216
+#: ../src/protocols/gg/gg.c:1202
 msgid "Your buddy list was downloaded from the server."
 msgstr "Tuttavalistasi ladattiin palvelimelta."
 
-#: ../src/protocols/gg/gg.c:1223
+#: ../src/protocols/gg/gg.c:1209
 msgid "Buddy list uploaded"
 msgstr "Tuttavalista l辰hetettiin"
 
-#: ../src/protocols/gg/gg.c:1224
+#: ../src/protocols/gg/gg.c:1210
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavalistasi tallennettiin palvelimelle."
 
-#: ../src/protocols/gg/gg.c:1313 ../src/protocols/gg/gg.c:1536
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
 msgid "Connection failed."
 msgstr "Yhteys ep辰onnistui."
 
-#: ../src/protocols/gg/gg.c:1449 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../src/protocols/gg/gg.c:1472
+#: ../src/protocols/gg/gg.c:1468
 msgid "Add to chat"
 msgstr "Lis辰辰 ryhm辰keskusteluun"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1477
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../src/protocols/gg/gg.c:1485
+#: ../src/protocols/gg/gg.c:1481
 msgid "Block"
 msgstr "Est辰"
 
-#: ../src/protocols/gg/gg.c:1502
+#: ../src/protocols/gg/gg.c:1498
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../src/protocols/gg/gg.c:1721
+#: ../src/protocols/gg/gg.c:1724
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../src/protocols/gg/gg.c:1722
+#: ../src/protocols/gg/gg.c:1725
 msgid "This chat name is already in use"
 msgstr "T辰m辰 keskustelunimi on jo k辰yt旦ss辰"
 
-#: ../src/protocols/gg/gg.c:1804
+#: ../src/protocols/gg/gg.c:1808
 msgid "Not connected to the server."
 msgstr "Ei yhdistettyn辰 palvelimeen."
 
-#: ../src/protocols/gg/gg.c:1827
+#: ../src/protocols/gg/gg.c:1831
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../src/protocols/gg/gg.c:1833
+#: ../src/protocols/gg/gg.c:1837
 msgid "Change password..."
 msgstr "Vaihda salasana..."
 
-#: ../src/protocols/gg/gg.c:1839
+#: ../src/protocols/gg/gg.c:1843
 msgid "Upload buddylist to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1847
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1851
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:1855
 msgid "Save buddylist to file..."
 msgstr "Vie tuttavalista tiedostoon..."
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:1859
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavalista tiedostosta..."
 
@@ -5683,16 +5897,16 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1945
+#: ../src/protocols/gg/gg.c:1949
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu-protokollaliit辰nn辰inen"
+msgstr "Gadu-Gadu-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1946
+#: ../src/protocols/gg/gg.c:1950
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../src/protocols/gg/gg.c:1994
+#: ../src/protocols/gg/gg.c:1998
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-k辰ytt辰j辰"
 
@@ -5712,14 +5926,14 @@
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: ../src/protocols/irc/dcc_send.c:278 ../src/protocols/irc/dcc_send.c:317
-#: ../src/protocols/yahoo/yahoo_filexfer.c:173
-#: ../src/protocols/yahoo/yahoo_filexfer.c:182
-#: ../src/protocols/yahoo/yahoo_filexfer.c:191
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto ep辰onnistui"
 
-#: ../src/protocols/irc/dcc_send.c:279 ../src/protocols/irc/dcc_send.c:318
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Gaim ei voinut avata kuuntelevaa porttia."
 
@@ -5740,62 +5954,62 @@
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: ../src/protocols/irc/irc.c:102 ../src/protocols/irc/irc.c:535
-#: ../src/protocols/irc/irc.c:557
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
-#: ../src/protocols/irc/irc.c:186
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "N辰yt辰 MOTD"
 
-#: ../src/protocols/irc/irc.c:198 ../src/protocols/silc/chat.c:33
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: ../src/protocols/irc/irc.c:204 ../src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/protocols/irc/irc.c:236
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimiss辰 ei tule olla v辰lily旦ntej辰"
 
-#: ../src/protocols/irc/irc.c:264 ../src/protocols/jabber/jabber.c:481
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
+#: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: ../src/protocols/irc/irc.c:275 ../src/protocols/simple/simple.c:403
-#: ../src/protocols/simple/simple.c:1272
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:456
+#: ../src/protocols/simple/simple.c:1427
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen ep辰onnistui"
 
-#: ../src/protocols/irc/irc.c:346 ../src/protocols/jabber/jabber.c:354
-#: ../src/protocols/oscar/oscar.c:1788 ../src/protocols/oscar/oscar.c:1856
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
 msgid "Couldn't connect to host"
 msgstr "Yhteytt辰 is辰nt辰辰n ei voitu muodostaa"
 
-#: ../src/protocols/irc/irc.c:371 ../src/protocols/jabber/jabber.c:381
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/irc/irc.c:374 ../src/protocols/jabber/jabber.c:384
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
 msgid "SSL Handshake Failed"
 msgstr "SSL-k辰ttely ep辰onnistui"
 
-#: ../src/protocols/irc/irc.c:532 ../src/protocols/irc/irc.c:554
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/irc/irc.c:693 ../src/protocols/silc/chat.c:1420
-#: ../src/protocols/yahoo/yahoochat.c:1390
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "K辰ytt辰j辰t"
 
-#: ../src/protocols/irc/irc.c:696 ../src/protocols/sametime/sametime.c:3347
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
 #: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1399
+#: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Aihe"
 
@@ -5807,37 +6021,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:806
+#: ../src/protocols/irc/irc.c:878
 msgid "IRC Protocol Plugin"
-msgstr "IRC-protokollaliit辰nn辰inen"
+msgstr "IRC-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:807
+#: ../src/protocols/irc/irc.c:879
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "IRC-protokollaliit辰nn辰inen joka toimii"
+msgstr "IRC-yhteysk辰yt辰nt旦liit辰nn辰inen joka on v辰hemm辰n huono..."
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:826 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1791
-#: ../src/protocols/napster/napster.c:715
-#: ../src/protocols/sametime/sametime.c:5645 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1497
+#: ../src/protocols/irc/irc.c:898 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1909
+#: ../src/protocols/napster/napster.c:720
+#: ../src/protocols/sametime/sametime.c:5639 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1663
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../src/protocols/irc/irc.c:832
+#: ../src/protocols/irc/irc.c:904
 msgid "Encodings"
 msgstr "Merkist旦t"
 
-#: ../src/protocols/irc/irc.c:835 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:676 ../src/protocols/silc/buddy.c:1535
+#: ../src/protocols/irc/irc.c:907 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
 #: ../src/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "K辰ytt辰j辰nimi"
 
-#: ../src/protocols/irc/irc.c:838
+#: ../src/protocols/irc/irc.c:910
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -5845,7 +6059,7 @@
 #. 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:846
+#: ../src/protocols/irc/irc.c:918
 msgid "Use SSL"
 msgstr "K辰yt辰 SSL:辰辰"
 
@@ -5873,7 +6087,7 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6115
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6100
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Kutsumanimi"
@@ -5888,14 +6102,14 @@
 
 #: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
 #: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
-#: ../src/protocols/yahoo/yahoo_profile.c:680
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
 #: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
 #: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1029
+#: ../src/protocols/yahoo/yahoo_profile.c:1040
 msgid "Realname"
 msgstr "Oikea nimi"
 
@@ -5912,93 +6126,105 @@
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: ../src/protocols/irc/msgs.c:247
+#: ../src/protocols/irc/msgs.c:248
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Kuvaava adjektiivi</b> Kunniakas<br>"
 
-#: ../src/protocols/irc/msgs.c:315
+#: ../src/protocols/irc/msgs.c:316
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../src/protocols/irc/msgs.c:320
+#: ../src/protocols/irc/msgs.c:321
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../src/protocols/irc/msgs.c:337
+#: ../src/protocols/irc/msgs.c:338
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:339
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:339
 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:361
+#: ../src/protocols/irc/msgs.c:362
 #, c-format
 msgid "Users on %s: %s"
 msgstr "K辰ytt辰j辰t %s: %s"
 
-#: ../src/protocols/irc/msgs.c:489
+#: ../src/protocols/irc/msgs.c:490
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:491
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../src/protocols/irc/msgs.c:501
+#: ../src/protocols/irc/msgs.c:502
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:512
+#: ../src/protocols/irc/msgs.c:513
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../src/protocols/irc/msgs.c:515
+#: ../src/protocols/irc/msgs.c:516
 msgid "User is not logged in"
 msgstr "K辰ytt辰j辰 ei ole kirjautuneena sis辰辰n"
 
-#: ../src/protocols/irc/msgs.c:520
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such nick or channel"
 msgstr "Kutsumanime辰/kanavaa ei ole olemassa"
 
-#: ../src/protocols/irc/msgs.c:540
+#: ../src/protocols/irc/msgs.c:541
 msgid "Could not send"
 msgstr "Ei voitu l辰hett辰辰"
 
-#: ../src/protocols/irc/msgs.c:596
+#: ../src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:598
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../src/protocols/irc/msgs.c:698
+#: ../src/protocols/irc/msgs.c:699
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:703 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../src/protocols/irc/msgs.c:726
+#: ../src/protocols/irc/msgs.c:727
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../src/protocols/irc/msgs.c:810
+#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+msgid "Invalid nickname"
+msgstr "Virheellinen lempinimi"
+
+#: ../src/protocols/irc/msgs.c:814
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Palvelin hylk辰si valitsemasi kutsumanimen. Siin辰 on todenn辰k旦isesti "
+"kiellettyj辰 merkkej辰."
+
+#: ../src/protocols/irc/msgs.c:818
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6006,42 +6232,42 @@
 "Palvelin hylk辰si valitsemasi tilinimen. Siin辰 on todenn辰k旦isesti kiellettyj辰 "
 "merkkej辰."
 
-#: ../src/protocols/irc/msgs.c:849
+#: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanime辰"
 
-#: ../src/protocols/irc/msgs.c:849
+#: ../src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanime辰"
 
-#: ../src/protocols/irc/msgs.c:870
+#: ../src/protocols/irc/msgs.c:879
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../src/protocols/irc/msgs.c:912
+#: ../src/protocols/irc/msgs.c:921
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: ep辰kelpo PONG palvelimelta"
 
-#: ../src/protocols/irc/msgs.c:914
+#: ../src/protocols/irc/msgs.c:923
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../src/protocols/irc/msgs.c:989
+#: ../src/protocols/irc/msgs.c:998
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liitty辰 %s:"
 
-#: ../src/protocols/irc/msgs.c:990 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liitty辰 kanavalle"
 
-#: ../src/protocols/irc/msgs.c:1024
+#: ../src/protocols/irc/msgs.c:1033
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilap辰isesti ole k辰yt旦ss辰."
 
-#: ../src/protocols/irc/msgs.c:1036
+#: ../src/protocols/irc/msgs.c:1045
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:lt辰"
@@ -6148,7 +6374,7 @@
 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:129 ../src/protocols/jabber/jabber.c:1634
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1746
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -6261,8 +6487,8 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../src/protocols/irc/parse.c:543 ../src/protocols/irc/parse.c:547
-#: ../src/protocols/oscar/oscar.c:1697 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1710 ../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."
@@ -6285,18 +6511,18 @@
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/auth.c:232
+#: ../src/protocols/jabber/auth.c:234
 msgid "Server couldn't authenticate you without a password"
 msgstr "Palvelin ei voinut todentaa sinua ilman salasanaa"
 
-#: ../src/protocols/jabber/auth.c:235 ../src/protocols/jabber/auth.c:236
-#: ../src/protocols/jabber/auth.c:396 ../src/protocols/jabber/auth.c:397
-#: ../src/protocols/jabber/auth.c:478 ../src/protocols/jabber/auth.c:479
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:398
-#: ../src/protocols/jabber/auth.c:480
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -6304,24 +6530,24 @@
 "T辰m辰 palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko t辰m辰 ja jatketaan?"
 
-#: ../src/protocols/jabber/auth.c:243 ../src/protocols/jabber/auth.c:406
-#: ../src/protocols/jabber/auth.c:488
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei k辰yt辰 mit辰辰n tuettuista tunnistautumismenetelmist辰"
 
 #. This should never happen!
-#: ../src/protocols/jabber/auth.c:319 ../src/protocols/jabber/auth.c:441
-#: ../src/protocols/jabber/auth.c:609 ../src/protocols/jabber/auth.c:742
-#: ../src/protocols/jabber/auth.c:754 ../src/protocols/jabber/auth.c:773
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
 #: ../src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../src/protocols/jabber/auth.c:630
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../src/protocols/jabber/auth.c:717
+#: ../src/protocols/jabber/auth.c:719
 msgid "SASL error"
 msgstr "SASL-virhe"
 
@@ -6339,7 +6565,7 @@
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:736
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
 msgid "URL"
 msgstr "URL"
 
@@ -6360,7 +6586,7 @@
 msgstr "Seutu"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:726
+#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "Postinumero"
 
@@ -6387,7 +6613,7 @@
 msgstr "Asema"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6150
+#: ../src/protocols/oscar/oscar.c:6133
 msgid "Birthday"
 msgstr "Syntym辰p辰iv辰"
 
@@ -6403,7 +6629,7 @@
 "Kaikki allaolevat kent辰t ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pid辰t sopivana."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1794
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1912
 msgid "Resource"
 msgstr "L辰hde"
 
@@ -6411,8 +6637,8 @@
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:711
-#: ../src/protocols/oscar/oscar.c:6168 ../src/protocols/oscar/oscar.c:6176
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
@@ -6454,12 +6680,12 @@
 msgstr "Poista listalta"
 
 #: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1080
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1168
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1107
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
@@ -6467,9 +6693,9 @@
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1137
-#: ../src/protocols/oscar/oscar.c:720 ../src/protocols/oscar/oscar.c:8011
-#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "�l辰 h辰iritse"
 
@@ -6481,13 +6707,13 @@
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "T辰yt辰 yksi tai useampia kentist辰 etsi辰ksesi Jabber-k辰ytt辰ji辰."
 
-#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:701
-#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:706
-#: ../src/protocols/oscar/oscar.c:6126
+#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/oscar/oscar.c:6111
 msgid "Last Name"
 msgstr "Sukunimi"
 
@@ -6515,8 +6741,8 @@
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7492
-#: ../src/protocols/yahoo/yahoochat.c:991
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7475
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -6604,417 +6830,438 @@
 msgid "Error initializing session"
 msgstr "Virhe istunnon alustuksessa"
 
-#: ../src/protocols/jabber/jabber.c:236 ../src/protocols/jabber/jabber.c:251
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../src/protocols/jabber/jabber.c:289 ../src/protocols/jabber/jabber.c:321
+#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
 msgid "Read Error"
 msgstr "Ep辰kelpo k辰ytt辰j辰"
 
-#: ../src/protocols/jabber/jabber.c:407 ../src/protocols/jabber/jabber.c:828
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti ep辰onnistui"
 
-#: ../src/protocols/jabber/jabber.c:451 ../src/protocols/jabber/jabber.c:788
+#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
 msgid "Invalid Jabber ID"
 msgstr "Ep辰kelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:521
+#: ../src/protocols/jabber/jabber.c:590
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekister旦inti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:523 ../src/protocols/jabber/jabber.c:524
+#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
 msgid "Registration Successful"
 msgstr "Rekister旦inti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:530 ../src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../src/protocols/jabber/jabber.c:532 ../src/protocols/jabber/jabber.c:533
+#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
 msgid "Registration Failed"
 msgstr "Rekister旦inti ep辰onnistui"
 
-#: ../src/protocols/jabber/jabber.c:644 ../src/protocols/jabber/jabber.c:645
+#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
 msgid "Already Registered"
 msgstr "Valmiiksi rekister旦ity"
 
-#: ../src/protocols/jabber/jabber.c:691
+#: ../src/protocols/jabber/jabber.c:760
 msgid "E-Mail"
 msgstr "S辰hk旦posti"
 
-#: ../src/protocols/jabber/jabber.c:721 ../src/protocols/oscar/oscar.c:6170
-#: ../src/protocols/oscar/oscar.c:6178
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6154
+#: ../src/protocols/oscar/oscar.c:6162
 msgid "State"
 msgstr "L辰辰ni"
 
-#: ../src/protocols/jabber/jabber.c:731 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/jabber.c:741
+#: ../src/protocols/jabber/jabber.c:810
 msgid "Date"
 msgstr "P辰iv辰ys"
 
-#: ../src/protocols/jabber/jabber.c:749
+#: ../src/protocols/jabber/jabber.c:818
 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:752 ../src/protocols/jabber/jabber.c:753
+#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
 msgstr "Rekister旦i uusi Jabber-tili"
 
-#: ../src/protocols/jabber/jabber.c:897
+#: ../src/protocols/jabber/jabber.c:987
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:903 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:993 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../src/protocols/jabber/jabber.c:912
+#: ../src/protocols/jabber/jabber.c:1002
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:982 ../src/protocols/jabber/jabber.c:1351
-#: ../src/protocols/jabber/jabber.c:1392 ../src/protocols/jabber/jabber.c:1425
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:7790
+#: ../src/protocols/jabber/jabber.c:1072 ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1478 ../src/protocols/jabber/jabber.c:1512
+#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../src/protocols/jabber/jabber.c:1026
+#: ../src/protocols/jabber/jabber.c:1114
 msgid "Both"
 msgstr "molemmille"
 
-#: ../src/protocols/jabber/jabber.c:1028
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1033
+#: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../src/protocols/jabber/jabber.c:1035
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
 msgstr "Ei mit辰辰n (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1039
+#: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../src/protocols/jabber/jabber.c:1098 ../src/protocols/jabber/jabber.c:1108
-#: ../src/protocols/jabber/jabber.c:1118 ../src/protocols/jabber/jabber.c:1128
-#: ../src/protocols/jabber/jabber.c:1138
+#: ../src/protocols/jabber/jabber.c:1184 ../src/protocols/jabber/jabber.c:1194
+#: ../src/protocols/jabber/jabber.c:1204 ../src/protocols/jabber/jabber.c:1214
+#: ../src/protocols/jabber/jabber.c:1224
 msgid "Priority"
 msgstr "T辰rkeys"
 
-#: ../src/protocols/jabber/jabber.c:1167
+#: ../src/protocols/jabber/jabber.c:1253
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../src/protocols/jabber/jabber.c:1168
+#: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../src/protocols/jabber/jabber.c:1172 ../src/protocols/jabber/jabber.c:1173
+#: ../src/protocols/jabber/jabber.c:1258 ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../src/protocols/jabber/jabber.c:1229
+#: ../src/protocols/jabber/jabber.c:1315
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/jabber/jabber.c:1235
+#: ../src/protocols/jabber/jabber.c:1320 ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasana"
 
-#: ../src/protocols/jabber/jabber.c:1235
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../src/protocols/jabber/jabber.c:1245 ../src/protocols/oscar/oscar.c:8436
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:8404
 #: ../src/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Aseta k辰ytt辰j辰tiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1250 ../src/protocols/oscar/oscar.c:8447
+#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:8415
 #: ../src/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1255
+#: ../src/protocols/jabber/jabber.c:1341
 msgid "Search for Users..."
 msgstr "Etsi k辰ytt辰ji辰..."
 
-#: ../src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
 msgstr "Virheellinen pyynt旦"
 
-#: ../src/protocols/jabber/jabber.c:1333
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1423
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../src/protocols/jabber/jabber.c:1341 ../src/protocols/jabber/jabber.c:1415
+#: ../src/protocols/jabber/jabber.c:1427 ../src/protocols/jabber/jabber.c:1502
 msgid "Internal Server Error"
 msgstr "Sis辰inen palvelinvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Item Not Found"
 msgstr "Kohdetta ei l旦ytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
 msgstr "Ep辰kelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1439
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Registration Required"
 msgstr "Vaatii rekister旦innin"
 
-#: ../src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei l旦ytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Service Unavailable"
 msgstr "Palvelu ei k辰ytett辰viss辰"
 
-#: ../src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1455
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1457
 msgid "Unexpected Request"
 msgstr "Odottamaton pyynt旦"
 
-#: ../src/protocols/jabber/jabber.c:1378
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../src/protocols/jabber/jabber.c:1380
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Incorrect encoding in authorization"
 msgstr "V辰辰r辰 merkist旦 valtuutusviestiss辰"
 
-#: ../src/protocols/jabber/jabber.c:1383
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "Ep辰kelpo authzid"
 
-#: ../src/protocols/jabber/jabber.c:1386
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
 msgstr "Ep辰kelpo tunnistautumismekanismi"
 
-#: ../src/protocols/jabber/jabber.c:1389
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../src/protocols/jabber/jabber.c:1394
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Temporary Authentication Failure"
 msgstr "V辰liaikainen todennusvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1396
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "Todennus ep辰onnistui"
 
-#: ../src/protocols/jabber/jabber.c:1400
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Bad Format"
 msgstr "V辰辰r辰 muoto"
 
-#: ../src/protocols/jabber/jabber.c:1402
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Bad Namespace Prefix"
 msgstr "V辰辰r辰 nimiavaruuden etuliite"
 
-#: ../src/protocols/jabber/jabber.c:1405
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Resource Conflict"
 msgstr "L辰hdekonflikti"
 
-#: ../src/protocols/jabber/jabber.c:1407 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1494 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Ei yhteytt辰 m辰辰r辰ajassa"
 
-#: ../src/protocols/jabber/jabber.c:1409
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
 msgstr "Verkkois辰nt辰 kadonnut"
 
-#: ../src/protocols/jabber/jabber.c:1411
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Host Unknown"
 msgstr "Tuntematon is辰nt辰"
 
-#: ../src/protocols/jabber/jabber.c:1413
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Improper Addressing"
 msgstr "V辰辰r辰nlainen osoitus"
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
 msgstr "Ep辰kelpo ID"
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
 msgstr "V辰辰r辰 nimiavaruus"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../src/protocols/jabber/jabber.c:1508
 msgid "Invalid XML"
 msgstr "Ep辰kelpo XML"
 
-#: ../src/protocols/jabber/jabber.c:1423
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Non-matching Hosts"
 msgstr "Verkkois辰nn辰t eiv辰t t辰sm辰辰"
 
-#: ../src/protocols/jabber/jabber.c:1427
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Policy Violation"
 msgstr "Menettelyk辰yt辰nt旦rikkomus"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Remote Connection Failed"
 msgstr "Et辰yhteydess辰 yhteydess辰 virhe"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "Resource Constraint"
 msgstr "L辰hderajoite"
 
-#: ../src/protocols/jabber/jabber.c:1433
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "See Other Host"
 msgstr "Etsi toinen is辰nt辰"
 
-#: ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "System Shutdown"
 msgstr "J辰rjestelm辰n alasajo"
 
-#: ../src/protocols/jabber/jabber.c:1439
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Undefined Condition"
 msgstr "M辰辰rittelem辰t旦n tila"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Encoding"
 msgstr "Merkist旦辰 ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1443
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "Unsupported Stanza Type"
 msgstr "S辰keist旦tyyppi辰(stanza type) ei tuettu"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:辰辰"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../src/protocols/jabber/jabber.c:1536
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kielt辰辰 k辰ytt辰j辰辰 %s."
 
-#: ../src/protocols/jabber/jabber.c:1538
+#: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytk旦s: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1543
+#: ../src/protocols/jabber/jabber.c:1628
 #, 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:1595
+#: ../src/protocols/jabber/jabber.c:1647
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Tuntematon rooli: \"%s\""
+
+#: ../src/protocols/jabber/jabber.c:1654
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Ei voitu asettaa roolia \"%s\" k辰ytt辰j辰lle: %s"
+
+#: ../src/protocols/jabber/jabber.c:1707
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista k辰ytt辰j辰辰 %s ulos."
 
-#: ../src/protocols/jabber/jabber.c:1626
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhm辰keskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1630
+#: ../src/protocols/jabber/jabber.c:1742
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhm辰keskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1639
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1644
+#: ../src/protocols/jabber/jabber.c:1756
 msgid "register:  Register with a chat room."
 msgstr "register: Rekister旦idy ryhm辰keskusteluhuoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1650
+#: ../src/protocols/jabber/jabber.c:1762
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: N辰yt辰 tai vaihda aihe."
 
-#: ../src/protocols/jabber/jabber.c:1656
+#: ../src/protocols/jabber/jabber.c:1768
 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:1662
+msgstr "ban &lt;k辰ytt辰j辰&gt; [huone]: Kiell辰 k辰ytt辰j辰 huoneesta."
+
+#: ../src/protocols/jabber/jabber.c:1774
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
+"k辰ytt辰j辰n k辰ytt辰j辰luokka t辰lle huoneelle."
+
+#: ../src/protocols/jabber/jabber.c:1780
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "k辰ytt辰j辰n rooli huoneessa."
 
-#: ../src/protocols/jabber/jabber.c:1668
+#: ../src/protocols/jabber/jabber.c:1786
 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:1674
+msgstr "invite &lt;k辰ytt辰j辰&gt; [viesti]: Kutsu k辰ytt辰j辰 huoneeseen."
+
+#: ../src/protocols/jabber/jabber.c:1792
 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:1680
+msgstr ""
+"join: &lt;huone&gt; [palvelin]: Liity ryhm辰keskusteluun t辰ll辰 palvelimella."
+
+#: ../src/protocols/jabber/jabber.c:1798
 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:1685
+msgstr "kick &lt;k辰ytt辰j辰&gt; [huone]: Potkaise k辰ytt辰j辰 ulos huoneesta."
+
+#: ../src/protocols/jabber/jabber.c:1803
 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."
+msgstr ""
+"msh &lt;k辰ytt辰j辰&gt; &lt;viesti&gt;: L辰het辰 yksityisviesti k辰ytt辰j辰lle."
 
 #. *< type
 #. *< ui_requirement
@@ -7026,32 +7273,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1769 ../src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1887 ../src/protocols/jabber/jabber.c:1889
 msgid "Jabber Protocol Plugin"
-msgstr "Jabber-protokollaliit辰nn辰inen"
-
-#: ../src/protocols/jabber/jabber.c:1797
+msgstr "Jabber-yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/jabber/jabber.c:1915
 msgid "Use TLS if available"
 msgstr "K辰yt辰 TLS:辰辰 jos mahdollista"
 
-#: ../src/protocols/jabber/jabber.c:1802
+#: ../src/protocols/jabber/jabber.c:1920
 msgid "Require TLS"
 msgstr "Vaadi TLS"
 
-#: ../src/protocols/jabber/jabber.c:1805
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Force old (port 5223) SSL"
 msgstr "K辰yt辰 vanhaa (portti 5223) SSL:辰辰"
 
-#: ../src/protocols/jabber/jabber.c:1810
+#: ../src/protocols/jabber/jabber.c:1928
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/jabber.c:1815 ../src/protocols/simple/simple.c:1503
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/simple/simple.c:1669
 msgid "Connect port"
 msgstr "Yhdist辰 porttiin"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1819 ../src/protocols/silc/silc.c:1852
+#: ../src/protocols/jabber/jabber.c:1937 ../src/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "Yhdist辰 palvelimeen"
 
@@ -7097,13 +7344,13 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "K辰ytt辰j辰 %s haluaa lis辰t辰 k辰ytt辰j辰n %s tuttavalistalleen."
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4707
-#: ../src/protocols/oscar/oscar.c:7422
+#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
+#: ../src/protocols/oscar/oscar.c:7405
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4709
-#: ../src/protocols/oscar/oscar.c:7423
+#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
+#: ../src/protocols/oscar/oscar.c:7406
 msgid "_Deny"
 msgstr "_Kiell辰"
 
@@ -7138,13 +7385,13 @@
 msgid "Error joining chat %s"
 msgstr "Virhe liitytt辰ess辰 ryhm辰keskusteluun %s"
 
-#: ../src/protocols/jabber/si.c:619
+#: ../src/protocols/jabber/si.c:726
 #, 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 tiedostonsiirtoja"
 
-#: ../src/protocols/jabber/si.c:620 ../src/protocols/jabber/si.c:621
+#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
 msgid "File Send Failed"
 msgstr "Tiedoston l辰hetys ep辰onnistui"
 
@@ -7267,7 +7514,7 @@
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:205
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sis辰辰n."
 
@@ -7360,7 +7607,7 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2837
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2864
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Todennus ep辰onnistui"
@@ -7455,9 +7702,9 @@
 msgid "Page"
 msgstr "L辰het辰"
 
-#: ../src/protocols/msn/msn.c:552 ../src/protocols/msn/msn.c:559
-#: ../src/protocols/msn/msn.c:568 ../src/protocols/yahoo/yahoo.c:2821
-#: ../src/protocols/yahoo/yahoo.c:2827
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
+#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2886
 #, c-format
 msgid ""
 "\n"
@@ -7466,69 +7713,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:559
+#: ../src/protocols/msn/msn.c:557
 msgid "Has you"
 msgstr "Olet h辰nen listallaan"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2651 ../src/protocols/yahoo/yahoo.c:3231
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3288
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2852 ../src/protocols/novell/novell.c:2988
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2653 ../src/protocols/yahoo/yahoo.c:3234
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3291
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2661
-#: ../src/protocols/yahoo/yahoo.c:3246
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:3303
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../src/protocols/msn/msn.c:603 ../src/protocols/yahoo/yahoo.c:2665
-#: ../src/protocols/yahoo/yahoo.c:3252
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2723
+#: ../src/protocols/yahoo/yahoo.c:3309
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/msn.c:627
+#: ../src/protocols/msn/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
+#: ../src/protocols/msn/msn.c:628
+msgid "Set Home Phone Number..."
+msgstr "Aseta kotipuhelinnumero..."
+
 #: ../src/protocols/msn/msn.c:632
-msgid "Set Home Phone Number..."
-msgstr "Aseta kotipuhelinnumero..."
-
-#: ../src/protocols/msn/msn.c:636
 msgid "Set Work Phone Number..."
 msgstr "Aseta ty旦puhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:640
+#: ../src/protocols/msn/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:646
+#: ../src/protocols/msn/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta p辰辰lle/pois mobiililaitteet..."
 
-#: ../src/protocols/msn/msn.c:651
+#: ../src/protocols/msn/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/est辰 mobiilihaut..."
 
-#: ../src/protocols/msn/msn.c:661
+#: ../src/protocols/msn/msn.c:657
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../src/protocols/msn/msn.c:685
+#: ../src/protocols/msn/msn.c:681
 msgid "Send to Mobile"
 msgstr "L辰het辰 mobiililaitteeseen"
 
-#: ../src/protocols/msn/msn.c:695 ../src/protocols/novell/novell.c:3444
+#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhm辰keskustelu"
 
-#: ../src/protocols/msn/msn.c:733
+#: ../src/protocols/msn/msn.c:729
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7536,84 +7783,84 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lis辰tietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:761
+#: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteytt辰."
 
-#: ../src/protocols/msn/msn.c:1369 ../src/protocols/yahoo/yahoo_profile.c:674
+#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
 #: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
 #, 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:1376 ../src/protocols/msn/msn.c:1722
-#: ../src/protocols/yahoo/yahoo_profile.c:1191 ../src/util.c:814
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1725
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1035
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1453
+#: ../src/protocols/msn/msn.c:1456
 msgid "MSN Profile"
 msgstr "MSN-profiili"
 
-#: ../src/protocols/msn/msn.c:1458 ../src/protocols/msn/msn.c:1709
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../src/protocols/msn/msn.c:1528 ../src/protocols/oscar/oscar.c:6155
-#: ../src/protocols/yahoo/yahoo_profile.c:1039
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6139
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "Ik辰"
 
-#: ../src/protocols/msn/msn.c:1544 ../src/protocols/yahoo/yahoo_profile.c:1044
+#: ../src/protocols/msn/msn.c:1547 ../src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Marital Status"
 msgstr "Siviilis辰辰ty"
 
-#: ../src/protocols/msn/msn.c:1551 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1034
+#: ../src/protocols/msn/msn.c:1554 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/protocols/msn/msn.c:1559 ../src/protocols/yahoo/yahoo_profile.c:1054
+#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../src/protocols/msn/msn.c:1576 ../src/protocols/msn/msn.c:1582
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/msn/msn.c:1597
-#: ../src/protocols/msn/msn.c:1604
+#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1592 ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1607
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../src/protocols/msn/msn.c:1613 ../src/protocols/msn/msn.c:1619
-#: ../src/protocols/msn/msn.c:1626 ../src/protocols/msn/msn.c:1633
+#: ../src/protocols/msn/msn.c:1616 ../src/protocols/msn/msn.c:1622
+#: ../src/protocols/msn/msn.c:1629 ../src/protocols/msn/msn.c:1636
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../src/protocols/msn/msn.c:1642 ../src/protocols/msn/msn.c:1648
-#: ../src/protocols/msn/msn.c:1655
+#: ../src/protocols/msn/msn.c:1645 ../src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1658
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../src/protocols/msn/msn.c:1664 ../src/protocols/msn/msn.c:1670
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/msn/msn.c:1667 ../src/protocols/msn/msn.c:1673
+#: ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../src/protocols/msn/msn.c:1678
+#: ../src/protocols/msn/msn.c:1681
 msgid "Last Updated"
 msgstr "Edellinen p辰ivitys"
 
-#: ../src/protocols/msn/msn.c:1689 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../src/protocols/msn/msn.c:1711
+#: ../src/protocols/msn/msn.c:1714
 msgid "The user has not created a public profile."
 msgstr "K辰ytt辰j辰ll辰 ei ole julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/msn/msn.c:1715
 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 "
@@ -7622,7 +7869,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:1716
+#: ../src/protocols/msn/msn.c:1719
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7630,7 +7877,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:1722 ../src/protocols/yahoo/yahoo_profile.c:1191
+#: ../src/protocols/msn/msn.c:1725 ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -7644,28 +7891,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:1928 ../src/protocols/msn/msn.c:1930
+#: ../src/protocols/msn/msn.c:1931 ../src/protocols/msn/msn.c:1933
 msgid "MSN Protocol Plugin"
-msgstr "MSN-protokollaliit辰nn辰inen"
-
-#: ../src/protocols/msn/msn.c:1949
+msgstr "MSN-yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/msn/msn.c:1952
 msgid "Login server"
 msgstr "Sis辰辰nkirjautumispalvelin"
 
-#: ../src/protocols/msn/msn.c:1958
+#: ../src/protocols/msn/msn.c:1961
 msgid "Use HTTP Method"
 msgstr "K辰yt辰 HTTP-menetelm辰辰"
 
-#: ../src/protocols/msn/msn.c:1963
+#: ../src/protocols/msn/msn.c:1966
 msgid "Show custom smileys"
 msgstr "N辰yt辰 itse tehdyt / lis辰tyt hymi旦t"
 
-#: ../src/protocols/msn/msn.c:1971
+#: ../src/protocols/msn/msn.c:1974
 msgid "nudge: nudge a user 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:1338
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen ep辰onnistui"
 
@@ -7750,15 +7998,15 @@
 "\n"
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
-#: ../src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Virhe kirjoitettaessa"
 
-#: ../src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Virhe luettaessa"
 
-#: ../src/protocols/msn/servconn.c:138
+#: ../src/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7769,7 +8017,7 @@
 
 #: ../src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
-msgstr "Palvelin ei tue protokollaa."
+msgstr "Palvelin ei tue yhteysk辰yt辰nt旦辰."
 
 #: ../src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
@@ -7778,7 +8026,7 @@
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
 #: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5784 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/oscar/oscar.c:5816 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sis辰辰n toisesta paikasta."
 
@@ -7839,32 +8087,36 @@
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/switchboard.c:405
+#: ../src/protocols/msn/switchboard.c:408
 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:413
+#: ../src/protocols/msn/switchboard.c:416
 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:417
+#: ../src/protocols/msn/switchboard.c:420
 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:421
+#: ../src/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Viesti辰 ei voitu l辰hett辰辰 yhteysvirheen vuoksi:"
 
-#: ../src/protocols/msn/switchboard.c:425
+#: ../src/protocols/msn/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Viesti辰 ei voitu l辰hett辰辰 koska l辰hetet辰辰n liian nopeasti:"
+
+#: ../src/protocols/msn/switchboard.c:432
 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:433
+#: ../src/protocols/msn/switchboard.c:440
 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:954
+#: ../src/protocols/msn/switchboard.c:961
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "K辰ytt辰j辰 %s l辰hetti sinulle juuri t旦n辰isyn!"
@@ -7874,11 +8126,11 @@
 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:111 ../src/protocols/yahoo/yahoo.c:907
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:909
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
 msgid "Deny"
 msgstr "Kiell辰"
 
@@ -7892,12 +8144,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s on poistanut sinut tuttavalistaltaan."
 
-#: ../src/protocols/msn/userlist.c:670
+#: ../src/protocols/msn/userlist.c:678
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ei voitu lis辰t辰 \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:672
+#: ../src/protocols/msn/userlist.c:680
 msgid "The screen name specified is invalid."
 msgstr "Sy旦tetty n辰ytt旦nimi on virheellinen."
 
@@ -7940,16 +8192,16 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:538 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2231 ../src/protocols/yahoo/yahoo.c:2258
-#: ../src/protocols/yahoo/yahoo.c:2321
-#: ../src/protocols/yahoo/yahoo_filexfer.c:69
-#: ../src/protocols/yahoo/yahoo_filexfer.c:111
-#: ../src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
+#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen ep辰onnistui."
 
-#: ../src/protocols/napster/napster.c:594 ../src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Ryhm辰:"
 
@@ -7963,10 +8215,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/napster/napster.c:695
-#: ../src/protocols/napster/napster.c:697
+#: ../src/protocols/napster/napster.c:700
+#: ../src/protocols/napster/napster.c:702
 msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER-protokollaliit辰nn辰inen"
+msgstr "NAPSTER-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
@@ -8074,7 +8326,7 @@
 
 #: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
-msgstr "Ep辰yhteensopiva protokollaversio"
+msgstr "Ep辰yhteensopiva yhteysk辰yt辰nt旦versio"
 
 #: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
@@ -8207,8 +8459,8 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6128
-#: ../src/protocols/oscar/oscar.c:6135
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6113
+#: ../src/protocols/oscar/oscar.c:6120
 msgid "Email Address"
 msgstr "S辰hk旦postiosoite"
 
@@ -8313,115 +8565,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3546 ../src/protocols/novell/novell.c:3548
+#: ../src/protocols/novell/novell.c:3544 ../src/protocols/novell/novell.c:3546
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger -protokollaliit辰nn辰inen"
-
-#: ../src/protocols/novell/novell.c:3567
+msgstr "Novell GroupWise Messenger -yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/novell/novell.c:3565
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../src/protocols/novell/novell.c:3571
+#: ../src/protocols/novell/novell.c:3569
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: ../src/protocols/oscar/oscar.c:201
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Invalid error"
 msgstr "Ep辰kelpo virhe"
 
-#: ../src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Invalid SNAC"
 msgstr "Ep辰kelpo SNAC"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:205
 msgid "Rate to host"
 msgstr "Nopeus is辰nt辰辰n"
 
-#: ../src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: ../src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:208
 msgid "Service unavailable"
 msgstr "Palvelu ei ole k辰ytett辰viss辰"
 
-#: ../src/protocols/oscar/oscar.c:207
-msgid "Service not defined"
-msgstr "Palvelua ei m辰辰ritelty"
-
-#: ../src/protocols/oscar/oscar.c:208
-msgid "Obsolete SNAC"
-msgstr "Vanhentunut SNAC"
-
 #: ../src/protocols/oscar/oscar.c:209
+msgid "Service not defined"
+msgstr "Palvelua ei m辰辰ritelty"
+
+#: ../src/protocols/oscar/oscar.c:210
+msgid "Obsolete SNAC"
+msgstr "Vanhentunut SNAC"
+
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkois辰nn辰ss辰"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Not supported by client"
 msgstr "Ei tuettu asiakasohjelmassa"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:214
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:215
 msgid "Responses lost"
 msgstr "Vastaukset menetetty"
 
-#: ../src/protocols/oscar/oscar.c:214
-msgid "Request denied"
-msgstr "Pyynt旦 ev辰tty"
-
-#: ../src/protocols/oscar/oscar.c:215
-msgid "Busted SNAC payload"
-msgstr "Rikkoutunut SNAC-data"
-
 #: ../src/protocols/oscar/oscar.c:216
+msgid "Request denied"
+msgstr "Pyynt旦 ev辰tty"
+
+#: ../src/protocols/oscar/oscar.c:217
+msgid "Busted SNAC payload"
+msgstr "Rikkoutunut SNAC-data"
+
+#: ../src/protocols/oscar/oscar.c:218
 msgid "Insufficient rights"
 msgstr "Liian v辰h辰n oikeuksia"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:219
 msgid "In local permit/deny"
 msgstr "Paikallisessa sallittujen/estettyjen listassa"
 
-#: ../src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:220
 msgid "Too evil (sender)"
 msgstr "L辰hett辰j辰 liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:221
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: ../src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:222
 msgid "User temporarily unavailable"
 msgstr "K辰ytt辰j辰 ei tilap辰isesti saatavilla."
 
-#: ../src/protocols/oscar/oscar.c:221
-msgid "No match"
-msgstr "Ei tuloksia"
-
-#: ../src/protocols/oscar/oscar.c:222
-msgid "List overflow"
-msgstr "Lista-ylivuoto"
-
 #: ../src/protocols/oscar/oscar.c:223
+msgid "No match"
+msgstr "Ei tuloksia"
+
+#: ../src/protocols/oscar/oscar.c:224
+msgid "List overflow"
+msgstr "Lista-ylivuoto"
+
+#: ../src/protocols/oscar/oscar.c:225
 msgid "Request ambiguous"
 msgstr "Pyynt旦 ei ole yksiselitteinen"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:226
 msgid "Queue full"
 msgstr "Jono t辰ynn辰"
 
-#: ../src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:227
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on k辰yt旦ss辰"
 
-#: ../src/protocols/oscar/oscar.c:419 ../src/protocols/oscar/oscar.c:521
+#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8429,159 +8681,159 @@
 "(T辰m辰n viestin vastaanotossa oli virhe. Henkil旦 jonka kanssa keskustelet "
 "k辰ytt辰辰 todenn辰k旦isesti virheellist辰 asiakasohjelmaa.)"
 
-#: ../src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:638
 msgid "Voice"
 msgstr "�辰ni"
 
-#: ../src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:641
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:641 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/silc/silc.c:693
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/oscar/oscar.c:8127
+#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../src/protocols/oscar/oscar.c:651
+#: ../src/protocols/oscar/oscar.c:654
 msgid "Games"
 msgstr "Pelit"
 
-#: ../src/protocols/oscar/oscar.c:654
+#: ../src/protocols/oscar/oscar.c:657
 msgid "Add-Ins"
 msgstr "Lis辰ykset"
 
-#: ../src/protocols/oscar/oscar.c:657
+#: ../src/protocols/oscar/oscar.c:660
 msgid "Send Buddy List"
 msgstr "L辰het辰 tuttavalista"
 
-#: ../src/protocols/oscar/oscar.c:660
+#: ../src/protocols/oscar/oscar.c:663
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../src/protocols/oscar/oscar.c:663
-msgid "AP User"
-msgstr "AP-k辰ytt辰j辰"
-
 #: ../src/protocols/oscar/oscar.c:666
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "AP User"
+msgstr "AP-k辰ytt辰j辰"
 
 #: ../src/protocols/oscar/oscar.c:669
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: ../src/protocols/oscar/oscar.c:672
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../src/protocols/oscar/oscar.c:672
-msgid "ICQ Server Relay"
-msgstr "ICQ-palvelimen v辰litys"
-
 #: ../src/protocols/oscar/oscar.c:675
+msgid "ICQ Server Relay"
+msgstr "ICQ-palvelimen v辰litys"
+
+#: ../src/protocols/oscar/oscar.c:678
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:681
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:684
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:684
+#: ../src/protocols/oscar/oscar.c:687
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:687
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Security Enabled"
 msgstr "Turvatoimet k辰yt旦ss辰"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/protocols/oscar/oscar.c:694
+#: ../src/protocols/oscar/oscar.c:697
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:697
+#: ../src/protocols/oscar/oscar.c:700
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../src/protocols/oscar/oscar.c:700
+#: ../src/protocols/oscar/oscar.c:703
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:718 ../src/protocols/oscar/oscar.c:7975
+#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../src/protocols/oscar/oscar.c:722 ../src/protocols/oscar/oscar.c:8016
+#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../src/protocols/oscar/oscar.c:724 ../src/protocols/oscar/oscar.c:8006
+#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../src/protocols/oscar/oscar.c:728
+#: ../src/protocols/oscar/oscar.c:731
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../src/protocols/oscar/oscar.c:732
+#: ../src/protocols/oscar/oscar.c:735
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../src/protocols/oscar/oscar.c:809 ../src/protocols/oscar/oscar.c:5155
+#: ../src/protocols/oscar/oscar.c:812 ../src/protocols/oscar/oscar.c:5188
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../src/protocols/oscar/oscar.c:818
+#: ../src/protocols/oscar/oscar.c:821
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../src/protocols/oscar/oscar.c:969
+#: ../src/protocols/oscar/oscar.c:970
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: ../src/protocols/oscar/oscar.c:971
+#: ../src/protocols/oscar/oscar.c:972
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Suora pikaviesti %s:n kanssa ep辰onnistui"
 
-#: ../src/protocols/oscar/oscar.c:979
+#: ../src/protocols/oscar/oscar.c:980
 msgid "Direct Connect failed"
 msgstr "Suorayhteys ep辰onnistui"
 
-#: ../src/protocols/oscar/oscar.c:1056 ../src/protocols/oscar/oscar.c:1187
+#: ../src/protocols/oscar/oscar.c:1060 ../src/protocols/oscar/oscar.c:1189
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviestiyhteys %s:n kanssa muodostettu"
 
-#: ../src/protocols/oscar/oscar.c:1137
+#: ../src/protocols/oscar/oscar.c:1141
 #, 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:1543
+#: ../src/protocols/oscar/oscar.c:1544
 #, 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:1548 ../src/protocols/oscar/oscar.c:1595
+#: ../src/protocols/oscar/oscar.c:1549 ../src/protocols/oscar/oscar.c:1596
 msgid "Unable to open Direct IM"
 msgstr "Ei voitu avata suoraa pikaviestiyhteytt辰"
 
-#: ../src/protocols/oscar/oscar.c:1631
+#: ../src/protocols/oscar/oscar.c:1632
 #, 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:1635
+#: ../src/protocols/oscar/oscar.c:1636
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8589,24 +8841,24 @@
 "Koska t辰m辰 paljastaa IP-osoitteesi, se voidaan ajatella yksityisyysriskiksi. "
 "Haluatko jatkaa?"
 
-#: ../src/protocols/oscar/oscar.c:1639 ../src/protocols/oscar/oscar.c:4466
+#: ../src/protocols/oscar/oscar.c:1640 ../src/protocols/oscar/oscar.c:4499
 msgid "_Connect"
 msgstr "_Yhdist辰"
 
-#: ../src/protocols/oscar/oscar.c:1705
+#: ../src/protocols/oscar/oscar.c:1718
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../src/protocols/oscar/oscar.c:1728
+#: ../src/protocols/oscar/oscar.c:1741
 msgid "Chat is currently unavailable"
 msgstr "Ryhm辰keskustelu ei ole parhaillaan k辰ytett辰viss辰"
 
-#: ../src/protocols/oscar/oscar.c:1798
+#: ../src/protocols/oscar/oscar.c:1813
 msgid "Screen name sent"
 msgstr "N辰ytt旦nimi l辰hetetty"
 
-#: ../src/protocols/oscar/oscar.c:1814
+#: ../src/protocols/oscar/oscar.c:1829
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8617,74 +8869,78 @@
 "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:1843
+#: ../src/protocols/oscar/oscar.c:1857
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan AIM:iin"
 
-#: ../src/protocols/oscar/oscar.c:1947 ../src/protocols/oscar/oscar.c:2928
+#: ../src/protocols/oscar/oscar.c:1960 ../src/protocols/oscar/oscar.c:2951
 msgid "Could Not Connect"
 msgstr "Yhteytt辰 ei voitu muodostaa"
 
-#: ../src/protocols/oscar/oscar.c:1955
+#: ../src/protocols/oscar/oscar.c:1971
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, ev辰ste l辰hetetty"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
+#. *
+#. * Above, we checked if we had previously attempted a connection
+#. * redirect to prevent a conflict with the joscar library
+#.
 #. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2107
+#: ../src/protocols/oscar/oscar.c:2130
 msgid "Attempting connection redirect..."
 msgstr "Yritet辰辰n yhteyden uudelleenreitityst辰..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2152
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2176
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
 msgstr ""
 "Tiedoston %s siirto aikakatkaistiin.\n"
-" Kokeile v辰lipalvelimien k辰ytt旦旦nottoa tiedostonsiirroille kohdassa Ty旦kalut-"
-">Asetukset->AIM/ICQ."
-
-#: ../src/protocols/oscar/oscar.c:2250
-#: ../src/protocols/yahoo/yahoo_filexfer.c:174
-#: ../src/protocols/yahoo/yahoo_filexfer.c:183
-#: ../src/protocols/yahoo/yahoo_filexfer.c:192
+" Kokeile v辰lipalvelimien k辰ytt旦旦nottoa tiedostonsiirroille kohdassa "
+"K辰ytt辰j辰tilit->%s->Muokkaa k辰ytt辰j辰tili辰->Lis辰asetukset."
+
+#: ../src/protocols/oscar/oscar.c:2274
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#: ../src/protocols/oscar/oscar.c:2255
+#: ../src/protocols/oscar/oscar.c:2279
 msgid "Unable to create new connection."
 msgstr "Uuden yhteyden luominen ep辰onnistui."
 
-#: ../src/protocols/oscar/oscar.c:2489 ../src/protocols/oscar/oscar.c:2498
-#: ../src/protocols/oscar/oscar.c:2512 ../src/protocols/oscar/oscar.c:2522
+#: ../src/protocols/oscar/oscar.c:2516 ../src/protocols/oscar/oscar.c:2525
+#: ../src/protocols/oscar/oscar.c:2539 ../src/protocols/oscar/oscar.c:2549
 msgid "Unable to log into file transfer proxy."
 msgstr "Ei kyetty kirjautumaan tiedostonsiirtov辰lipalvelimeen."
 
-#: ../src/protocols/oscar/oscar.c:2576
+#: ../src/protocols/oscar/oscar.c:2603
 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:2814 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2841 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: ../src/protocols/oscar/oscar.c:2819
+#: ../src/protocols/oscar/oscar.c:2846
 msgid "Your account is currently suspended."
 msgstr "K辰ytt辰j辰tilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2823
+#: ../src/protocols/oscar/oscar.c:2850
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilap辰isesti ole k辰yt旦ss辰."
 
-#: ../src/protocols/oscar/oscar.c:2828
+#: ../src/protocols/oscar/oscar.c:2855
 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."
@@ -8693,59 +8949,59 @@
 "ja yrit辰 uudelleen. Jos jatkat yritt辰mist辰, joudut odottamaan viel辰 "
 "pidemp辰辰n."
 
-#: ../src/protocols/oscar/oscar.c:2833
+#: ../src/protocols/oscar/oscar.c:2860
 #, 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:2864
+#: ../src/protocols/oscar/oscar.c:2888
 msgid "Internal Error"
 msgstr "Sis辰inen virhe"
 
-#: ../src/protocols/oscar/oscar.c:2935
+#: ../src/protocols/oscar/oscar.c:2958
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../src/protocols/oscar/oscar.c:2959
+#: ../src/protocols/oscar/oscar.c:2982
 msgid "The SecurID key entered is invalid."
 msgstr "Sy旦tetty SecurID-avain on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:2973
+#: ../src/protocols/oscar/oscar.c:2996
 msgid "Enter SecurID"
 msgstr "Sy旦t辰 SecurID"
 
-#: ../src/protocols/oscar/oscar.c:2974
+#: ../src/protocols/oscar/oscar.c:2997
 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:3014 ../src/protocols/oscar/oscar.c:3044
-#: ../src/protocols/oscar/oscar.c:3133
+#: ../src/protocols/oscar/oscar.c:3037 ../src/protocols/oscar/oscar.c:3067
+#: ../src/protocols/oscar/oscar.c:3158
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"Yhteytesi saatetaan katkaista kohta. Saatat haluta k辰ytt辰辰 TOC-protokollaa "
-"kunnes t辰m辰 on korjattu. Tarkista p辰ivitykset: %s"
-
-#: ../src/protocols/oscar/oscar.c:3017 ../src/protocols/oscar/oscar.c:3047
+"Yhteytesi saatetaan katkaista kohta. Saatat haluta k辰ytt辰辰 TOC-"
+"yhteysk辰yt辰nt旦辰 kunnes t辰m辰 on korjattu. Tarkista p辰ivitykset: %s"
+
+#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
 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:3136
+msgstr "Gaim ei saanut kelvollista AIM-sis辰辰nkirjautumistiivistett辰."
+
+#: ../src/protocols/oscar/oscar.c:3161
 msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim ei saanut kelvollista sis辰辰nkirjautumis-hash:i辰."
-
-#: ../src/protocols/oscar/oscar.c:3157
+msgstr "Gaim ei saanut kelvollista sis辰辰nkirjautumistiivistett辰."
+
+#: ../src/protocols/oscar/oscar.c:3182
 msgid "Password sent"
 msgstr "Salasana l辰hetetty"
 
-#: ../src/protocols/oscar/oscar.c:4457
+#: ../src/protocols/oscar/oscar.c:4490
 #, 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:4460
+#: ../src/protocols/oscar/oscar.c:4493
 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 "
@@ -8755,19 +9011,19 @@
 "l辰hetett辰ess辰 kuvia. Koska IP-osoitteesi paljastuu, t辰t辰 voi pit辰辰 "
 "yksityisyysriskin辰."
 
-#: ../src/protocols/oscar/oscar.c:4499
+#: ../src/protocols/oscar/oscar.c:4532
 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:4507
+#: ../src/protocols/oscar/oscar.c:4540
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyynt旦viesti:"
 
-#: ../src/protocols/oscar/oscar.c:4508
+#: ../src/protocols/oscar/oscar.c:4541
 msgid "Please authorize me!"
 msgstr "Valtuuta minut."
 
-#: ../src/protocols/oscar/oscar.c:4538
+#: ../src/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8776,25 +9032,25 @@
 "K辰ytt辰j辰 %s vaatii valtuutuksen ennenkuin h辰net voi lis辰t辰 tuttavalistalle. "
 "Haluatko l辰hett辰辰 valtuutuspyynn旦n?"
 
-#: ../src/protocols/oscar/oscar.c:4543
+#: ../src/protocols/oscar/oscar.c:4576
 msgid "Request Authorization"
 msgstr "Pyyd辰 valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:4545
+#: ../src/protocols/oscar/oscar.c:4578
 msgid "_Request Authorization"
 msgstr "_Pyyd辰 valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:4583 ../src/protocols/oscar/oscar.c:4589
-#: ../src/protocols/oscar/oscar.c:4693 ../src/protocols/oscar/oscar.c:4717
-#: ../src/protocols/oscar/oscar.c:7408 ../src/protocols/oscar/oscar.c:7460
+#: ../src/protocols/oscar/oscar.c:4616 ../src/protocols/oscar/oscar.c:4622
+#: ../src/protocols/oscar/oscar.c:4726 ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:7391 ../src/protocols/oscar/oscar.c:7443
 msgid "No reason given."
 msgstr "Syyt辰 ei annettu."
 
-#: ../src/protocols/oscar/oscar.c:4588
+#: ../src/protocols/oscar/oscar.c:4621
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyynt旦 ev辰tty:"
 
-#: ../src/protocols/oscar/oscar.c:4695
+#: ../src/protocols/oscar/oscar.c:4728
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8803,11 +9059,11 @@
 "K辰ytt辰j辰 %u haluaa lis辰t辰 %s:n tuttavalistalleen seuraavasta syyst辰:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4705 ../src/protocols/oscar/oscar.c:7420
+#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
 msgid "Authorization Request"
 msgstr "Valtuutuspyynt旦"
 
-#: ../src/protocols/oscar/oscar.c:4717
+#: ../src/protocols/oscar/oscar.c:4750
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8818,17 +9074,17 @@
 "syyst辰:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4718
+#: ../src/protocols/oscar/oscar.c:4751
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus ev辰tty."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4725
+#: ../src/protocols/oscar/oscar.c:4758
 #, 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:4733
+#: ../src/protocols/oscar/oscar.c:4766
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8841,7 +9097,7 @@
 "L辰hett辰j辰: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4741
+#: ../src/protocols/oscar/oscar.c:4774
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8854,7 +9110,7 @@
 "L辰hett辰j辰: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4749
+#: ../src/protocols/oscar/oscar.c:4782
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8867,34 +9123,34 @@
 "Viesti on:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4770
+#: ../src/protocols/oscar/oscar.c:4803
 #, 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:4776
+#: ../src/protocols/oscar/oscar.c:4809
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lis辰t辰 h辰net tuttavalistallesi?"
 
-#: ../src/protocols/oscar/oscar.c:4780
+#: ../src/protocols/oscar/oscar.c:4813
 msgid "_Decline"
 msgstr "_Kielt辰ydy"
 
-#: ../src/protocols/oscar/oscar.c:4864
+#: ../src/protocols/oscar/oscar.c:4897
 #, 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:4873
+#: ../src/protocols/oscar/oscar.c:4906
 #, 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:4882
+#: ../src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8903,83 +9159,87 @@
 msgstr[0] "Et saanut %hu viesti辰 %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viesti辰 %s:lta koska taajuusraja ylittyi."
 
-#: ../src/protocols/oscar/oscar.c:4891
+#: ../src/protocols/oscar/oscar.c:4924
 #, 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:4900
+#: ../src/protocols/oscar/oscar.c:4933
 #, 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:4909
+#: ../src/protocols/oscar/oscar.c:4942
 #, 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:4968
+#: ../src/protocols/oscar/oscar.c:5001
 #, 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:5029
+#: ../src/protocols/oscar/oscar.c:5062
 #, 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:5066
+#: ../src/protocols/oscar/oscar.c:5099
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viesti辰 ei voitu l辰hett辰辰: %s"
 
-#: ../src/protocols/oscar/oscar.c:5066 ../src/protocols/oscar/oscar.c:5071
-#: ../src/protocols/oscar/oscar.c:5129 ../src/protocols/oscar/oscar.c:5133
+#: ../src/protocols/oscar/oscar.c:5099 ../src/protocols/oscar/oscar.c:5104
+#: ../src/protocols/oscar/oscar.c:5162 ../src/protocols/oscar/oscar.c:5166
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../src/protocols/oscar/oscar.c:5069
-#: ../src/protocols/sametime/sametime.c:2321
+#: ../src/protocols/oscar/oscar.c:5102
+#: ../src/protocols/sametime/sametime.c:2373
 #, 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:5129
+#: ../src/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "User information not available: %s"
 msgstr "K辰ytt辰j辰tiedot eiv辰t ole saatavilla: %s"
 
-#: ../src/protocols/oscar/oscar.c:5132
+#: ../src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n k辰ytt辰j辰tiedot eiv辰t ole saatavilla"
 
-#: ../src/protocols/oscar/oscar.c:5159
+#: ../src/protocols/oscar/oscar.c:5192
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../src/protocols/oscar/oscar.c:5164
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
+#: ../src/protocols/oscar/oscar.c:5197
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
 msgid "Member Since"
 msgstr "Rekister旦itynyt"
 
-#: ../src/protocols/oscar/oscar.c:5169
+#: ../src/protocols/oscar/oscar.c:5202
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../src/protocols/oscar/oscar.c:5297
+#: ../src/protocols/oscar/oscar.c:5220
+msgid "Available Message"
+msgstr "Paikallaoloviesti"
+
+#: ../src/protocols/oscar/oscar.c:5337
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5483
+#: ../src/protocols/oscar/oscar.c:5523
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8987,11 +9247,11 @@
 "[Ei voitu n辰ytt辰辰 viesti辰 t辰lt辰 k辰ytt辰j辰lt辰 koska se sis辰lsi ep辰kelpoja "
 "merkkej辰.]"
 
-#: ../src/protocols/oscar/oscar.c:5709
+#: ../src/protocols/oscar/oscar.c:5744
 msgid "Rate limiting error."
 msgstr "M辰辰r辰rajoitusvirhe"
 
-#: ../src/protocols/oscar/oscar.c:5710
+#: ../src/protocols/oscar/oscar.c:5745
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8999,94 +9259,94 @@
 "Viimeist辰 viesti辰 ei l辰hetetty koska olet ylitt辰nyt taajuusrajan. Odota 10 "
 "sekuntia ja yrit辰 uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:5786
+#: ../src/protocols/oscar/oscar.c:5818
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syyst辰."
 
-#: ../src/protocols/oscar/oscar.c:5799 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5831 ../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:5828
+#: ../src/protocols/oscar/oscar.c:5860
 msgid "Finalizing connection"
 msgstr "Viimeistell辰辰n yhteytt辰"
 
-#: ../src/protocols/oscar/oscar.c:6140 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/protocols/oscar/oscar.c:6158
+#: ../src/protocols/oscar/oscar.c:6142
 msgid "Personal Web Page"
 msgstr "Henkil旦kohtainen kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:6162
+#: ../src/protocols/oscar/oscar.c:6146
 msgid "Additional Information"
 msgstr "Lis辰tiedot"
 
-#: ../src/protocols/oscar/oscar.c:6167
+#: ../src/protocols/oscar/oscar.c:6151
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../src/protocols/oscar/oscar.c:6171 ../src/protocols/oscar/oscar.c:6179
+#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/oscar/oscar.c:6175
+#: ../src/protocols/oscar/oscar.c:6159
 msgid "Work Address"
 msgstr "Ty旦osoite"
 
-#: ../src/protocols/oscar/oscar.c:6183
+#: ../src/protocols/oscar/oscar.c:6167
 msgid "Work Information"
 msgstr "Ty旦tiedot"
 
-#: ../src/protocols/oscar/oscar.c:6184
+#: ../src/protocols/oscar/oscar.c:6168
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/protocols/oscar/oscar.c:6185
+#: ../src/protocols/oscar/oscar.c:6169
 msgid "Division"
 msgstr "Osasto"
 
-#: ../src/protocols/oscar/oscar.c:6186
+#: ../src/protocols/oscar/oscar.c:6170
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/protocols/oscar/oscar.c:6188
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:6246
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../src/protocols/oscar/oscar.c:6286
+#: ../src/protocols/oscar/oscar.c:6270
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava n辰ytt旦nimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat n辰ytt旦nimet on assosioitu %s kanssa"
 
-#: ../src/protocols/oscar/oscar.c:6317
+#: ../src/protocols/oscar/oscar.c:6301
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ei hakutuloksia s辰hk旦postiosoitteelle %s"
 
-#: ../src/protocols/oscar/oscar.c:6338
+#: ../src/protocols/oscar/oscar.c:6322
 #, 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:6340
+#: ../src/protocols/oscar/oscar.c:6324
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../src/protocols/oscar/oscar.c:6371
+#: ../src/protocols/oscar/oscar.c:6355
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa k辰ytt辰j辰tilin tietoja"
 
-#: ../src/protocols/oscar/oscar.c:6374
+#: ../src/protocols/oscar/oscar.c:6358
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9095,14 +9355,14 @@
 "Virhe 0x%04x: N辰ytt旦nime辰 ei voi muotoilla koska pyydetty n辰ytt旦nimi eroaa "
 "alkuper辰isest辰."
 
-#: ../src/protocols/oscar/oscar.c:6377
+#: ../src/protocols/oscar/oscar.c:6361
 #, 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:6380
+#: ../src/protocols/oscar/oscar.c:6364
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9111,7 +9371,7 @@
 "Virhe 0x%04x: N辰ytt旦nime辰 ei voi muotoilla koska pyydetty n辰ytt旦nimi on "
 "liian pitk辰."
 
-#: ../src/protocols/oscar/oscar.c:6383
+#: ../src/protocols/oscar/oscar.c:6367
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -9120,7 +9380,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:6386
+#: ../src/protocols/oscar/oscar.c:6370
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -9129,7 +9389,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:6389
+#: ../src/protocols/oscar/oscar.c:6373
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -9138,12 +9398,12 @@
 "Virhe 0x%04x: S辰hk旦postiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:6392
+#: ../src/protocols/oscar/oscar.c:6376
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../src/protocols/oscar/oscar.c:6402
+#: ../src/protocols/oscar/oscar.c:6386
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9152,27 +9412,27 @@
 "N辰ytt旦nimesi on t辰ll辰 hetkell辰 muotoiltu seuraavasti:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6403 ../src/protocols/oscar/oscar.c:6410
+#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../src/protocols/oscar/oscar.c:6408
+#: ../src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s:n s辰hk旦postiosoite on %s"
 
-#: ../src/protocols/oscar/oscar.c:6480
+#: ../src/protocols/oscar/oscar.c:6464
 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:6718
+#: ../src/protocols/oscar/oscar.c:6704
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../src/protocols/oscar/oscar.c:6719
+#: ../src/protocols/oscar/oscar.c:6705
 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 "
@@ -9182,7 +9442,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yrit辰 asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../src/protocols/oscar/oscar.c:6733
+#: ../src/protocols/oscar/oscar.c:6719
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9195,11 +9455,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhent辰nyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:6738
+#: ../src/protocols/oscar/oscar.c:6724
 msgid "Profile too long."
 msgstr "Profiili on liian pitk辰."
 
-#: ../src/protocols/oscar/oscar.c:6780
+#: ../src/protocols/oscar/oscar.c:6766
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9212,11 +9472,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhent辰nyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:6785
+#: ../src/protocols/oscar/oscar.c:6771
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitk辰."
 
-#: ../src/protocols/oscar/oscar.c:6854
+#: ../src/protocols/oscar/oscar.c:6840
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9227,16 +9487,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:6856 ../src/protocols/oscar/oscar.c:7266
-#: ../src/protocols/oscar/oscar.c:7280
+#: ../src/protocols/oscar/oscar.c:6842 ../src/protocols/oscar/oscar.c:7249
+#: ../src/protocols/oscar/oscar.c:7263
 msgid "Unable To Add"
 msgstr "Lis辰辰minen ep辰onnistui"
 
-#: ../src/protocols/oscar/oscar.c:6966
+#: ../src/protocols/oscar/oscar.c:6949
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../src/protocols/oscar/oscar.c:6967
+#: ../src/protocols/oscar/oscar.c:6950
 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 "
@@ -9245,13 +9505,13 @@
 "Gaim ep辰onnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../src/protocols/oscar/oscar.c:7164 ../src/protocols/oscar/oscar.c:7165
-#: ../src/protocols/oscar/oscar.c:7170 ../src/protocols/oscar/oscar.c:7324
-#: ../src/protocols/oscar/oscar.c:7325 ../src/protocols/oscar/oscar.c:7330
+#: ../src/protocols/oscar/oscar.c:7147 ../src/protocols/oscar/oscar.c:7148
+#: ../src/protocols/oscar/oscar.c:7153 ../src/protocols/oscar/oscar.c:7307
+#: ../src/protocols/oscar/oscar.c:7308 ../src/protocols/oscar/oscar.c:7313
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../src/protocols/oscar/oscar.c:7264
+#: ../src/protocols/oscar/oscar.c:7247
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9260,11 +9520,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:7264 ../src/protocols/oscar/oscar.c:7278
+#: ../src/protocols/oscar/oscar.c:7247 ../src/protocols/oscar/oscar.c:7261
 msgid "(no name)"
 msgstr "(nimet旦n)"
 
-#: ../src/protocols/oscar/oscar.c:7278
+#: ../src/protocols/oscar/oscar.c:7261
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9274,7 +9534,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:7361
+#: ../src/protocols/oscar/oscar.c:7344
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9283,11 +9543,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:7367
+#: ../src/protocols/oscar/oscar.c:7350
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: ../src/protocols/oscar/oscar.c:7411
+#: ../src/protocols/oscar/oscar.c:7394
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9298,17 +9558,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7456
+#: ../src/protocols/oscar/oscar.c:7439
 #, 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:7457
+#: ../src/protocols/oscar/oscar.c:7440
 msgid "Authorization Granted"
 msgstr "Valtuutus hyv辰ksytty"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7460
+#: ../src/protocols/oscar/oscar.c:7443
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9319,92 +9579,92 @@
 "syyst辰:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7461
+#: ../src/protocols/oscar/oscar.c:7444
 msgid "Authorization Denied"
 msgstr "Valtuutus ev辰tty"
 
-#: ../src/protocols/oscar/oscar.c:7498 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../src/protocols/oscar/oscar.c:7534
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhm辰keskustelun nimi annettu."
 
-#: ../src/protocols/oscar/oscar.c:7604
+#: ../src/protocols/oscar/oscar.c:7587
 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:7760
+#: ../src/protocols/oscar/oscar.c:7742
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8080
+#: ../src/protocols/oscar/oscar.c:8048
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti k辰ytt辰j辰lle %s"
 
-#: ../src/protocols/oscar/oscar.c:8081
+#: ../src/protocols/oscar/oscar.c:8049
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../src/protocols/oscar/oscar.c:8100
+#: ../src/protocols/oscar/oscar.c:8068
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
+#: ../src/protocols/oscar/oscar.c:8075
+msgid "Get Status Msg"
+msgstr "Hae tilaviesti"
+
+#: ../src/protocols/oscar/oscar.c:8088
+msgid "Direct IM"
+msgstr "Suora pikaviesti"
+
 #: ../src/protocols/oscar/oscar.c:8107
-msgid "Get Status Msg"
-msgstr "Hae tilaviesti"
-
-#: ../src/protocols/oscar/oscar.c:8120
-msgid "Direct IM"
-msgstr "Suora pikaviesti"
-
-#: ../src/protocols/oscar/oscar.c:8139
 msgid "Re-request Authorization"
 msgstr "Pyyd辰 valtuutus uudelleen"
 
-#: ../src/protocols/oscar/oscar.c:8196
+#: ../src/protocols/oscar/oscar.c:8164
 msgid "Require authorization"
 msgstr "Pyyd辰 valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:8199
+#: ../src/protocols/oscar/oscar.c:8167
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (t辰m辰n k辰ytt旦 altistaa sinut roskaposteille)"
 
-#: ../src/protocols/oscar/oscar.c:8204
+#: ../src/protocols/oscar/oscar.c:8172
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../src/protocols/oscar/oscar.c:8221
+#: ../src/protocols/oscar/oscar.c:8189
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:8222
+#: ../src/protocols/oscar/oscar.c:8190
 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:8229
+#: ../src/protocols/oscar/oscar.c:8197
 msgid "New screen name formatting:"
 msgstr "Uusi n辰ytt旦nimen muotoilu:"
 
-#: ../src/protocols/oscar/oscar.c:8281
+#: ../src/protocols/oscar/oscar.c:8249
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../src/protocols/oscar/oscar.c:8326
+#: ../src/protocols/oscar/oscar.c:8294
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../src/protocols/oscar/oscar.c:8329
+#: ../src/protocols/oscar/oscar.c:8297
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../src/protocols/oscar/oscar.c:8330
+#: ../src/protocols/oscar/oscar.c:8298
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9412,76 +9672,75 @@
 "Voit pyyt辰辰 valtuutuksen uudelleen n辰ilt辰 tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyyd辰 valtuutus uudelleen\"."
 
-#: ../src/protocols/oscar/oscar.c:8347
+#: ../src/protocols/oscar/oscar.c:8315
 msgid "Find Buddy by E-mail"
 msgstr "Etsi tuttava s辰hk旦postiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8348
+#: ../src/protocols/oscar/oscar.c:8316
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava s辰hk旦postiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8349
+#: ../src/protocols/oscar/oscar.c:8317
 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:8442
+#: ../src/protocols/oscar/oscar.c:8410
 msgid "Set User Info (URL)..."
 msgstr "Aseta k辰ytt辰j辰tiedot (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8453
+#: ../src/protocols/oscar/oscar.c:8421
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8457
+#: ../src/protocols/oscar/oscar.c:8425
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenl辰hetys (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8467
+#: ../src/protocols/oscar/oscar.c:8435
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8474
+#: ../src/protocols/oscar/oscar.c:8442
 msgid "Format Screen Name..."
 msgstr "Muotoile n辰ytt旦nimi..."
 
-#: ../src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8446
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../src/protocols/oscar/oscar.c:8482
+#: ../src/protocols/oscar/oscar.c:8450
 msgid "Display Currently Registered Address"
 msgstr "N辰yt辰 rekister旦ity osoite"
 
-#: ../src/protocols/oscar/oscar.c:8486
+#: ../src/protocols/oscar/oscar.c:8454
 msgid "Change Currently Registered Address..."
 msgstr "Muuta rekister旦ity辰 osoitetta"
 
-#: ../src/protocols/oscar/oscar.c:8493
+#: ../src/protocols/oscar/oscar.c:8461
 msgid "Show Buddies Awaiting Authorization"
 msgstr "N辰yt辰 tuttavat jotka odottavat valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:8499
+#: ../src/protocols/oscar/oscar.c:8467
 msgid "Search for Buddy by Email..."
 msgstr "Etsi tuttava s辰hk旦postiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8504
+#: ../src/protocols/oscar/oscar.c:8472
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:8571
+#: ../src/protocols/oscar/oscar.c:8539
 msgid "Use recent buddies group"
 msgstr "K辰yt辰 viimeaikaisten tuttavien ryhm辰辰"
 
-#: ../src/protocols/oscar/oscar.c:8574
+#: ../src/protocols/oscar/oscar.c:8542
 msgid "Show how long you have been idle"
 msgstr "N辰ytt辰辰 kuinka kauan olet ollut jouten."
 
-#: ../src/protocols/oscar/oscar.c:8583
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-"K辰yt辰 AIM/ICQ-v辰lipalvelinta (hitaampi/turvallisempi/toimii useimmiten)"
+#: ../src/protocols/oscar/oscar.c:8551
+msgid "Use AIM/ICQ proxy server (slower, but usually works)"
+msgstr "K辰yt辰 AIM/ICQ-v辰lipalvelinta (hitaampi, mutta toimii useimmiten)"
 
 #. *< type
 #. *< ui_requirement
@@ -9493,175 +9752,165 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8716 ../src/protocols/oscar/oscar.c:8718
+#: ../src/protocols/oscar/oscar.c:8684 ../src/protocols/oscar/oscar.c:8686
 msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ-protokollaliit辰nn辰inen"
-
-#: ../src/protocols/oscar/oscar.c:8737
+msgstr "AIM/ICQ-yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/oscar/oscar.c:8705
 msgid "Auth host"
 msgstr "Kirjautumispalvelin"
 
-#: ../src/protocols/oscar/oscar.c:8740
+#: ../src/protocols/oscar/oscar.c:8708
 msgid "Auth port"
 msgstr "Portti"
 
-#: ../src/protocols/oscar/oscar.c:8743 ../src/protocols/zephyr/zephyr.c:2901
+#: ../src/protocols/oscar/oscar.c:8711 ../src/protocols/zephyr/zephyr.c:2901
 msgid "Encoding"
 msgstr "Merkist旦"
 
-#: ../src/protocols/sametime/sametime.c:359
+#: ../src/protocols/oscar/oscar.c:8715
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr ""
+"K辰yt辰 AIM/ICQ-v辰lipalvelinta\n"
+"(hitaampi, mutta toimii useimmiten)"
+
+#: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
 
-#: ../src/protocols/sametime/sametime.c:1204
+#: ../src/protocols/sametime/sametime.c:1267
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhm辰n nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1205
+#: ../src/protocols/sametime/sametime.c:1268
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notesin ryhm辰-ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1207
+#: ../src/protocols/sametime/sametime.c:1270
 #, c-format
 msgid "Info for Group %s"
 msgstr "Tietoja ryhm辰st辰 %s"
 
-#: ../src/protocols/sametime/sametime.c:1209
+#: ../src/protocols/sametime/sametime.c:1272
 msgid "Notes Address Book Information"
 msgstr "Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1241
+#: ../src/protocols/sametime/sametime.c:1304
 msgid "Invite Group to Conference..."
 msgstr "Kutsu ryhm辰 neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:1251
+#: ../src/protocols/sametime/sametime.c:1314
 msgid "Get Notes Address Book Info"
 msgstr "Hae Notesin osoitekirjatiedot"
 
-#: ../src/protocols/sametime/sametime.c:1404
+#: ../src/protocols/sametime/sametime.c:1467
 msgid "Sending Handshake"
 msgstr "L辰hetet辰辰n k辰ttely辰"
 
-#: ../src/protocols/sametime/sametime.c:1409
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Odotetaan k辰ttelyn vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1414
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "K辰ttely vahvistettu, kirjaudutaan"
 
-#: ../src/protocols/sametime/sametime.c:1419
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
 msgstr "Odotetaan kirjautumisen vahvistusta"
 
-#: ../src/protocols/sametime/sametime.c:1424
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Login Redirected"
 msgstr "Sis辰辰nkirjautuminen uudelleenohjattu"
 
-#: ../src/protocols/sametime/sametime.c:1430
+#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
 msgstr "Pakotetaan sis辰辰nkirjautuminen"
 
-#: ../src/protocols/sametime/sametime.c:1434
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
 msgstr "Kirjautuminen vahvistettu"
 
-#: ../src/protocols/sametime/sametime.c:1439
+#: ../src/protocols/sametime/sametime.c:1502
 msgid "Starting Services"
 msgstr "K辰ynnistet辰辰n palveluja"
 
-#: ../src/protocols/sametime/sametime.c:1444
+#: ../src/protocols/sametime/sametime.c:1507
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../src/protocols/sametime/sametime.c:1541
+#: ../src/protocols/sametime/sametime.c:1605
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime-yll辰pit辰j辰 on julkaissut seuraavan tiedotteen palvelimella %s"
 
-#: ../src/protocols/sametime/sametime.c:1546
+#: ../src/protocols/sametime/sametime.c:1610
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-yll辰pit辰j辰n tiedote"
 
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../src/protocols/sametime/sametime.c:1662
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../src/protocols/sametime/sametime.c:1612
+#: ../src/protocols/sametime/sametime.c:1669
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Virhe luettaessa socketista: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1641
-#: ../src/protocols/sametime/sametime.c:3636
+#: ../src/protocols/sametime/sametime.c:1698
+#: ../src/protocols/sametime/sametime.c:3696
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteytt辰"
 
-#: ../src/protocols/sametime/sametime.c:1678
+#: ../src/protocols/sametime/sametime.c:1736
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus k辰ytt辰j辰lt辰 %s"
 
-#: ../src/protocols/sametime/sametime.c:1852
+#: ../src/protocols/sametime/sametime.c:1910
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../src/protocols/sametime/sametime.c:2315
+#: ../src/protocols/sametime/sametime.c:2367
 msgid "Unable to send message: "
 msgstr "Viesti辰 ei voitu l辰hett辰辰: "
 
-#: ../src/protocols/sametime/sametime.c:2914
+#: ../src/protocols/sametime/sametime.c:2926
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../src/protocols/sametime/sametime.c:3203
+#: ../src/protocols/sametime/sametime.c:3217
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../src/protocols/sametime/sametime.c:3204
+#: ../src/protocols/sametime/sametime.c:3218
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../src/protocols/sametime/sametime.c:3205
+#: ../src/protocols/sametime/sametime.c:3219
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3209
+#: ../src/protocols/sametime/sametime.c:3223
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../src/protocols/sametime/sametime.c:3230
-#, c-format
-msgid ""
-"\n"
-"<b>Status</b>: %s"
-msgstr ""
-"\n"
-"<b>Tila</b>: %s"
-
-#: ../src/protocols/sametime/sametime.c:3235
-#, c-format
-msgid ""
-"\n"
-"<b>Message</b>: %s"
-msgstr ""
-"\n"
-"<b>Viesti:</b> %s"
-
-#: ../src/protocols/sametime/sametime.c:3241
-#, c-format
-msgid ""
-"\n"
-"<b>Supports</b>: %s"
+#: ../src/protocols/sametime/sametime.c:3257
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
 msgstr ""
 "\n"
 "<b>Tukee</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3246
+#: ../src/protocols/sametime/sametime.c:3262
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9669,11 +9918,11 @@
 "\n"
 "<b>Ulkoinen k辰ytt辰j辰</b>"
 
-#: ../src/protocols/sametime/sametime.c:3353
+#: ../src/protocols/sametime/sametime.c:3368
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu k辰ytt辰j辰n kanssa"
 
-#: ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/sametime/sametime.c:3369
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9682,27 +9931,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sek辰 kutsuviesti joka l辰hetet辰辰n "
 "k辰ytt辰j辰lle %s"
 
-#: ../src/protocols/sametime/sametime.c:3358
+#: ../src/protocols/sametime/sametime.c:3373
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/sametime/sametime.c:3360
+#: ../src/protocols/sametime/sametime.c:3375
 msgid "Create"
 msgstr "Aloita"
 
-#: ../src/protocols/sametime/sametime.c:3422
+#: ../src/protocols/sametime/sametime.c:3439
 msgid "Available Conferences"
 msgstr "K辰ynniss辰 olevat neuvottelut"
 
-#: ../src/protocols/sametime/sametime.c:3428
+#: ../src/protocols/sametime/sametime.c:3445
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../src/protocols/sametime/sametime.c:3435
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite user to a conference"
 msgstr "Kutsu k辰ytt辰j辰 neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3436
+#: ../src/protocols/sametime/sametime.c:3453
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9713,23 +9962,27 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua t辰m辰n k辰ytt辰j辰n sinne."
 
-#: ../src/protocols/sametime/sametime.c:3441
+#: ../src/protocols/sametime/sametime.c:3458
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../src/protocols/sametime/sametime.c:3443
+#: ../src/protocols/sametime/sametime.c:3460
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/protocols/sametime/sametime.c:3495
+#: ../src/protocols/sametime/sametime.c:3548
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../src/protocols/sametime/sametime.c:3541
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr "L辰het辰 TEST-ilmoitus"
+
+#: ../src/protocols/sametime/sametime.c:3600
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteis旦palvelinta ei ole m辰辰ritelty"
 
-#: ../src/protocols/sametime/sametime.c:3562
+#: ../src/protocols/sametime/sametime.c:3622
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -9738,66 +9991,66 @@
 "Is辰nt辰辰 tai IP-osoitetta ei ole astetettu Meanwhile-k辰ytt辰j辰tilille %s. "
 "Lis辰辰 sellainen alle ennen kirjautumista sis辰辰n."
 
-#: ../src/protocols/sametime/sametime.c:3567
+#: ../src/protocols/sametime/sametime.c:3627
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../src/protocols/sametime/sametime.c:3568
+#: ../src/protocols/sametime/sametime.c:3628
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteis旦palvelinta ei ole m辰辰ritelty"
 
-#: ../src/protocols/sametime/sametime.c:3570
+#: ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "Yhdist辰"
 
-#: ../src/protocols/sametime/sametime.c:4114
+#: ../src/protocols/sametime/sametime.c:4085
 msgid "<b>External User</b><br>"
 msgstr "<b>Ulkoinen k辰ytt辰j辰</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4117
+#: ../src/protocols/sametime/sametime.c:4088
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>K辰ytt辰j辰n ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4123
+#: ../src/protocols/sametime/sametime.c:4094
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Koko nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4129
+#: ../src/protocols/sametime/sametime.c:4100
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Viimeksi n辰hty asiakas:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4137
+#: ../src/protocols/sametime/sametime.c:4108
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4144
+#: ../src/protocols/sametime/sametime.c:4115
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Tukee:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4150
+#: ../src/protocols/sametime/sametime.c:4121
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4291
-#: ../src/protocols/sametime/sametime.c:5438
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5428
 msgid "User Name"
 msgstr "K辰ytt辰j辰nimi"
 
-#: ../src/protocols/sametime/sametime.c:4294
-#: ../src/protocols/sametime/sametime.c:5441
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5431
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../src/protocols/sametime/sametime.c:4318
+#: ../src/protocols/sametime/sametime.c:4291
 msgid "An ambiguous user ID was entered"
 msgstr "Ep辰selv辰 k辰ytt辰j辰tunnus sy旦tetty"
 
-#: ../src/protocols/sametime/sametime.c:4319
+#: ../src/protocols/sametime/sametime.c:4292
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -9806,15 +10059,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista k辰ytt辰jist辰. Valitse "
 "oikea k辰ytt辰j辰 alla olevasta luettelosta lis辰t辰ksesi h辰net tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:4324
+#: ../src/protocols/sametime/sametime.c:4297
 msgid "Select User"
 msgstr "Valitse k辰ytt辰j辰"
 
-#: ../src/protocols/sametime/sametime.c:4392
+#: ../src/protocols/sametime/sametime.c:4367
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lis辰t辰 k辰ytt辰j辰辰: k辰ytt辰j辰辰 ei l旦ydy"
 
-#: ../src/protocols/sametime/sametime.c:4394
+#: ../src/protocols/sametime/sametime.c:4369
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -9823,11 +10076,11 @@
 "Tunnisteella '%s' ei l旦ytynyt osumia Sametime-yhteis旦st辰si. T辰m辰 hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../src/protocols/sametime/sametime.c:4399
+#: ../src/protocols/sametime/sametime.c:4374
 msgid "Unable to add user"
 msgstr "Ei voitu lis辰t辰 k辰ytt辰j辰辰"
 
-#: ../src/protocols/sametime/sametime.c:4969
+#: ../src/protocols/sametime/sametime.c:4946
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9836,64 +10089,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5098
+#: ../src/protocols/sametime/sametime.c:5078
 msgid "Remotely Stored Buddy List"
 msgstr "Et辰tallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../src/protocols/sametime/sametime.c:5103
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../src/protocols/sametime/sametime.c:5106
+#: ../src/protocols/sametime/sametime.c:5086
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../src/protocols/sametime/sametime.c:5108
+#: ../src/protocols/sametime/sametime.c:5088
 msgid "Merge List from Server"
 msgstr "Yhdist辰 tuttavalista palvelimelta"
 
-#: ../src/protocols/sametime/sametime.c:5110
+#: ../src/protocols/sametime/sametime.c:5090
 msgid "Merge and Save List to Server"
 msgstr "Yhdist辰 ja tallenna lista palvelimelle"
 
-#: ../src/protocols/sametime/sametime.c:5112
+#: ../src/protocols/sametime/sametime.c:5092
 msgid "Synchronize List with Server"
 msgstr "T辰sm辰辰 lista palvelimen kanssa"
 
-#: ../src/protocols/sametime/sametime.c:5161
+#: ../src/protocols/sametime/sametime.c:5141
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista k辰ytt辰j辰tililt辰 %s"
 
-#: ../src/protocols/sametime/sametime.c:5200
+#: ../src/protocols/sametime/sametime.c:5180
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista k辰ytt辰j辰tilille %s"
 
-#: ../src/protocols/sametime/sametime.c:5251
+#: ../src/protocols/sametime/sametime.c:5233
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lis辰t辰 ryhm辰辰: ryhm辰 on jo olemassa"
 
-#: ../src/protocols/sametime/sametime.c:5252
+#: ../src/protocols/sametime/sametime.c:5234
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhm辰 '%s' on jo tuttavalistallasi."
 
-#: ../src/protocols/sametime/sametime.c:5255
-#: ../src/protocols/sametime/sametime.c:5380
+#: ../src/protocols/sametime/sametime.c:5237
+#: ../src/protocols/sametime/sametime.c:5366
 msgid "Unable to add group"
 msgstr "Ryhm辰辰 ei voitu lis辰t辰"
 
+#: ../src/protocols/sametime/sametime.c:5296
+msgid "Possible Matches"
+msgstr "Mahdollisia osumia"
+
 #: ../src/protocols/sametime/sametime.c:5312
-msgid "Possible Matches"
-msgstr "Mahdollisia osumia"
-
-#: ../src/protocols/sametime/sametime.c:5328
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhm辰tulokset"
 
-#: ../src/protocols/sametime/sametime.c:5329
+#: ../src/protocols/sametime/sametime.c:5313
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -9904,15 +10157,15 @@
 "ryhmist辰. Valitse oikea ryhm辰 alla olevasta luettelosta lis辰t辰ksesi sen "
 "tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5334
+#: ../src/protocols/sametime/sametime.c:5318
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../src/protocols/sametime/sametime.c:5374
+#: ../src/protocols/sametime/sametime.c:5360
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lis辰t辰 ryhm辰辰: ryhm辰辰 ei l旦ytynyt"
 
-#: ../src/protocols/sametime/sametime.c:5376
+#: ../src/protocols/sametime/sametime.c:5362
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -9921,11 +10174,11 @@
 "Tunnisteella '%s' ei l旦ytynyt osumia Sametime-yhteis旦si Notesin osoitekirjan "
 "ryhmist辰."
 
-#: ../src/protocols/sametime/sametime.c:5416
+#: ../src/protocols/sametime/sametime.c:5403
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhm辰"
 
-#: ../src/protocols/sametime/sametime.c:5417
+#: ../src/protocols/sametime/sametime.c:5404
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -9933,12 +10186,12 @@
 "Kirjoita Notesin osoitekirjan ryhm辰n nimi allaolevaan kentt辰辰n lis辰t辰ksesi "
 "ryhm辰n ja sen j辰senet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5462
+#: ../src/protocols/sametime/sametime.c:5452
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5463
+#: ../src/protocols/sametime/sametime.c:5453
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -9949,24 +10202,24 @@
 "lis辰t辰 n辰m辰 k辰ytt辰j辰t tuttavalistallesi tai l辰hett辰辰 heille viestej辰 alla "
 "olevilla painikkeilla."
 
-#: ../src/protocols/sametime/sametime.c:5492
+#: ../src/protocols/sametime/sametime.c:5485
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5493
-#, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community."
+#: ../src/protocols/sametime/sametime.c:5486
+#, c-format
+msgid "The identifier '%s' did not match and users in your Sametime community."
 msgstr "Tunnisteella '%s' ei l旦ytynyt osumia Sametime-yhteis旦st辰si."
 
-#: ../src/protocols/sametime/sametime.c:5497
+#: ../src/protocols/sametime/sametime.c:5490
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5533
+#: ../src/protocols/sametime/sametime.c:5527
 msgid "Search for a user"
 msgstr "Etsi k辰ytt辰ji辰"
 
-#: ../src/protocols/sametime/sametime.c:5534
+#: ../src/protocols/sametime/sametime.c:5528
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -9974,37 +10227,32 @@
 "Kirjoita nimi tai osittainen k辰ytt辰j辰tunnus alla olevaan kentt辰辰n etsi辰ksesi "
 "k辰ytt辰ji辰 Sametime-yhteis旦st辰si."
 
-#: ../src/protocols/sametime/sametime.c:5537
+#: ../src/protocols/sametime/sametime.c:5531
 msgid "User Search"
 msgstr "K辰ytt辰j辰haku"
 
-#: ../src/protocols/sametime/sametime.c:5549
+#: ../src/protocols/sametime/sametime.c:5543
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5553
+#: ../src/protocols/sametime/sametime.c:5547
 msgid "Export Sametime List..."
 msgstr "Vie sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5557
+#: ../src/protocols/sametime/sametime.c:5551
 msgid "Add Notes Address Book Group..."
 msgstr "Lis辰辰 Notesin osoitekirjan ryhm辰..."
 
-#: ../src/protocols/sametime/sametime.c:5561
+#: ../src/protocols/sametime/sametime.c:5555
 msgid "User Search..."
 msgstr "K辰ytt辰j辰haku..."
 
-#. notesbuddy hack encoding
-#: ../src/protocols/sametime/sametime.c:5656
-msgid "NotesBuddy encoding"
-msgstr "NotesBuddy-koodaustapa"
-
-#: ../src/protocols/sametime/sametime.c:5666
+#: ../src/protocols/sametime/sametime.c:5652
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sis辰辰nkirjautuminen (辰l辰 v辰lit辰 palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5676
+#: ../src/protocols/sametime/sametime.c:5662
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10102,7 +10350,7 @@
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1654
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "N辰yt辰 julkinen avain"
 
@@ -10252,56 +10500,56 @@
 msgid "Anxious"
 msgstr "Levoton"
 
-#: ../src/protocols/silc/buddy.c:1538 ../src/protocols/silc/ops.c:1196
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "K辰ytt辰j辰tilat"
 
-#: ../src/protocols/silc/buddy.c:1554 ../src/protocols/silc/ops.c:1205
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../src/protocols/silc/buddy.c:1559 ../src/protocols/silc/ops.c:1217
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: ../src/protocols/silc/buddy.c:1564 ../src/protocols/silc/ops.c:1222
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
-#: ../src/protocols/silc/buddy.c:1569 ../src/protocols/silc/ops.c:1227
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Laite"
 
-#: ../src/protocols/silc/buddy.c:1574 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
 #: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Aikavy旦hyke"
 
-#: ../src/protocols/silc/buddy.c:1579 ../src/protocols/silc/ops.c:1237
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: ../src/protocols/silc/buddy.c:1636
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Tyhjenn辰 pikaviestiavain"
 
-#: ../src/protocols/silc/buddy.c:1642
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: ../src/protocols/silc/buddy.c:1647
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../src/protocols/silc/buddy.c:1660
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: ../src/protocols/silc/buddy.c:1667 ../src/protocols/silc/ops.c:1623
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Poista k辰ytt辰j辰"
 
-#: ../src/protocols/silc/buddy.c:1677 ../src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
 msgid "Draw On Whiteboard"
 msgstr "Piirr辰 kirjoitustaululle"
 
@@ -10825,11 +11073,11 @@
 
 #: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Virhe: Et辰kone ei tuo ehdotettua PKCS:a"
+msgstr "Virhe: Et辰kone ei tuo ehdotettua PKCS:aa"
 
 #: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Virhe: Et辰kone ei tue ehdotettua hash-funktiota"
+msgstr "Virhe: Et辰kone ei tue ehdotettua tiivistysfunktiota"
 
 #: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
@@ -10904,7 +11152,7 @@
 
 #: ../src/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
-msgstr "Ei voida alustaa SILC-protokollaa"
+msgstr "Ei voida alustaa SILC-yhteysk辰yt辰nt旦辰"
 
 #: ../src/protocols/silc/silc.c:331
 msgid "Cannot find/access ~/.silc directory"
@@ -10928,10 +11176,6 @@
 msgid "Your Current Mood"
 msgstr "T辰m辰nhetkinen mielialasi"
 
-#: ../src/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normaali"
-
 #: ../src/protocols/silc/silc.c:691
 msgid ""
 "\n"
@@ -11096,11 +11340,11 @@
 
 #: ../src/protocols/silc/silc.c:1606
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [<uusi aihe>]: N辰yt辰 tai aseta aihe"
+msgstr "topic [&lt;uusi aihe&gt;]: N辰yt辰 tai aseta aihe"
 
 #: ../src/protocols/silc/silc.c:1611
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join <kanava> [<salasana>]: Liity kanavalle t辰ss辰 verkossa"
+msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle t辰ss辰 verkossa"
 
 #: ../src/protocols/silc/silc.c:1615
 msgid "list:  List channels on this network"
@@ -11112,11 +11356,11 @@
 
 #: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
 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"
+msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: L辰het辰 yksityisviesti k辰ytt辰j辰lle"
 
 #: ../src/protocols/silc/silc.c:1627
 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"
+msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: L辰het辰 yksityisviesti k辰ytt辰j辰lle"
 
 #: ../src/protocols/silc/silc.c:1631
 msgid "motd:  View the server's Message Of The Day"
@@ -11132,11 +11376,11 @@
 
 #: ../src/protocols/silc/silc.c:1643
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call <komento>: Kutsu mit辰 vain silc:n asiakaskomentoa."
+msgstr "call &lt;komento&gt;: Kutsu mit辰 vain silc:n asiakaskomentoa."
 
 #: ../src/protocols/silc/silc.c:1649
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill <nimi> [-pubkey|<syy>]: Tuhoa nimi"
+msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
 #: ../src/protocols/silc/silc.c:1653
 msgid "nick &lt;newnick&gt;:  Change your nickname"
@@ -11151,33 +11395,37 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode <kanava> [+|-<tilagt;] [argumentit]: Aseta tai n辰yt辰 kanavan tilat."
+"cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai n辰yt辰 kanavan "
+"tilat."
 
 #: ../src/protocols/silc/silc.c:1665
 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."
+msgstr ""
+"cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
+"kanavalla."
 
 #: ../src/protocols/silc/silc.c:1669
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode <k辰ytt辰j辰tilat>: Aseta omat tilasi verkossa"
+msgstr "umode &lt;k辰ytt辰j辰tilat&gt;: Aseta omat tilasi verkossa"
 
 #: ../src/protocols/silc/silc.c:1673
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper <nimi> [-pubkey]: Palvelinoperaattorin oikeudet"
+msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
 #: ../src/protocols/silc/silc.c:1677
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite <kanava> [-|+]<nimi>: Kutsu k辰ytt辰j辰 tai lis辰辰/poista kanavan kutsu- "
-"listalta"
+"invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu k辰ytt辰j辰 tai lis辰辰/poista "
+"kanavan kutsu- listalta"
 
 #: ../src/protocols/silc/silc.c:1681
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick <kanava> <nimi> [kommentti]: Poista k辰ytt辰j辰 kanavalta"
+msgstr ""
+"kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista k辰ytt辰j辰 kanavalta"
 
 #: ../src/protocols/silc/silc.c:1685
 msgid "info [server]:  View server administrative details"
@@ -11185,11 +11433,12 @@
 
 #: ../src/protocols/silc/silc.c:1689
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban <kanava> +|-<nimi>]: Kiell辰 k辰ytt辰j辰 kanavalta"
+msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiell辰 k辰ytt辰j辰 kanavalta"
 
 #: ../src/protocols/silc/silc.c:1693
 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"
+msgstr ""
+"getkey &lt;nimi|palvelin&gt;: Hae k辰ytt辰j辰n tai palvelimen julkinen avain"
 
 #: ../src/protocols/silc/silc.c:1697
 msgid "stats:  View server and network statistics"
@@ -11208,7 +11457,7 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] <kanava(t)>: N辰yt辰 tietyt "
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanava(t)&gt;: N辰yt辰 tietyt "
 "k辰ytt辰j辰t kanavilla"
 
 #. *< type
@@ -11222,12 +11471,12 @@
 #. *  summary
 #: ../src/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
-msgstr "SILC-protokollaliit辰nn辰inen"
+msgstr "SILC-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #. *  description
 #: ../src/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Secure Internet Live Conferencing (SILC) protokolla"
+msgstr "Secure Internet Live Conferencing (SILC) -yhteysk辰yt辰nt旦"
 
 #: ../src/protocols/silc/silc.c:1859
 msgid "Public Key file"
@@ -11383,16 +11632,29 @@
 msgid "Whiteboard"
 msgstr "Kirjoitustaulu"
 
-#: ../src/protocols/simple/simple.c:1207 ../src/protocols/simple/simple.c:1246
-#: ../src/protocols/simple/simple.c:1258 ../src/protocols/simple/simple.c:1305
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:415
+msgid "Could not write"
+msgstr "Ei voitu kirjoittaa"
+
+#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+msgid "Could not connect"
+msgstr "Ei voitu yhdist辰辰"
+
+#: ../src/protocols/simple/simple.c:924
+msgid "Wrong Password"
+msgstr "V辰辰r辰 salasana"
+
+#: ../src/protocols/simple/simple.c:1362 ../src/protocols/simple/simple.c:1401
+#: ../src/protocols/simple/simple.c:1413 ../src/protocols/simple/simple.c:1460
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen ep辰onnistui"
 
-#: ../src/protocols/simple/simple.c:1228
+#: ../src/protocols/simple/simple.c:1383
 msgid "Couldn't resolve host"
 msgstr "Yhteytt辰 is辰nt辰辰n ei voitu l旦yt辰辰"
 
-#: ../src/protocols/simple/simple.c:1331
+#: ../src/protocols/simple/simple.c:1481
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-k辰ytt辰j辰nimiss辰 ei tule olla v辰lily旦ntej辰 tai @-merkkej辰"
 
@@ -11404,31 +11666,39 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1477
+#: ../src/protocols/simple/simple.c:1643
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE-protokollaliit辰nn辰inen"
+msgstr "SIP/SIMPLE-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1478
+#: ../src/protocols/simple/simple.c:1644
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE-protokollaliit辰nn辰inen"
-
-#: ../src/protocols/simple/simple.c:1500
+msgstr "SIP/SIMPLE-yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/simple/simple.c:1666
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../src/protocols/simple/simple.c:1507
+#: ../src/protocols/simple/simple.c:1672
 msgid "Use UDP"
 msgstr "K辰yt辰 UDP:t辰"
 
-#: ../src/protocols/simple/simple.c:1509
+#: ../src/protocols/simple/simple.c:1674
 msgid "Use proxy"
 msgstr "K辰yt辰 v辰lipalvelinta"
 
-#: ../src/protocols/simple/simple.c:1511
+#: ../src/protocols/simple/simple.c:1676
 msgid "Proxy"
 msgstr "V辰lipalvelin"
 
+#: ../src/protocols/simple/simple.c:1678
+msgid "Auth User"
+msgstr "Todennus/k辰ytt辰j辰"
+
+#: ../src/protocols/simple/simple.c:1680
+msgid "Auth Domain"
+msgstr "Todennus/verkkoalue"
+
 #: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
@@ -11658,7 +11928,7 @@
 #. *  description
 #: ../src/protocols/toc/toc.c:2320 ../src/protocols/toc/toc.c:2322
 msgid "TOC Protocol Plugin"
-msgstr "TOC-protokollaliit辰nn辰inen"
+msgstr "TOC-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #: ../src/protocols/toc/toc.c:2341
 msgid "TOC host"
@@ -11672,11 +11942,11 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viesti辰si ei l辰hetetty."
 
-#: ../src/protocols/yahoo/yahoo.c:758 ../src/protocols/yahoo/yahoo.c:3504
+#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3561
 msgid "Buzz!!"
 msgstr "Huomio!"
 
-#: ../src/protocols/yahoo/yahoo.c:803
+#: ../src/protocols/yahoo/yahoo.c:810
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-j辰rjestelm辰viesti k辰ytt辰j辰lle %s:"
@@ -11684,23 +11954,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:899
+#: ../src/protocols/yahoo/yahoo.c:906
 #, 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:905
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Message (optional) :"
 msgstr "Viesti (valinnainen) :"
 
-#: ../src/protocols/yahoo/yahoo.c:947
+#: ../src/protocols/yahoo/yahoo.c:954
 #, 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:950
+#: ../src/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11709,11 +11979,11 @@
 "K辰ytt辰j辰 %s on (taannehtivasti) ev辰nnyt pyynt旦si lis辰t辰 h辰net "
 "tuttavalistallesi seuraavasta syyst辰: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:953
+#: ../src/protocols/yahoo/yahoo.c:960
 msgid "Add buddy rejected"
 msgstr "Tuttavan lis辰辰minen estetty"
 
-#: ../src/protocols/yahoo/yahoo.c:1696
+#: ../src/protocols/yahoo/yahoo.c:1703
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11724,11 +11994,11 @@
 "versio ei todenn辰k旦isesti pysty kirjautumaan Yahoo-palveluun. Tarkista "
 "p辰ivitykset osoitteesta: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1699
+#: ../src/protocols/yahoo/yahoo.c:1706
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus ep辰onnistui"
 
-#: ../src/protocols/yahoo/yahoo.c:1765
+#: ../src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11738,19 +12008,19 @@
 "tuttavalistalla. Painaessasi \"Kyll辰\" poistat h辰net tuttavalistalta eik辰 "
 "h辰nelt辰 saapuneista viesteist辰 en辰辰 v辰litet辰."
 
-#: ../src/protocols/yahoo/yahoo.c:1768
+#: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "J辰t辰 tuttava huomiotta?"
 
-#: ../src/protocols/yahoo/yahoo.c:1802
+#: ../src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Ep辰kelpo k辰ytt辰j辰nimi."
 
-#: ../src/protocols/yahoo/yahoo.c:1813
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "Tavallinen tunnistautumismenetelm辰 ep辰onnistui!"
 
-#: ../src/protocols/yahoo/yahoo.c:1814
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11762,133 +12032,137 @@
 "muuttunut. Gaim yritt辰辰 nyt kirjautua k辰ytt辰en Web Messenger- "
 "tunnistautumista josta seuraa v辰hentynyt toiminnallisuus ja ominaisuudet."
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../src/protocols/yahoo/yahoo.c:1825
+#: ../src/protocols/yahoo/yahoo.c:1832
 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:1828
+#: ../src/protocols/yahoo/yahoo.c:1835
 #, 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:1882
+#: ../src/protocols/yahoo/yahoo.c:1889
 #, 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:1885
+#: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lis辰t辰 tuttavaa palvelimen listalle"
 
-#: ../src/protocols/yahoo/yahoo.c:2004
+#: ../src/protocols/yahoo/yahoo.c:2011
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ �辰ni辰inen %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2143 ../src/protocols/yahoo/yahoo.c:2289
-#: ../src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/yahoo.c:2439
-#: ../src/protocols/yahoo/yahoo.c:2538 ../src/protocols/yahoo/yahoo.c:2548
-#: ../src/protocols/yahoo/yahoochat.c:1407
-#: ../src/protocols/yahoo/yahoochat.c:1477 ../src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
+#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/yahoo/yahoo.c:2655 ../src/protocols/yahoo/yahoo.c:3237
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3294
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../src/protocols/yahoo/yahoo.c:2657 ../src/protocols/yahoo/yahoo.c:3240
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3297
 msgid "Not at Desk"
 msgstr "Poissa ty旦p旦yd辰lt辰"
 
-#: ../src/protocols/yahoo/yahoo.c:2659 ../src/protocols/yahoo/yahoo.c:3243
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3300
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../src/protocols/yahoo/yahoo.c:2663 ../src/protocols/yahoo/yahoo.c:3249
+#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3306
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2667 ../src/protocols/yahoo/yahoo.c:3255
+#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3312
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../src/protocols/yahoo/yahoo.c:2760 ../src/protocols/yahoo/yahoo.c:2789
+#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2806 ../src/protocols/yahoo/yahoo.c:2867
+#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
 msgid "Appear Online"
 msgstr "N辰yt辰 linjoilla olevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2809 ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
 msgid "Appear Permanently Offline"
 msgstr "N辰yt辰 pysyv辰sti poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2828
+#: ../src/protocols/yahoo/yahoo.c:2887
 msgid "Presence"
 msgstr "L辰sn辰olo"
 
-#: ../src/protocols/yahoo/yahoo.c:2873
+#: ../src/protocols/yahoo/yahoo.c:2930
 msgid "Appear Offline"
 msgstr "N辰yt辰 poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2883
+#: ../src/protocols/yahoo/yahoo.c:2939
 msgid "Don't Appear Permanently Offline"
 msgstr "�l辰 n辰yt辰 pysyv辰sti poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2930
+#: ../src/protocols/yahoo/yahoo.c:2987
 msgid "Join in Chat"
 msgstr "Liity ryhm辰keskusteluun"
 
-#: ../src/protocols/yahoo/yahoo.c:2936
+#: ../src/protocols/yahoo/yahoo.c:2993
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/yahoo/yahoo.c:2964
+#: ../src/protocols/yahoo/yahoo.c:3021
 msgid "Presence Settings"
 msgstr "L辰sn辰oloasetukset"
 
-#: ../src/protocols/yahoo/yahoo.c:2970
+#: ../src/protocols/yahoo/yahoo.c:3027
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../src/protocols/yahoo/yahoo.c:3002
+#: ../src/protocols/yahoo/yahoo.c:3059
 msgid "Active which ID?"
 msgstr "Mink辰 tunnuksen (ID) haluat aktivoida?"
 
-#: ../src/protocols/yahoo/yahoo.c:3011
+#: ../src/protocols/yahoo/yahoo.c:3068
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liityt辰辰n ryhm辰keskustelussa?"
 
-#: ../src/protocols/yahoo/yahoo.c:3021
+#: ../src/protocols/yahoo/yahoo.c:3078
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../src/protocols/yahoo/yahoo.c:3025
+#: ../src/protocols/yahoo/yahoo.c:3082
 msgid "Join User in Chat..."
 msgstr "Liity k辰ytt辰j辰n seuraan ryhm辰keskustelussa..."
 
-#: ../src/protocols/yahoo/yahoo.c:3552
+#: ../src/protocols/yahoo/yahoo.c:3620
 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:3556
+msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
+
+#: ../src/protocols/yahoo/yahoo.c:3625
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Listaa kanavat Yahoo-verkossa"
+
+#: ../src/protocols/yahoo/yahoo.c:3629
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle 辰辰nimerkki huomion saamiseksi"
 
-#: ../src/protocols/yahoo/yahoo.c:3561
+#: ../src/protocols/yahoo/yahoo.c:3633
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyyd辰 k辰ytt辰j辰辰 aloittamaan piirtelyistunto"
 
@@ -11902,68 +12176,77 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3655 ../src/protocols/yahoo/yahoo.c:3657
+#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
 msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protokollaliit辰nn辰inen"
-
-#: ../src/protocols/yahoo/yahoo.c:3674
+msgstr "Yahoo-yhteysk辰yt辰nt旦liit辰nn辰inen"
+
+#: ../src/protocols/yahoo/yahoo.c:3746
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3677
+#: ../src/protocols/yahoo/yahoo.c:3749
 msgid "Pager host"
 msgstr "Is辰nt辰"
 
-#: ../src/protocols/yahoo/yahoo.c:3680
+#: ../src/protocols/yahoo/yahoo.c:3752
 msgid "Japan Pager host"
 msgstr "Is辰nt辰 (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3683
+#: ../src/protocols/yahoo/yahoo.c:3755
 msgid "Pager port"
 msgstr "Portti"
 
-#: ../src/protocols/yahoo/yahoo.c:3686
+#: ../src/protocols/yahoo/yahoo.c:3758
 msgid "File transfer host"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3689
+#: ../src/protocols/yahoo/yahoo.c:3761
 msgid "Japan file transfer host"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3692
+#: ../src/protocols/yahoo/yahoo.c:3764
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3695
+#: ../src/protocols/yahoo/yahoo.c:3767
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../src/protocols/yahoo/yahoo.c:3698
+#: ../src/protocols/yahoo/yahoo.c:3770
+msgid "Ignore conference and chatroom invitations"
+msgstr "J辰t辰 konferenssi- ja keskusteluhuonekutsut huomiotta"
+
+#: ../src/protocols/yahoo/yahoo.c:3774
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3701
+#: ../src/protocols/yahoo/yahoo.c:3777
 msgid "YCHT host"
 msgstr "YCHT-is辰nt辰"
 
-#: ../src/protocols/yahoo/yahoo.c:3704
+#: ../src/protocols/yahoo/yahoo.c:3780
 msgid "YCHT port"
 msgstr "YCHT-portti"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:696
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "Virhe kirjoituksessa"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-osoite:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:772
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan -profiili"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:773
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profiili"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:817
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -11971,7 +12254,7 @@
 "T辰ll辰 hetkell辰 profiileja jotka on merkitty sis辰lt辰m辰辰n aikuisviihdett辰, ei "
 "tueta."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:819
+#: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -11979,47 +12262,47 @@
 "Jos haluat katsoa t辰t辰 profiilia, sinun tulee seurata t辰t辰 linkki辰 "
 "selaimessasi"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:995
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1067
-#: ../src/protocols/yahoo/yahoo_profile.c:1071
-#: ../src/protocols/yahoo/yahoo_profile.c:1075
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1085
-#: ../src/protocols/yahoo/yahoo_profile.c:1089
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1125
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1130
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1134
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid "Last Update"
 msgstr "Edellinen p辰ivitys"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 #, 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:1159
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -12027,7 +12310,7 @@
 "T辰m辰 profiili n辰ytt辰辰 k辰ytt辰v辰n kielt辰 tai muotoa jota ei tueta t辰ll辰 "
 "hetkell辰."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1175
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12035,7 +12318,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:1178
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
 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 "
@@ -12046,62 +12329,82 @@
 "k辰ytt辰j辰n profiilin. Jos olet varma ett辰 k辰ytt辰j辰 on olemassa, yrit辰 "
 "my旦hemmin uudelleen."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: ../src/protocols/yahoo/yahoo_profile.c:1197
 msgid "The user's profile is empty."
 msgstr "K辰ytt辰j辰n profiili on tyhj辰."
 
-#: ../src/protocols/yahoo/yahoochat.c:202
+#: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s kielt辰ytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
 
-#: ../src/protocols/yahoo/yahoochat.c:204
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Kutsusta kielt辰ydytty"
 
-#: ../src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Ryhm辰keskusteluun liittyminen ep辰onnistui"
 
-#: ../src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Ehk辰 huone on t辰ynn辰?"
-
-#: ../src/protocols/yahoo/yahoochat.c:435
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Tuntematon huone"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Ehk辰 huone on t辰ynn辰"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Ei olemassa"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Tuntematon virhe. Voi olla ett辰 sinun pit辰辰 kirjautua ulos ja odottaa viisi "
+"minuuttia ennen uudelleenliittymist辰 keskusteluhuoneeseen"
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: ../src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen ep辰onnistui"
 
-#: ../src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "Ehk辰 he eiv辰t ole ryhm辰keskustelussa?"
 
-#: ../src/protocols/yahoo/yahoochat.c:1338
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "Huonelistan haku ep辰onnistui."
 
-#: ../src/protocols/yahoo/yahoochat.c:1393
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "�辰net"
 
-#: ../src/protocols/yahoo/yahoochat.c:1396
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: ../src/protocols/yahoo/yahoochat.c:1407
-#: ../src/protocols/yahoo/yahoochat.c:1477
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "Huonelistaa ei voida hakea."
 
-#: ../src/protocols/yahoo/yahoochat.c:1470
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "K辰ytt辰j辰n huoneet"
 
-#: ../src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
 
@@ -12233,7 +12536,7 @@
 #. *  description
 #: ../src/protocols/zephyr/zephyr.c:2856 ../src/protocols/zephyr/zephyr.c:2858
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr-protokollaliit辰nn辰inen"
+msgstr "Zephyr-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #: ../src/protocols/zephyr/zephyr.c:2883
 msgid "Export to .anyone"
@@ -12259,41 +12562,34 @@
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../src/proxy.c:1121 ../src/proxy.c:1151 ../src/proxy.c:1173
-#: ../src/proxy.c:1185
+#: ../src/proxy.c:1212 ../src/proxy.c:1265 ../src/proxy.c:1311
+#: ../src/proxy.c:1332
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "V辰lipalvelimen yhteysvirhe %d"
 
 #. Forbidden
-#: ../src/proxy.c:1181
+#: ../src/proxy.c:1324
 #, 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:2020
+#: ../src/proxy.c:2318
 msgid "Invalid proxy settings"
 msgstr "Ep辰kelvot v辰lipalvelinvalinnat"
 
-#: ../src/proxy.c:2020
+#: ../src/proxy.c:2318
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 "Joko is辰nt辰 tai porttinumero on virheellinen annetulle proxy-asetukselle."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: ../src/request.h:1350
-msgid "_Accept"
-msgstr "_Hyv辰ksy"
-
-#: ../src/savedstatuses.c:509
+#: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
-#: ../src/savedstatuses.c:757
+#: ../src/savedstatuses.c:767
 msgid "I'm not here right now"
 msgstr "En ole t辰辰ll辰 juuri nyt"
 
@@ -12302,7 +12598,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimelt辰辰n %s.\n"
 
-#: ../src/server.c:672
+#: ../src/server.c:675
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12311,12 +12607,12 @@
 "K辰ytt辰j辰 %s on kutsunut k辰ytt辰j辰n %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../src/server.c:677
+#: ../src/server.c:680
 #, 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:681
+#: ../src/server.c:684
 msgid "Accept chat invitation?"
 msgstr "Hyv辰ksy ryhm辰keskustelukutsu?"
 
@@ -12372,12 +12668,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
-#: ../src/util.c:2204
+#: ../src/util.c:649
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2439
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../src/util.c:2205
+#: ../src/util.c:2440
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12386,42 +12687,155 @@
 "%s:n lukemisessa tapahtui virhe. Niit辰 ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimell辰 %s~."
 
-#: ../src/util.c:2700
+#: ../src/util.c:2933
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../src/util.c:2703
+#: ../src/util.c:2936
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../src/util.c:2733
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekunti"
-msgstr[1] "sekuntia"
-
-#: ../src/util.c:2747
-msgid "day"
-msgid_plural "days"
-msgstr[0] "p辰iv辰"
-msgstr[1] "p辰iv辰辰"
-
-#: ../src/util.c:2755
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "tunti"
-msgstr[1] "tuntia"
-
-#: ../src/util.c:2763
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuutti"
-msgstr[1] "minuuttia"
-
-#: ../src/util.c:3230
+#: ../src/util.c:2962
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
+
+#: ../src/util.c:2974
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d p辰iv辰"
+msgstr[1] "%d p辰iv辰辰"
+
+#: ../src/util.c:2982
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d tunti"
+msgstr[1] "%s, %d tuntia"
+
+#: ../src/util.c:2988
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
+
+#: ../src/util.c:2996
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minuutti"
+msgstr[1] "%s, %d minuuttia"
+
+#: ../src/util.c:3002
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
+
+#: ../src/util.c:3477
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteytt辰.\n"
 
+#~ msgid "New Status..."
+#~ msgstr "Uusi tila..."
+
+#~ msgid "Saved Status..."
+#~ msgstr "Tallennettu tila..."
+
+#~ msgid "Bonjour"
+#~ msgstr "Bonjour"
+
+#~ msgid "_Accept"
+#~ msgstr "_Hyv辰ksy"
+
+#~ msgid "Custom Status..."
+#~ msgstr "Mukautettu tila..."
+
+#~ msgid "GtkTreeView Expander Indentation"
+#~ msgstr "GtkTreeView - laajentajan sisennys"
+
+#~ msgid "Offline "
+#~ msgstr "Poissa linjoilta "
+
+#~ msgid "Conversation in %s on %s"
+#~ msgstr "Keskustelu paikassa %s aiheesta %s"
+
+#~ msgid "Conversation with %s on %s"
+#~ msgstr "Keskustelu tuttavan %s kanssa aiheesta %s"
+
+#~ msgid ""
+#~ "Gaim has segfaulted and attempted to dump a core file.\n"
+#~ "This is a bug in the software and has happened through\n"
+#~ "no fault of your own.\n"
+#~ "\n"
+#~ "It is possible that this bug is already fixed in CVS.\n"
+#~ "If you can reproduce the crash, please notify the gaim\n"
+#~ "developers by reporting a bug at\n"
+#~ msgstr ""
+#~ "Gaim on kaatunut ja yritt辰nyt tallentaa muistivedoksen.\n"
+#~ "T辰m辰 on ohjelmavirhe ja se ei tapahtunut mink辰辰n\n"
+#~ "k辰ytt辰j辰n tekem辰n toiminnon takia.\n"
+#~ "\n"
+#~ "On mahdollista ett辰 t辰m辰 virhe on jo korjattu CVS:ss辰.\n"
+#~ "Jos voit toistaa ongelman, ilmoita siit辰 Gaimin\n"
+#~ "kehitt辰jille raportoimalla virheest辰 osoitteessa\n"
+
+#~ msgid ""
+#~ "bug.php\n"
+#~ "\n"
+#~ "Please make sure to specify what you were doing at the time\n"
+#~ "and post the backtrace from the core file.  If you do not know\n"
+#~ "how to get the backtrace, please read the instructions at\n"
+#~ msgstr ""
+#~ "bug.php\n"
+#~ "\n"
+#~ "Varmista ett辰 kerrot mit辰 teit vian ilmetess辰 ja l辰het辰 my旦s\n"
+#~ "pinolistaus muistivedostiedostosta. Jos et tied辰 kuinka\n"
+#~ "pinolistaus (backtrace) haetaan, lue ohjeita osoitteessa\n"
+
+#~ msgid ""
+#~ "gdb.php.  If you need further\n"
+#~ "assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
+#~ "Contact information for Sean and Luke on other protocols is at\n"
+#~ msgstr ""
+#~ "gdb.php.  Jos tarvitset lis辰apua,\n"
+#~ "l辰het辰 pikaviesti joko tunnukselle SeanEgn tai LSchiere (AIMissa).\n"
+#~ "Seanin ja Luken yhteystiedot muilla protokollilla ovat osoitteessa\n"
+
+#~ msgid "contactinfo.php.\n"
+#~ msgstr "contactinfo.php.\n"
+
+#~ msgid "Default"
+#~ msgstr "Oletus"
+
+#~ msgid "Custom..."
+#~ msgstr "Oma..."
+
+#~ msgid "_Warn"
+#~ msgstr "_Varoita"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Tila</b>: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Viesti:</b> %s"
+
+#~ msgid "NotesBuddy encoding"
+#~ msgstr "NotesBuddy-koodaustapa"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Contact Alias:</b> %s"
@@ -12429,9 +12843,6 @@
 #~ "\n"
 #~ "<b>Kontaktin Alias:</b> %s"
 
-#~ msgid "Available Message"
-#~ msgstr "Paikallaoloviesti"
-
 #~ msgid "Away Message"
 #~ msgstr "Poissaoloviesti"
 
@@ -12706,9 +13117,6 @@
 #~ msgid "Default auto-away"
 #~ msgstr "Oletuksena oleva automaattinen poissaoloasetus"
 
-#~ msgid "New..."
-#~ msgstr "Uusi..."
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr "_Piilota uudet viestit kunnes tarjotinkuvaketta on napsautettu"
 
@@ -12736,9 +13144,6 @@
 #~ 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"
 
@@ -12785,9 +13190,6 @@
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">Tiedostopolku:</span>  %s"
 
-#~ msgid "Load"
-#~ msgstr "Lataa"
-
 #~ msgid "Summary"
 #~ msgstr "Yhteenveto"
 
@@ -12812,9 +13214,6 @@
 #~ msgid "Profile Information"
 #~ msgstr "Profiilitiedot"
 
-#~ msgid "Instant Messagers"
-#~ msgstr "Pikaviestitt辰j辰t"
-
 #~ msgid "AIM"
 #~ msgstr "AIM"
 
@@ -12851,17 +13250,6 @@
 #~ msgid "Reconnect"
 #~ msgstr "Uudelleenyhdist辰"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s - yhteys on katkennut.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "Tuntematon syy."
 
@@ -12923,9 +13311,6 @@
 #~ "%s liitt辰minen pistokkeeseen ep辰onnistui:\n"
 #~ "%s"
 
-#~ msgid "Unable to open socket"
-#~ msgstr "Pistoketta ei voitu avata"
-
 #~ msgid "Remote Control"
 #~ msgstr "Kauko-ohjain"
 
@@ -13249,9 +13634,6 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "N辰yt辰 _aikaleimat viesteiss辰"
 
-#~ msgid "Ignore c_olors"
-#~ msgstr "�l辰 v辰lit辰 _v辰reist辰"
-
 #~ msgid "Ignore font _faces"
 #~ msgstr "�l辰 v辰lit辰 kirjasimien _tyypist辰"
 
@@ -13551,9 +13933,6 @@
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "Virheellinen lempinimi '%s'"
 
-#~ msgid "Invalid nickname"
-#~ msgstr "Virheellinen lempinimi"
-
 #~ msgid "Roomlist Error"
 #~ msgstr "Huonelistavirhe"
 
@@ -13575,9 +13954,6 @@
 #~ msgid "The conversation has become inactive and timed out."
 #~ msgstr "Keskustelu on tullut inaktiiviseksi ja aikakatkaistu."
 
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s on sulkenut keskusteluikkunan."
-
 #~ msgid ""
 #~ "You were disconnected from the server, because you logged on from a "
 #~ "different location"
--- a/po/he.po	Tue Feb 14 18:38:45 2006 +0000
+++ b/po/he.po	Tue Feb 14 19:37:42 2006 +0000
@@ -1,6 +1,6 @@
 # Gaim Hebrew translation
 # Copyright (C) 2003, Pavel Bibergal cyberkm@barak-online.net
-# Fixed & Updated 2005, Shalom Craimer <scraimer at softhome dot net>
+# Fixed & Updated 2006, Shalom Craimer <scraimer at gmail dot com>
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-13 00:14-0500\n"
+"POT-Creation-Date: 2006-02-14 00:00-0500\n"
 "PO-Revision-Date: 2005-11-22 11:00+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -76,8 +76,7 @@
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr ""
-"��廩 �廡廩廨 廣� ���廡�� <i>�����</i> ���� ��廩 �廡廩廨 廣� �廣��廚�廬.\n"
+msgstr "��廩 �廡廩廨 廣� ���廡�� <i>�����</i> ���� ��廩 �廡廩廨 廣� �廣��廚�廬.\n"
 
 #: ../plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -592,7 +591,7 @@
 
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
 #: ../src/protocols/msn/msn.c:1524
 msgid "Name"
 msgstr "廩�"
@@ -651,7 +650,7 @@
 msgstr "廩��� ��廩 _廡廩廨"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "None"
 msgstr "���"
 
@@ -940,8 +939,7 @@
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
-"�廬/� �廨�廣 ���廬廡/廬. ���廣�廬 �� �廬廡��� ��� 廨廡 ���� 廩�廬/� ����廨/廬."
+msgstr "�廬/� �廨�廣 ���廬廡/廬. ���廣�廬 �� �廬廡��� ��� 廨廡 ���� 廩�廬/� ����廨/廬."
 
 #: ../plugins/log_reader.c:1473
 msgid "Message could not be sent because the maximum length was exceeded."
@@ -1013,8 +1011,8 @@
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
 "Trillian."
 msgstr ""
-"�廣廬 廢廚��� ������-廩���, 廬�廖廝 �� ����� ������ �廬����廬 廢'�� ��廨�廬. "
-"�廨�廣, �� ���� Adium, Fire, Messenger Plus!, MSN Messenger, Trillian."
+"�廣廬 廢廚��� ������-廩���, 廬�廖廝 �� ����� ������ �廬����廬 廢'�� ��廨�廬. �廨�廣, �� "
+"���� Adium, Fire, Messenger Plus!, MSN Messenger, Trillian."
 
 #: ../plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -1040,8 +1038,7 @@
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
-msgstr ""
-"�廬廡��� �廡廩� �廩��廬 ����廡�. �� ����廛 廣� �廚廬�廨 �-MM ��廖���."
+msgstr "�廬廡��� �廡廩� �廩��廬 ����廡�. �� ����廛 廣� �廚廬�廨 �-MM ��廖���."
 
 #: ../plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -1094,8 +1091,7 @@
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
-"�廬�廖廝 ����廣�廬 ����廡� ��廚廩廨 ��廖廚廨 �廩廬�廩�� �廣��� ��� 廣� ����廬 �廢�廨� "
-"���� ��廬."
+"�廬�廖廝 ����廣�廬 ����廡� ��廚廩廨 ��廖廚廨 �廩廬�廩�� �廣��� ��� 廣� ����廬 �廢�廨� ���� ��廬."
 
 #. ---------- "Notify For" ----------
 #: ../plugins/notify.c:638
@@ -1220,8 +1216,8 @@
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
-"��廨� ������廬-廩��� ���廚�廣 ��廨 ��廩廨 ��廩� 廡廩廨 �廬����� ��廬�� ���廣�.  "
-"�� 廣��� 廣��廨 AIM, ICQ, Jabber, Sametime, Yahoo!"
+"��廨� ������廬-廩��� ���廚�廣 ��廨 ��廩廨 ��廩� 廡廩廨 �廬����� ��廬�� ���廣�.  �� 廣��� "
+"廣��廨 AIM, ICQ, Jabber, Sametime, Yahoo!"
 
 #: ../plugins/psychic.c:60
 msgid "You feel a disturbance in the force..."
@@ -1636,8 +1632,7 @@
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr ""
-"廬�廖廝 �� ��廚廩廨 ��廩廬�廩 �廡��廣 �廚廩廨���廬 廩��� ���廬��廬-��� ������ 廩���."
+msgstr "廬�廖廝 �� ��廚廩廨 ��廩廬�廩 �廡��廣 �廚廩廨���廬 廩��� ���廬��廬-��� ������ 廩���."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1791,7 +1786,7 @@
 #: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:571
 #: ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:776 ../src/gtkrequest.c:287
 #: ../src/protocols/gg/gg.c:454 ../src/protocols/gg/gg.c:595
-#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1322
 #: ../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:2999
@@ -1819,7 +1814,7 @@
 #: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
 #: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1412
 #: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1323
 #: ../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
@@ -1853,7 +1848,7 @@
 msgstr "廩��廣廬 �廬��廨�廬"
 
 #: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "�廖�廖�� ���廩� ������� ���� 廬�����."
 
@@ -1916,11 +1911,11 @@
 "which are currently disabled or offline.  These buddies and the group were "
 "not removed.\n"
 msgstr[0] ""
-"%d ��廩 廡廩廨 ��廡��廢� %s �� ��廖廨 ������ 廩��廩��� ���� ��� 廩���.��廩� "
-"�� ����廨. ��廩 廡廩廨 �� ��廡��廢� �� ��廖廨.\n"
+"%d ��廩 廡廩廨 ��廡��廢� %s �� ��廖廨 ������ 廩��廩��� ���� ��� 廩���.��廩� �� ����廨. "
+"��廩 廡廩廨 �� ��廡��廢� �� ��廖廨.\n"
 msgstr[1] ""
-"%d ��廩� 廡廩廨 ��廡��廢� %s �� ��廖廨� ������ 廩��廩����廬 ����� �� 廩�����.��廩� "
-"�� ����廨��. ��廩� 廡廩廨 ��� ��廡��廢� �� ��廖廨�.\n"
+"%d ��廩� 廡廩廨 ��廡��廢� %s �� ��廖廨� ������ 廩��廩����廬 ����� �� 廩�����.��廩� �� "
+"����廨��. ��廩� 廡廩廨 ��� ��廡��廢� �� ��廖廨�.\n"
 
 #: ../src/blist.c:1896
 msgid "Group not removed"
@@ -2239,7 +2234,7 @@
 msgstr "_�廬廡��"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:822
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "�廨廩�"
 
@@ -2687,7 +2682,6 @@
 msgid "/Buddies/Show Idle Times"
 msgstr "/��廩� 廡廩廨/�廢� ���� ��廖廨 廚廣���廬"
 
-
 #: ../src/gtkblist.c:4471 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
 #: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2976
@@ -3529,15 +3523,13 @@
 "file for the complete list of contributors.  We provide no warranty for this "
 "program.<BR><BR>"
 msgstr ""
-"���� ���� 廬���廬 廩���廬 ���廣�廬 ������廬 �����廨�廬 ���廚廩廨廬 廩���廩 � "
-"AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novel GroupWise, Lotus Sametime, "
-"Napster, Zephyr, Gadu-Gadu "
-"������ ��-����廬. �廬���� ��廬�� �廣�廨廬 GTK+.<BR><BR> "
-"��廬廨 �� �廣廨�� 廩������ ���廚�廛 �廬 �廬���� 廬�廬 �����廬 廨�廩��� �-GPL "
-"(��廨廖� 2 �� ����廨 ��廬廨). "
-"�廣廬廡 廩� �-GPL ���� �廬�� �廡��廛 'COPYING' ���廚廛 廣� ����. ���� ��� 廬�廬 �����廬 "
-"��廚廬��� ��廬�廨��� �廚�廬��. 廨�� �廬 �廡��廛 'COPYRIGHT' �廨廩��� ���� 廩� �廬�廨���. "
-"����� �廖廚廡�� 廩�� ��廨��廬 �廬���� ��.<BR><BR>"
+"���� ���� 廬���廬 廩���廬 ���廣�廬 ������廬 �����廨�廬 ���廚廩廨廬 廩���廩 � AIM, MSN, "
+"Yahoo!, Jabber, ICQ, IRC, SILC, Novel GroupWise, Lotus Sametime, Napster, "
+"Zephyr, Gadu-Gadu ������ ��-����廬. �廬���� ��廬�� �廣�廨廬 GTK+.<BR><BR> ��廬廨 �� "
+"�廣廨�� 廩������ ���廚�廛 �廬 �廬���� 廬�廬 �����廬 廨�廩��� �-GPL (��廨廖� 2 �� ����廨 "
+"��廬廨). �廣廬廡 廩� �-GPL ���� �廬�� �廡��廛 'COPYING' ���廚廛 廣� ����. ���� ��� 廬�廬 "
+"�����廬 ��廚廬��� ��廬�廨��� �廚�廬��. 廨�� �廬 �廡��廛 'COPYRIGHT' �廨廩��� ���� 廩� "
+"�廬�廨���. ����� �廖廚廡�� 廩�� ��廨��廬 �廬���� ��.<BR><BR>"
 
 #: ../src/gtkdialogs.c:265
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -4033,21 +4025,18 @@
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
-msgstr ""
-"��廨�廣� �廣廨�廬 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �� 廩����� 廖���廖 ����� ��廣廨�廬\"."
- 
+msgstr "��廨�廣� �廣廨�廬 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �� 廩����� 廖���廖 ����� ��廣廨�廬\"."
+
 #: ../src/gtklog.c:315
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
-msgstr ""
-"���廣�廬 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �廬 �� ����廣�廬\"."
+msgstr "���廣�廬 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �廬 �� ����廣�廬\"."
 
 #: ../src/gtklog.c:318
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"廢'���� 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �廬 �� �廢'����\"."
+msgstr "廢'���� 廨廡 ��廨廩�� �� 廖��� \"廨廩�� �廬 �� �廢'����\"."
 
 #: ../src/gtklog.c:322
 msgid "No logs were found"
@@ -4128,7 +4117,8 @@
 "�� ��廚廩廨�廬� ��廨�� ��廚��� �廡廨�廬 廩��, ��� ���廣 廣� �� ��廚廬�� ���� �廨�:\n"
 "%sbug.php\n"
 "\n"
-"�廩 �廚廨� ����廡 �� 廣廩�廬 ���� ��廚���, ��廩��� �廬 ���廣�廬 �-backtrace ��廡��廛 core.\n"
+"�廩 �廚廨� ����廡 �� 廣廩�廬 ���� ��廚���, ��廩��� �廬 ���廣�廬 �-backtrace ��廡��廛 "
+"core.\n"
 "�� ���� ���廣/廬 ���廢�� �廬 �-backtrace, ��� 廡廨� �廬 ���廨��廬 �:\n"
 "%sgdb.php\n"
 "\n"
@@ -4136,7 +4126,6 @@
 "���廣 ��廢�廨 廡廩廨 廣� 廩�� ���廡 �廚廨���廡���� ��廨�� ��廢� �:\n"
 "%scontactinfo.php\n"
 
-
 #: ../src/gtkmedia.c:52
 msgid "Call ended."
 msgstr "�廩��� �廖廬����."
@@ -4180,7 +4169,7 @@
 msgid "Open All Messages"
 msgstr "廚廬� �廬 �� ����廣�廬"
 
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1115
+#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1118
 msgid "From"
 msgstr "��廬"
 
@@ -4475,8 +4464,8 @@
 "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."
 msgstr ""
-"��廨 廣廨�廬 ������� �廨廩��� ����. 廣廨��廬 ��廩�廬 ��廬� ��廬廡�� 廣\"� �廨�廨廬� 廣� "
-"廨廩��廬 �廣廨��廬."
+"��廨 廣廨�廬 ������� �廨廩��� ����. 廣廨��廬 ��廩�廬 ��廬� ��廬廡�� 廣\"� �廨�廨廬� 廣� 廨廩��廬 "
+"�廣廨��廬."
 
 #: ../src/gtkprefs.c:673
 msgid "Icon"
@@ -5046,10 +5035,10 @@
 #: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
 #: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
 #: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
-#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
-#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
-#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1185
+#: ../src/protocols/jabber/jabber.c:1195 ../src/protocols/jabber/jabber.c:1205
+#: ../src/protocols/jabber/jabber.c:1215 ../src/protocols/jabber/jabber.c:1225
+#: ../src/protocols/jabber/jabber.c:1237 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
 #: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7723
 #: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
@@ -5084,7 +5073,7 @@
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
 #: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1156
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
 #: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
 #: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
@@ -5181,7 +5170,7 @@
 
 #. connect to the server
 #: ../src/gtkstatusbox.c:364 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:980 ../src/protocols/msn/session.c:349
+#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:349
 #: ../src/protocols/napster/napster.c:536
 #: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
 #: ../src/protocols/sametime/sametime.c:3693
@@ -5412,8 +5401,7 @@
 #: ../src/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"�� �廢��� �廬廡廩廨 廣� 廩廨廬 �-mDNS ��廡���. ��� ��� ��廨 廨廛?"
+msgstr "�� �廢��� �廬廡廩廨 廣� 廩廨廬 �-mDNS ��廡���. ��� ��� ��廨 廨廛?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
 #: ../src/protocols/sametime/sametime.c:3251
@@ -5485,6 +5473,31 @@
 msgid "Email"
 msgstr "���\"�"
 
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s 廖�廨 �廬 ���� �廩���."
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "��� �廚廩廨�廬 �廚廬�� 廩廡廣"
+
+#: ../src/protocols/bonjour/jabber.c:447
+msgid "Error setting socket options"
+msgstr "廩���� �廡��廣廬 ���廨�廬 �廩廡廣"
+
+#: ../src/protocols/bonjour/jabber.c:458
+msgid "Cannot bind socket to port"
+msgstr "�� ��廬� �廡�廣 �廬 �廩廡廣 ��廢���"
+
+#: ../src/protocols/bonjour/jabber.c:465
+msgid "Cannot listen on socket"
+msgstr "��� �廚廩廨�廬 ��廡廩�� �廩廡廣 ��"
+
+#: ../src/protocols/bonjour/jabber.c:559
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "�� ��廬� �廩��� �廬 ����廣�, �� ��� �廚廩廨 ��廬��� �廬 �廩���."
+
 #: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
 #: ../src/protocols/gg/gg.c:137
 msgid "Token Error"
@@ -5552,7 +5565,7 @@
 msgstr "���\"�"
 
 #: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1307
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1310
 msgid "Password"
 msgstr "廖�廖��"
 
@@ -5587,7 +5600,7 @@
 #: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
 #: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1395
-#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
 #: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
 #: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1035
@@ -5595,7 +5608,7 @@
 msgstr "�����"
 
 #: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:784 ../src/protocols/oscar/oscar.c:6153
+#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6153
 #: ../src/protocols/oscar/oscar.c:6161
 msgid "City"
 msgstr "廣�廨"
@@ -5878,8 +5891,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "�廖�廨 �廩��廬 �-IRC ����� 廨�����"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
-#: ../src/protocols/jabber/jabber.c:889
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
+#: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
 msgstr "��� 廬���� �-SSL."
 
@@ -5888,16 +5901,16 @@
 msgid "Couldn't create socket"
 msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣 "
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:420
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
 #: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
 msgid "Couldn't connect to host"
 msgstr "�� ��廬� ��廬��廨 �廩廨廬"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:447
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
 msgid "Connection Failed"
 msgstr "��廬��廨�廬 ��廩��"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:450
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
 msgid "SSL Handshake Failed"
 msgstr "�廩� ����廢廬 ��� 廩� SSL"
 
@@ -5935,7 +5948,7 @@
 
 #. host to connect to
 #: ../src/protocols/irc/irc.c:898 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1906
+#: ../src/protocols/jabber/jabber.c:1909
 #: ../src/protocols/napster/napster.c:720
 #: ../src/protocols/sametime/sametime.c:5639 ../src/protocols/silc/ops.c:1242
 #: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1663
@@ -5947,7 +5960,7 @@
 msgstr "廡����"
 
 #: ../src/protocols/irc/irc.c:907 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:744 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
 #: ../src/protocols/silc/silc.c:929
@@ -6271,7 +6284,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [廣廨�廛]:  �廢� �廬 廨廩��廬 ��廩廬�廩�� 廩�廨�廣 �廣廨�廛."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1746
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;����� ��廩&gt;:  廩���� 廩� ������ 廩��."
 
@@ -6455,7 +6468,7 @@
 msgid "Given Name"
 msgstr "廩� 廚廨��"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
 msgid "URL"
 msgstr "廡�廩�廨"
 
@@ -6476,7 +6489,7 @@
 msgstr "����廨"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:794
+#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "��廡��"
 
@@ -6517,7 +6530,7 @@
 "comfortable."
 msgstr "�� �廚廨���� ���� �� ���廨�. �廩 ����� 廨廡 �廬 ����廣 廩�廬/� �廨��廩/� ��� �廬廬."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1909
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1912
 msgid "Resource"
 msgstr "�廩��"
 
@@ -6525,7 +6538,7 @@
 msgid "Middle Name"
 msgstr "廩� ��廢廣�"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
 #: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
@@ -6568,12 +6581,12 @@
 msgstr "��� �廬 ����� "
 
 #: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1168
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "廩����"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr "廚�廚��"
 
@@ -6581,7 +6594,7 @@
 msgid "Extended Away"
 msgstr "�廣�廨�廬 ���廩�廬"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1223
 #: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
@@ -6595,12 +6608,12 @@
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "�廩 ����� ��� �� ��廬廨 �� �廩��廬 ���廢�廣 ��廚�廩 廩� �廩廬�廩� Jabber �廬�����."
 
-#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:769
+#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:770
 #: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "廩� 廚廨��"
 
-#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:774
+#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:775
 #: ../src/protocols/oscar/oscar.c:6111
 msgid "Last Name"
 msgstr "廩� �廩廚��"
@@ -6723,400 +6736,400 @@
 msgid "Write error"
 msgstr "廩���� ��廬���"
 
-#: ../src/protocols/jabber/jabber.c:353 ../src/protocols/jabber/jabber.c:387
+#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
 msgid "Read Error"
 msgstr "廩���� �廡廨���"
 
-#: ../src/protocols/jabber/jabber.c:473 ../src/protocols/jabber/jabber.c:899
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
 msgid "Unable to create socket"
 msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣"
 
-#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
+#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
 msgid "Invalid Jabber ID"
 msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:589
+#: ../src/protocols/jabber/jabber.c:590
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�廨�廩�� 廩� %s@%s ��廢廣 ��廢���"
 
-#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
+#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
 msgid "Registration Successful"
 msgstr "廨�廩�� ��廢廣 ��廢���"
 
-#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1456
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "廩���� �� ���廣�"
 
-#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
+#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
 msgid "Registration Failed"
 msgstr "�廨�廩�� ��廩�"
 
-#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
+#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
 msgid "Already Registered"
 msgstr "������ ��廨 廨廩��."
 
-#: ../src/protocols/jabber/jabber.c:759
+#: ../src/protocols/jabber/jabber.c:760
 msgid "E-Mail"
 msgstr "���廨"
 
-#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:6154
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6154
 #: ../src/protocols/oscar/oscar.c:6162
 msgid "State"
 msgstr "����"
 
-#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "��廚��"
 
-#: ../src/protocols/jabber/jabber.c:809
+#: ../src/protocols/jabber/jabber.c:810
 msgid "Date"
 msgstr "廬�廨��"
 
-#: ../src/protocols/jabber/jabber.c:817
+#: ../src/protocols/jabber/jabber.c:818
 msgid "Please fill out the information below to register your new account."
 msgstr ".�廩 ����� �廬 ����廣 ���� ��� �廨廩�� �廬 ��廩��� ���廩 廩��"
 
-#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
+#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
 msgstr "廨廩�� �廩��� Jabber ��廩"
 
-#: ../src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:987
 msgid "Initializing Stream"
 msgstr "��廬�� �廨�"
 
-#: ../src/protocols/jabber/jabber.c:990 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:993 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "���廬"
 
-#: ../src/protocols/jabber/jabber.c:999
+#: ../src/protocols/jabber/jabber.c:1002
 msgid "Re-initializing Stream"
 msgstr "��廬�� �廬 ��廨� ���廩"
 
-#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
-#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/jabber/jabber.c:1072 ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1478 ../src/protocols/jabber/jabber.c:1512
 #: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
 msgid "Not Authorized"
 msgstr "�� ��廨廩�"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1114
 msgid "Both"
 msgstr "廩����"
 
-#: ../src/protocols/jabber/jabber.c:1113
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
 msgstr "��廬 (�� ��廩��)"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
 msgstr "��"
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
 msgstr "��� (�� ��廩��)"
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
 msgstr "����"
 
-#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
-#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
-#: ../src/protocols/jabber/jabber.c:1221
+#: ../src/protocols/jabber/jabber.c:1184 ../src/protocols/jabber/jabber.c:1194
+#: ../src/protocols/jabber/jabber.c:1204 ../src/protocols/jabber/jabber.c:1214
+#: ../src/protocols/jabber/jabber.c:1224
 msgid "Priority"
 msgstr "廣��廚�廬"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1253
 msgid "Password Changed"
 msgstr "廖�廖�� 廩��廬�"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
 msgstr "�廖�廖�� 廩�� 廩��廬�."
 
-#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
+#: ../src/protocols/jabber/jabber.c:1258 ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
 msgstr "廩���� ����� 廩���� �廖�廖��"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1315
 msgid "Password (again)"
 msgstr "廖�廖�� (廩��廬)"
 
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1320 ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
 msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "��� �廬 �廖�廖�� ���廩� 廩��."
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8404
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:8404
 #: ../src/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8415
+#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:8415
 #: ../src/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "廩�� 廖�廖��..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../src/protocols/jabber/jabber.c:1341
 msgid "Search for Users..."
 msgstr "_�廚廩 �廩廬�廩��..."
 
-#: ../src/protocols/jabber/jabber.c:1414
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
 msgstr "�廡廩� 廩����"
 
-#: ../src/protocols/jabber/jabber.c:1416
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Conflict"
 msgstr "�廬��廩�廬"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Feature Not Implemented"
 msgstr "�廨� ��廩�."
 
-#: ../src/protocols/jabber/jabber.c:1420
+#: ../src/protocols/jabber/jabber.c:1423
 msgid "Forbidden"
 msgstr "�廖�廨"
 
-#: ../src/protocols/jabber/jabber.c:1422
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Gone"
 msgstr "��-��廢�"
 
-#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1427 ../src/protocols/jabber/jabber.c:1502
 msgid "Internal Server Error"
 msgstr "廩���� 廚����廬 �廩廨廬"
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Item Not Found"
 msgstr "廚廨�� �� ��廢�"
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
 msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
 msgstr "�� 廡���"
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Not Allowed"
 msgstr "�� ��廨廩�"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1439
 msgid "Payment Required"
 msgstr "��廨廩 廬廩���"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Recipient Unavailable"
 msgstr "��廣� �� ����"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Registration Required"
 msgstr "��廨廩廬 �廨廩��"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Remote Server Not Found"
 msgstr "廩廨廬 �� ��廢�"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Remote Server Timeout"
 msgstr "廬� ���� ���廡廢� �廬廡廩�廨廬 廩廨廬"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Server Overloaded"
 msgstr "廣��廖 �廬廨 廣� �廩廨廬"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Service Unavailable"
 msgstr "�廩�廨�廬 ���� ����"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../src/protocols/jabber/jabber.c:1455
 msgid "Subscription Required"
 msgstr "��廨廩 ����"
 
-#: ../src/protocols/jabber/jabber.c:1454
+#: ../src/protocols/jabber/jabber.c:1457
 msgid "Unexpected Request"
 msgstr "�廡廩� �� 廢廚����"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Authorization Aborted"
 msgstr "����廬 ����"
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Incorrect encoding in authorization"
 msgstr "廡���� 廩��� �����廬"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "authzid �� 廬廡廝"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
 msgstr "������ �����廬 �� 廬廡廝"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Authorization mechanism too weak"
 msgstr "������ �����廬 ��廩 ���"
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Temporary Authentication Failure"
 msgstr "�廩� ���� �����廬"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "�廩� �����廬"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Bad Format"
 msgstr "���� �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Bad Namespace Prefix"
 msgstr "�廬�� �廡廩廨-廩� 廩���"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Resource Conflict"
 msgstr "�廬��廩���廬 �廩����"
 
-#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1494 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "��� ���� ���廡廢� �����廨"
 
-#: ../src/protocols/jabber/jabber.c:1493
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
 msgstr "���廨� �廣��"
 
-#: ../src/protocols/jabber/jabber.c:1495
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Host Unknown"
 msgstr "��廨� �� ���廨"
 
-#: ../src/protocols/jabber/jabber.c:1497
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Improper Addressing"
 msgstr "��廬��廬 �� �����"
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
 msgstr "����� �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:1503
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
 msgstr "�廡廩廨-廩� �� 廬廡廝"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1508
 msgid "Invalid XML"
 msgstr "XML 廩���"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Non-matching Hosts"
 msgstr "��廨��� �� 廬�����"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Policy Violation"
 msgstr "����� ��廖��"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Remote Connection Failed"
 msgstr "廩���廬 廬廡廩�廨廬 �廢� ��廨��廡"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "Resource Constraint"
 msgstr "����廬 �廩����"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "Restricted XML"
 msgstr "XML �����"
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "See Other Host"
 msgstr "廢廚� ���廨� ��廨"
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "System Shutdown"
 msgstr "����� ��廣廨�廬"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Undefined Condition"
 msgstr "�廡廨� �� ����廨 �廨�廩"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Encoding"
 msgstr "廡���� 廩�� �廬��"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "Unsupported Stanza Type"
 msgstr "廖�� 廖���� 廩�� �廬��廬"
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
 msgstr "��廨廖� ��� 廬����"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
 msgstr "XML �� ����� ����"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../src/protocols/jabber/jabber.c:1536
 msgid "Stream Error"
 msgstr "廩���� ��廨�"
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�� ��廬� ��廖�� �廩廬�廩 %s"
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "����廖 �� ���廨: %s"
 
-#: ../src/protocols/jabber/jabber.c:1625
+#: ../src/protocols/jabber/jabber.c:1628
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "�� ��廬� ����廖 �廬 �廩廬�廩 %s �廬�廨 \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1644
+#: ../src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "廬廚廡�� �� ���廨: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1651
+#: ../src/protocols/jabber/jabber.c:1654
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "�� ��廬� �廡��廣 廬廚廡�� \"%s\" 廣��廨 �廩廬�廩: %s"
 
-#: ../src/protocols/jabber/jabber.c:1704
+#: ../src/protocols/jabber/jabber.c:1707
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�� ��廬� ��廣�� ��廩廬�廩 %s"
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "config:  Configure a chat room."
 msgstr "config:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../src/protocols/jabber/jabber.c:1742
 msgid "configure:  Configure a chat room."
 msgstr "configure:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "part [room]:  Leave the room."
 msgstr "part [��廨]:  廣��� �廬 ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../src/protocols/jabber/jabber.c:1756
 msgid "register:  Register with a chat room."
 msgstr "register:  �廨廩� ���廨 廢'��."
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../src/protocols/jabber/jabber.c:1762
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [��廩� ��廩]:  �廢� �� 廩�� �廬 ���廩�."
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../src/protocols/jabber/jabber.c:1768
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;�廩廬�廩&gt; [��廨]:  �廖�� �廩廬�廩 �� ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1774
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7124,27 +7137,27 @@
 "affiliate &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 "
 "廣� ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../src/protocols/jabber/jabber.c:1780
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-"role &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 "
-"廣� ���廨."
-
-#: ../src/protocols/jabber/jabber.c:1783
+"role &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 廣� "
+"���廨."
+
+#: ../src/protocols/jabber/jabber.c:1786
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;�廩廬�廩&gt; [��廨]:  ���� �廩廬�廩 ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../src/protocols/jabber/jabber.c:1792
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;��廨&gt; [廩廨廬]:  �廢�廨廝 �廢'�� �廩廨廬 ��."
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../src/protocols/jabber/jabber.c:1798
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;�廩廬�廩&gt; [��廨]:  �廣� �廩廬�廩 ����廨."
 
-#: ../src/protocols/jabber/jabber.c:1800
+#: ../src/protocols/jabber/jabber.c:1803
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;�廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 ��廨."
@@ -7159,32 +7172,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1884 ../src/protocols/jabber/jabber.c:1886
+#: ../src/protocols/jabber/jabber.c:1887 ../src/protocols/jabber/jabber.c:1889
 msgid "Jabber Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1912
+#: ../src/protocols/jabber/jabber.c:1915
 msgid "Use TLS if available"
 msgstr "�廩廬�廩 �-TLS ����� �����"
 
-#: ../src/protocols/jabber/jabber.c:1917
+#: ../src/protocols/jabber/jabber.c:1920
 msgid "Require TLS"
 msgstr "�廨�廩 TLS"
 
-#: ../src/protocols/jabber/jabber.c:1920
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Force old (port 5223) SSL"
 msgstr "��廛 廩���廩 �-SSL �廩� )�廢��� 5223("
 
-#: ../src/protocols/jabber/jabber.c:1925
+#: ../src/protocols/jabber/jabber.c:1928
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�廚廩廨 ��廩廨�廨 �� ��廢廚� �廬廡廩�廨廬 �� ��廢廚�廬"
 
-#: ../src/protocols/jabber/jabber.c:1930 ../src/protocols/simple/simple.c:1669
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/simple/simple.c:1669
 msgid "Connect port"
 msgstr "�廢��廬 ��廬��廨�廬"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1934 ../src/protocols/silc/silc.c:1852
+#: ../src/protocols/jabber/jabber.c:1937 ../src/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "廩廨廬 ��廬��廨�廬"
 
@@ -8767,8 +8780,8 @@
 ">Advanced."
 msgstr ""
 "���� ���廡廢� ��廣�廨廬 �廡��廛 %s ���.\n"
-" �廩 ��廖�廬 ��廚廣�� 廩���廩 �廩廨廬� 廬���� 廣��廨 �廣�廨廬 廡�廢�� 廬�廬 �廩����廬->%s"
-"->廣廨�� �廩���->�廬廡��."
+" �廩 ��廖�廬 ��廚廣�� 廩���廩 �廩廨廬� 廬���� 廣��廨 �廣�廨廬 廡�廢�� 廬�廬 �廩����廬->%s->廣廨�� "
+"�廩���->�廬廡��."
 
 #: ../src/protocols/oscar/oscar.c:2274
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
@@ -9613,7 +9626,7 @@
 msgid ""
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
-msgstr 
+msgstr ""
 "�廩廬�廩 �廩廨廬 �廬���� 廩� AIM/ICQ\n"
 ")��廬廨 ����, ��� ��\"� 廣���("
 
@@ -9688,8 +9701,7 @@
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"������廖�廨��廨 Sametime 廩� �廬 ����廣� ���� 廣� �廩廨廬 %s"
+msgstr "������廖�廨��廨 Sametime 廩� �廬 ����廣� ���� 廣� �廩廨廬 %s"
 
 #: ../src/protocols/sametime/sametime.c:1610
 msgid "Sametime Administrator Announcement"
@@ -9769,8 +9781,7 @@
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
-msgstr ""
-"�廩 ����� ��廩� 廣��� 廩��廬 ��廣���, ����廣廬 ����� 廩廬�廩�� �� %s"
+msgstr "�廩 ����� ��廩� 廣��� 廩��廬 ��廣���, ����廣廬 ����� 廩廬�廩�� �� %s"
 
 #: ../src/protocols/sametime/sametime.c:3373
 msgid "New Conference"
@@ -9799,8 +9810,8 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"��廨 廩��廬 �廣��� ��廨廩��� ���� �廩��� ����� ��廩廬�廩 %s."
-"��廨 \"廢�廨 �廣��� ��廩�\" �� �廨廢��� ��廢�廨 �廣��� ��廩� ������ ���� �廩廬�廩 ��."
+"��廨 廩��廬 �廣��� ��廨廩��� ���� �廩��� ����� ��廩廬�廩 %s.��廨 \"廢�廨 �廣��� ��廩�\" �� "
+"�廨廢��� ��廢�廨 �廣��� ��廩� ������ ���� �廩廬�廩 ��."
 
 #: ../src/protocols/sametime/sametime.c:3458
 msgid "Invite to Conference"
@@ -9828,8 +9839,8 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"�� ����廨 廩� �� �廬��廬 IP 廣��廨 �廩��� �-Meanwhile %s. "
-"�廩 ����� ��廬 ���� ��� ���廩�� ����廖� ��廣廨�廬."
+"�� ����廨 廩� �� �廬��廬 IP 廣��廨 �廩��� �-Meanwhile %s. �廩 ����� ��廬 ���� ��� "
+"���廩�� ����廖� ��廣廨�廬."
 
 #: ../src/protocols/sametime/sametime.c:3627
 msgid "Meanwhile Connection Setup"
@@ -9896,8 +9907,8 @@
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"����� '%s' ���� ��廬���� �� �� ��� �� ��廩廬�廩�� ����. ��� ��廨/� �廬 ��廩廬�廩"
-"����� �� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
+"����� '%s' ���� ��廬���� �� �� ��� �� ��廩廬�廩�� ����. ��� ��廨/� �廬 ��廩廬�廩����� "
+"�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
 #: ../src/protocols/sametime/sametime.c:4297
 msgid "Select User"
@@ -9913,8 +9924,8 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"����� '%s' �� 廬��� ��廝 �廩廬�廩 �廡���� �-Sametime 廩��."
-"���� ��廖廨 �廨廩��廬 ��廩� �廡廩廨 廩��."
+"����� '%s' �� 廬��� ��廝 �廩廬�廩 �廡���� �-Sametime 廩��.���� ��廖廨 �廨廩��廬 ��廩� "
+"�廡廩廨 廩��."
 
 #: ../src/protocols/sametime/sametime.c:4374
 msgid "Unable to add user"
@@ -9992,8 +10003,8 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"����� '%s' ���� ��廬���� ��� ��� �廡��廢�廬 廖廚廨� ��廬���廬 廩� Notes 廩����."
-"��� ��廨/� �廬 �廡��廢� ������ �廬�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
+"����� '%s' ���� ��廬���� ��� ��� �廡��廢�廬 廖廚廨� ��廬���廬 廩� Notes 廩����.��� ��廨/"
+"� �廬 �廡��廢� ������ �廬�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
 #: ../src/protocols/sametime/sametime.c:5318
 msgid "Select Notes Address Book"
@@ -10008,8 +10019,7 @@
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr ""
-"����� '%s' �� 廬��� ��廝 廡��廢廬 廖廚廨� ��廬���廬 廩� Notes �廡���� 廩��."
+msgstr "����� '%s' �� 廬��� ��廝 廡��廢廬 廖廚廨� ��廬���廬 廩� Notes �廡���� 廩��."
 
 #: ../src/protocols/sametime/sametime.c:5403
 msgid "Notes Address Book Group"
@@ -10060,8 +10070,8 @@
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"�廩 ����� 廩� �� ���� ��廡� �廩�� ���� ��� ��廚廩 �廩廬�廩�� 廬����� �廡���廬 �-Sametime"
-"廩��."
+"�廩 ����� 廩� �� ���� ��廡� �廩�� ���� ��� ��廚廩 �廩廬�廩�� 廬����� �廡���廬 �-"
+"Sametime廩��."
 
 #: ../src/protocols/sametime/sametime.c:5531
 msgid "User Search"
@@ -11448,9 +11458,7 @@
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
-"%s 廩�� ���廣� �� ���� ���� �廣廨�廛 %s."
-"��� �廨廢��� �廚廬�� �廬 ���� ����?"
+msgstr "%s 廩�� ���廣� �� ���� ���� �廣廨�廛 %s.��� �廨廢��� �廚廬�� �廬 ���� ����?"
 
 #: ../src/protocols/silc/wb.c:302
 msgid "Whiteboard"
@@ -12115,9 +12123,7 @@
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
-msgstr ""
-"廖����, �� �廨�� �� 廚廨�廚�� �� ��� �廩廚� �� 廚�廨�� "
-"廩�� �廬���� �廨�廣."
+msgstr "廖����, �� �廨�� �� 廚廨�廚�� �� ��� �廩廚� �� 廚�廨�� 廩�� �廬���� �廨�廣."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1186
 msgid ""
@@ -12174,8 +12180,8 @@
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"廩���� �� ���廨廬. 廣��� ��廬�廬廡 �����廬 ���廩 �廡�廬 �廚�� 廩���� �廚廩廨 "
-"��廢�廨廝 廩�� ���廨-廢'��"
+"廩���� �� ���廨廬. 廣��� ��廬�廬廡 �����廬 ���廩 �廡�廬 �廚�� 廩���� �廚廩廨 ��廢�廨廝 廩�� ���廨-"
+"廢'��"
 
 #: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -13044,9 +13050,6 @@
 #~ "��廩��� �廣廬 �廩�廬 %s �廩廡廣:\n"
 #~ "%s"
 
-#~ msgid "Unable to open socket"
-#~ msgstr "��� �廚廩廨�廬 �廚廬�� 廩廡廣"
-
 #~ msgid "Remote Control"
 #~ msgstr "廩���� �廨��廡廬"
 
@@ -13750,9 +13753,6 @@
 #~ msgid "The conversation has become inactive and timed out."
 #~ msgstr "�廩��� �廚�� ���-廚廣��� ���廬廡� �廩� ��廖廨 廚廣���廬 ���廨� ���."
 
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s 廖�廨 �廬 ���� �廩���."
-
 #~ msgid "Transfer of file %s timed out."
 #~ msgstr "�廩��� �廡��廛 %s ���� �廚�廬 ��廖廨 廚廣���廬."