changeset 17626:85bd6307e8a2

fixes #1625 committer: Luke Schierer <lschiere@pidgin.im>
author Timo Jyrinki <timo.jyrinki@iki.fi>
date Thu, 14 Jun 2007 16:02:52 +0000
parents b6145c9b6483
children 0e83909e8ba6
files po/ChangeLog po/fi.po
diffstat 2 files changed, 2690 insertions(+), 2055 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Jun 14 07:01:26 2007 +0000
+++ b/po/ChangeLog	Thu Jun 14 16:02:52 2007 +0000
@@ -2,6 +2,7 @@
 
 version 2.0.2
 	* English (British) translation updated (Luke Ross)
+	* Finnish translation updated (Timo Jyrinki)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Slovenian win32 installer updated (Martin Srebotnjak)
 
--- a/po/fi.po	Thu Jun 14 07:01:26 2007 +0000
+++ b/po/fi.po	Thu Jun 14 16:02:52 2007 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-21 18:54+0300\n"
-"PO-Revision-Date: 2007-05-21 18:54+0300\n"
+"POT-Creation-Date: 2007-06-11 15:25+0300\n"
+"PO-Revision-Date: 2007-06-11 15:25+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,15 +62,16 @@
 "Tutki asiaa ja suorita asetusten siirto käsin. Ilmoita tästä ongelmasta "
 "osoitteessa http://developer.pidgin.im/"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
 #: ../libpurple/protocols/jabber/buddy.c:1426
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Virhe"
 
@@ -82,16 +83,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Käyttäjätilin näyttönimi ei voi olla tyhjä."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3983
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
@@ -99,31 +100,29 @@
 msgid "New Account"
 msgstr "Uusi tili"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
-#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
@@ -135,13 +134,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:1788
 #: ../libpurple/protocols/jabber/buddy.c:1824
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6046
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -160,24 +160,32 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3231
-#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5863
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -190,12 +198,12 @@
 #: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
 #: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -208,14 +216,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
@@ -225,15 +233,16 @@
 "Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5862 ../pidgin/gtkconv.c:1686
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisää"
@@ -243,105 +252,110 @@
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, 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"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavalistalleen%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "Valtuuta tuttava?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
 msgstr "Tuttavan näyttönimi on annettava."
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
 msgstr "Ryhmä on määritettävä."
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "Käyttäjätili täytyy valita."
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:285
 msgid "The selected account is not online."
 msgstr "Valittu käyttäjätili ei ole linjoilla."
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
 #: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
 #: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Tili"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5368
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "Syötä tuttavan tiedot."
 
-#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -349,176 +363,182 @@
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5748
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:402
 msgid "You can edit more information from the context menu later."
 msgstr "Voit muokata lisää tietoja myöhemmin pikavalikosta."
 
-#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "Virhe lisättäessä ryhmää"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:416
 msgid "You must give a name for the group to add."
 msgstr "Lisättävän ryhmän nimi on annettava."
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5859
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "Anna ryhmän nimi"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "Muokkaa ryhmäkeskustelua"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "Päivitä vaaditut kentät."
 
-#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../finch/gntblist.c:784
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "Muokkaa asetuksia"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
 msgid "Information"
 msgstr "Tiedot"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
 msgid "Retrieving..."
 msgstr "Haetaan..."
 
-#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "Lisää tuttavailmoitin"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1634
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "Näytä loki"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Anna uusi nimi kohteelle %s"
 
-#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:964
 msgid "Set Alias"
 msgstr "Aseta lempinimi"
 
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "Syötä tyhjä merkkijono palauttaaksesi oletusnimen."
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1041
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Kontaktin poistaminen poistaa myös kaikki kontaktissa olevat tuttavat"
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1049
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Ryhmän poistaminen poistaa myös kaikki ryhmässä olevat tuttavat"
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1054
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1055
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "Vahvista poistaminen"
 
-#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1683 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4227
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "Paikka merkitty"
 
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
 #: ../libpurple/protocols/jabber/buddy.c:1589
 #: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3016
+#: ../pidgin/gtkblist.c:3409 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -527,12 +547,12 @@
 "Kirjautuneena: %d\n"
 "Yhteensä: %d"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Tili: %s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -541,143 +561,144 @@
 "\n"
 "Viimeksi nähty: %s sitten"
 
-#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 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."
 
-#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6003
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3982
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2189
 msgid "Show offline buddies"
 msgstr "Näytä poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "Lajittele tilan mukaan"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "Lajittele aakkosittain"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "Lajittele lokin koon mukaan"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "Yhteys katkennut kohteeseen %s."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"Yhteys katkesi kohteeseen %s seuraavasta syystä:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Yhteysvirhe"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Yhdistä"
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
+"otat tilin uudelleen käyttöön."
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
@@ -737,15 +758,15 @@
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -753,7 +774,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7171
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -761,24 +782,24 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7174
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7177
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7180
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7183
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
@@ -810,7 +831,7 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -818,7 +839,7 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -826,7 +847,7 @@
 msgid "Filter: "
 msgstr "Suodatin: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Tauko"
 
@@ -862,24 +883,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/jabber.c:1220
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:803
 #: ../libpurple/protocols/oscar/oscar.c:808
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3073 ../pidgin/gtkblist.c:3075
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Tila"
@@ -899,8 +920,9 @@
 #. Close button
 #: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
 #: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sulje"
 
@@ -926,7 +948,7 @@
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Siirtää"
 
@@ -938,7 +960,7 @@
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "Lähettäjä"
 
@@ -971,11 +993,11 @@
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1662 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Tiedot"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1623
 msgid "IM"
 msgstr "Pikaviesti"
 
@@ -1039,7 +1061,7 @@
 msgstr "Liitännäisen asetukset"
 
 #: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -1060,9 +1082,7 @@
 msgstr "Kenestä ilmoitetaan"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -1142,7 +1162,7 @@
 
 #: ../finch/gntpounce.c:445
 msgid "Pounce only when my status is not available"
-msgstr "Ilmoita vain kun tilani on \"ei tavoitettavissa\""
+msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
 #: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
@@ -1215,12 +1235,12 @@
 msgid "Based on keyboard use"
 msgstr "Perustuen näppäimistön käyttöön"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Ei koskaan"
@@ -1254,12 +1274,12 @@
 msgstr "Kirjaa tilamuutokset"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
@@ -1267,13 +1287,13 @@
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
@@ -1303,37 +1323,38 @@
 msgstr "Tyyppi"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5464
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5696
-#: ../libpurple/protocols/oscar/oscar.c:5712
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5506
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5738
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5768
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
@@ -1547,8 +1568,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3979
+msgid "Connection Error"
+msgstr "Yhteysvirhe"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
@@ -1597,7 +1623,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5258 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Tuttavat"
@@ -1623,7 +1649,7 @@
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -1640,7 +1666,8 @@
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
@@ -1652,32 +1679,32 @@
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -2195,12 +2222,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#: ../libpurple/protocols/oscar/oscar.c:6077
-#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Peru"
@@ -2243,8 +2270,8 @@
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -2473,30 +2500,30 @@
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "Käyttäjä on poissa linjoilta."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Automaattinen vastaus lähetetty:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s on kirjautunut ulos."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Yksi tai useampi viesti on saattanut jäädä lähettämättä."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2504,69 +2531,69 @@
 "Yhteyttä ei tällä hetkellä ole. Viestejä ei vastaanoteta ellet olet "
 "kirjautuneena sisään."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Viestiä ei voitu lähettää koska suurin viestin koko ylitettiin."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "Viestiäsi ei voitu lähetettää."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "Yleiset lokikatselimen asetukset"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "Nopeat koon laskemiset"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "Käytä nimiheuristiikkaa"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "Lokihakemisto"
 
@@ -2576,19 +2603,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "Lokikatselin"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2680,9 +2707,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -2690,9 +2719,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Ei"
 
@@ -2819,7 +2850,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2827,8 +2858,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -2838,7 +2869,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2846,8 +2877,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -2923,7 +2954,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcl-liitännäisten latauksen."
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2932,11 +2963,11 @@
 "ActiveTCL osoitteesta http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Ei voitu kuunnella sisääntulevia pikaviestintäyhteyksiä\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2945,18 +2976,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:5584
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Poissa"
@@ -2971,86 +3003,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Isäntä"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Sukunimi"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "Sähköposti"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "AIM-tili"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "Sähköposti"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "AIM-tili"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "XMPP-tili"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "Ei voitu liittää pistoketta porttiin"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "Ei voitu kuunnella pistoketta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3120,8 +3157,8 @@
 msgstr "Rekisteröinti onnistui!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "Salasana"
 
@@ -3147,9 +3184,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
@@ -3158,8 +3195,8 @@
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3172,14 +3209,14 @@
 msgstr "Mies vai nainen"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Mies"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3242,10 +3279,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5556
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3060 ../pidgin/gtkblist.c:3388
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Poissa linjoilta"
@@ -3255,22 +3292,23 @@
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Tavoitettavissa"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3687
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
 #: ../libpurple/protocols/jabber/buddy.c:1585
 #: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
@@ -3279,7 +3317,7 @@
 msgstr "Syntymävuosi"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3899
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
@@ -3408,21 +3446,24 @@
 msgstr "Gadu-Gadu-käyttäjä"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -3466,11 +3507,12 @@
 msgstr "Näytä MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanava:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -3480,21 +3522,21 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
@@ -3505,18 +3547,17 @@
 msgstr "Pistokkeen luominen epäonnistui"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
@@ -3525,15 +3566,18 @@
 msgstr "Virhe luettaessa"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Käyttäjät"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Aihe"
@@ -3557,23 +3601,26 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2130
-#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6623
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6626
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
@@ -3583,18 +3630,25 @@
 msgstr "Merkistöt"
 
 #: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -3633,13 +3687,15 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Kutsumanimi"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
@@ -3659,98 +3715,99 @@
 msgid "Glorious"
 msgstr "Loistokas"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s on poistanut aiheen."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC-palvelin vastaanotti viestin jota se ei ymmärtänyt."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3758,7 +3815,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3766,43 +3823,44 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Ei voitu liittyä kohteeseen %s: Vaatii rekisteröinnin."
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -3910,7 +3968,7 @@
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4018,21 +4076,21 @@
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nimi&gt;: Hae tietoja käyttäjästä joka on kirjautunut ulos."
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4075,10 +4133,10 @@
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:437
 #: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:714
-#: ../libpurple/protocols/jabber/auth.c:848
-#: ../libpurple/protocols/jabber/auth.c:873
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
@@ -4091,24 +4149,27 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL-virhe"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
@@ -4118,7 +4179,7 @@
 msgstr "Etunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4149,7 +4210,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Maa"
 
@@ -4163,8 +4225,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
 #: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Sähköposti"
@@ -4186,14 +4250,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3071
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Kuvaus"
@@ -4223,29 +4287,32 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:665
 #: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
-msgstr "Lähde"
+msgstr "Sijainti"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "Tärkeys"
 
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
@@ -4286,7 +4353,7 @@
 msgstr "Poista listalta"
 
 #: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
@@ -4295,9 +4362,9 @@
 msgstr "Pidennetty poissaolo"
 
 #: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5760
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
@@ -4308,7 +4375,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1587
 #: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "Last Name"
 msgstr "Sukunimi"
 
@@ -4346,8 +4413,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
@@ -4386,7 +4453,7 @@
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5246
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Huone:"
@@ -4456,7 +4523,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huonelistaa"
 
@@ -4491,424 +4559,442 @@
 msgid "Read Error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Ei voitu muodostaa yhteyttä palvelimeen:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Rekisteröi uusi XMPP-tili"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
-msgid "Remote Server Timeout"
-msgstr "Palvelin aikakatkaisi"
-
-#: ../libpurple/protocols/jabber/jabber.c:1516
-msgid "Server Overloaded"
-msgstr "Palvelin ylikuormitettu"
-
-#: ../libpurple/protocols/jabber/jabber.c:1518
-msgid "Service Unavailable"
-msgstr "Palvelu ei käytettävissä"
-
 #: ../libpurple/protocols/jabber/jabber.c:1520
-msgid "Subscription Required"
-msgstr "Vaatii tilailmoitukset"
+msgid "Remote Server Timeout"
+msgstr "Palvelin aikakatkaisi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1522
+msgid "Server Overloaded"
+msgstr "Palvelin ylikuormitettu"
+
+#: ../libpurple/protocols/jabber/jabber.c:1524
+msgid "Service Unavailable"
+msgstr "Palvelu ei käytettävissä"
+
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Subscription Required"
+msgstr "Vaatii tilailmoitukset"
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
-msgstr "Lähdekonflikti"
-
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+msgstr "Sijaintikonflikti"
+
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
-msgid "Invalid ID"
-msgstr "Epäkelpo ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Invalid Namespace"
-msgstr "Väärä nimiavaruus"
-
-#: ../libpurple/protocols/jabber/jabber.c:1575
-msgid "Invalid XML"
-msgstr "Epäkelpo XML"
-
 #: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Non-matching Hosts"
-msgstr "Verkkoisännät eivät täsmää"
+msgid "Invalid ID"
+msgstr "Epäkelpo ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1579
+msgid "Invalid Namespace"
+msgstr "Väärä nimiavaruus"
 
 #: ../libpurple/protocols/jabber/jabber.c:1581
+msgid "Invalid XML"
+msgstr "Epäkelpo XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1583
+msgid "Non-matching Hosts"
+msgstr "Verkkoisännät eivät täsmää"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
-msgstr "Lähderajoite"
-
-#: ../libpurple/protocols/jabber/jabber.c:1587
+msgstr "Sijaintirajoite"
+
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4916,7 +5002,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4924,20 +5010,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4959,7 +5045,7 @@
 msgstr "XMPP-yhteyskäytäntöliitännäinen"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
 msgid "Domain"
 msgstr "Palvelin"
 
@@ -4978,7 +5064,8 @@
 
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5011,7 +5098,7 @@
 msgid "XMPP Message Error"
 msgstr "XMPP-viestivirhe"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
@@ -5020,16 +5107,16 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5037,35 +5124,61 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, 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"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Tiedostoa ei voitu lähettää käyttäjälle %s, virheellinen JID."
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei ole linjoilla"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Valitse käyttäjän %s sijainti johon haluat lähettää tiedoston"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Valitse sijainti"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5283,8 +5396,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
@@ -5383,8 +5497,8 @@
 msgstr "Olet hänen listallaan"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
@@ -5392,21 +5506,23 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Varattu"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
@@ -5455,31 +5571,31 @@
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5487,186 +5603,188 @@
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
-#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3781
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1829
 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 "
@@ -5675,7 +5793,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."
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5683,7 +5801,7 @@
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profiilin URL"
@@ -5698,19 +5816,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -5741,7 +5859,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -5779,15 +5897,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voitu poistaa"
 
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5842,7 +5960,7 @@
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3455
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
@@ -5857,35 +5975,35 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tuttavalistaa ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavalista"
 
@@ -5923,16 +6041,25 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Viestiä ei voitu lähettää koska istuntoa palvelimen kanssa ei voitu "
+"muodostaa. Tämä on luultavasti ongelma palvelimella, yritä uudelleen "
+"muutaman minuutin päästä:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Viestiä ei voitu lähettää kytkentäpalvelimen kanssa tapahtuneen virheen "
 "vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
@@ -6311,19 +6438,19 @@
 msgstr "Palvelimen portti"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2284
-#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6333,21 +6460,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Ei voitu muodostaa yhteyttä palvelimeen:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6379,7 +6497,7 @@
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Merkistö"
@@ -6534,8 +6652,8 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
+#: ../pidgin/gtkutils.c:2339
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
@@ -6549,13 +6667,15 @@
 msgstr "AIM:n suora pikaviesti"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Keskustelu"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -6628,17 +6748,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:5732
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Varattu"
 
@@ -6647,7 +6767,7 @@
 msgstr "Net-tietoinen"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Näkymätön"
@@ -6657,13 +6777,13 @@
 msgstr "Linjoilla"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "IP-osoite"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:2847
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
@@ -6714,14 +6834,14 @@
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
 #: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Epäkelpo näyttöjänimi."
 
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
@@ -6773,10 +6893,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -6795,48 +6915,48 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttavalistalleni?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5193
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2276
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6847,17 +6967,17 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6870,7 +6990,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6883,7 +7003,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6896,38 +7016,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2457
 #, 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)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2553
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2562
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6936,21 +7056,21 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2580
 #, 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ä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, 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ä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, 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."
@@ -6958,61 +7078,61 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2756
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2820
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2823
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2852
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2862
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2918
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:2995
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3182
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7020,7 +7140,7 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3385
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7028,85 +7148,86 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3457
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3470
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3747
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3905
 #, 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3936
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3959
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3990
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7115,14 +7236,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3996
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7131,7 +7252,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7140,7 +7261,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7149,7 +7270,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7158,32 +7279,32 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4023
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4195
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4461
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
+#: ../libpurple/protocols/oscar/oscar.c:4462
 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 "
@@ -7193,7 +7314,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4476
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7206,11 +7327,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4481
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4526
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7225,11 +7346,11 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7240,17 +7361,17 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+#: ../libpurple/protocols/oscar/oscar.c:4602
+#: ../libpurple/protocols/oscar/oscar.c:5025
+#: ../libpurple/protocols/oscar/oscar.c:5039
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4706
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7258,16 +7379,16 @@
 "Tuttavalistan hakeminen AIM-pavelimelta epäonnistui. Tuttavalistasi ei ole "
 "kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4890
-#: ../libpurple/protocols/oscar/oscar.c:4895
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#: ../libpurple/protocols/oscar/oscar.c:5077
+#: ../libpurple/protocols/oscar/oscar.c:4911
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5093
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5099
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7276,12 +7397,12 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7291,7 +7412,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5130
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7300,22 +7421,22 @@
 "Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen "
 "tuttavalistalleen. Haluatko lisätä hänet omallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5138
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5190
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7326,53 +7447,53 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5216
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5292
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5361
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
+#: ../libpurple/protocols/oscar/oscar.c:5886
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7380,65 +7501,65 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5927
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5941
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6038
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7446,73 +7567,73 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6399
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6475
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../libpurple/protocols/oscar/oscar.c:6588
+#: ../libpurple/protocols/oscar/oscar.c:6630
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8015,13 +8136,7 @@
 msgstr "Ei kyetty kirjautumaan, tarkista virheenjäljitysloki"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2378
-#: ../libpurple/protocols/yahoo/yahoo.c:2406
-#: ../libpurple/protocols/yahoo/yahoo.c:2513
-#: ../libpurple/protocols/yahoo/yahoo.c:2534
-#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8429,7 +8544,7 @@
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4250
 msgid "Topic:"
 msgstr "Aihe:"
 
@@ -8454,6 +8569,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3984
+msgid "Connect"
+msgstr "Yhdistä"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8688,60 +8807,85 @@
 msgstr "Piilota asiakasohjelman tunniste"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Käyttäjä %s ei ole läsnä verkossa"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Avainsopimus"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ei voida suorittaa avainsopimusta"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Virhe tapahtui avainsopimuksen aikana"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Avainsopimus epäonnistui"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Aikakatkaisu avainsopimuksen aikana"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Avainsopimus peruutettiin"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Avainsopimus peruutettiin"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Avainsopimus on jo aloitettu"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8750,7 +8894,8 @@
 "Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
 "avainsopimuksen?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8761,69 +8906,99 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Avainsopimuspyyntö"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Ei voida asettaa pikaviestiavainta"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Aseta pikaviestin salasana"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Käyttäjä %s ei ole luotettu"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8832,16 +9007,19 @@
 "Voit käyttää Hae julkinen avain -komentoa saadaksesi julkisen avaimen."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Tuttava %s ei ole kirjautuneena verkossa"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8849,15 +9027,18 @@
 "Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
 "tuodaksesi julkisen avaimen."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Valitse oikea käyttäjä"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8865,7 +9046,8 @@
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
 "käyttäjä listalta."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8874,237 +9056,318 @@
 "listalta."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Irroitettu"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Vastahakoinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Herätä minut"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiivinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robotti"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Onnellinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Surullinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Vihainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Häpeää"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Rakastunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Unelias"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Tylsistynyt"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Innostunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Levoton"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Mieliala"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Laite"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Piirrä kirjoitustaululle"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Salasana:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanavaa %s ei ole verkossa"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanavatiedot"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ei saada kanavatietoja"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanavan nimi:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Käyttäjämäärä:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanavan perustaja:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanavan salausalgoritmi:<b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanavan HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanavan tilat:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Fingerprint</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Perustajan avain Babbleprint:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Lisää kanavan julkinen avain"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9118,333 +9381,446 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Lisää / poista"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Käyttäjäraja"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Poista yksityinen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Turvallinen tiedostonsiirto"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Virhe tiedostonsiirrossa"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Etäpää katkaisi yhteyden"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Pääsy evätty"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Avain sopimus epäonnistui"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "Ei yhteyttä määräajassa"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Yhteyden muodostus epäonnistui"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Tiedostonsiirtoistuntoa ei ole"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Ei aktiivista tiedostonsiirtoistuntoa"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Tiedostonsiirto on jo aloitettu"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ei voitu suorittaa avainsopimusta tiedostonsiirtoa varten"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ei voitu aloittaa tiedostonsiirtoa"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Tiedoston lähetys ei onnistu"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Tapahtui virhe"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Poistettu käyttäjän %s toimesta (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Kirjaudu ulos palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Oikea nimi"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen sormenjälki"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen \"babbleprint\""
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Lisää..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Ei voida irroittaa"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Ei voida asettaa aihetta"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Huonelista"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Huonelistaa ei saatu"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Verkko on tyhjä"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Palvelimen tilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Ei saatu palvelimen tilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Palvelimen tilastoja ei saatavilla."
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9479,105 +9855,66 @@
 "Palvelinoperaattorit yhteensä: %d\n"
 "Reititinoperaattorit yhteensä: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping-vastaus saatu palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Ei voitu poistaa käyttäjää"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Avaintenvaihto epäonnistui"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
-"luodaksesi uuden yhteyden."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Palvelin katkaisi yhteyden"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "TARKKAILE"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Et voi tarkkailla käyttäjää"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Virhe: Virheellinen allekirjoitus"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Virhe: Virheellinen eväste"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Virhe: Todennus epäonnistui"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9586,12 +9923,12 @@
 "Vastaanotettiin käyttäjän %s julkinen avain. Paikallinen kopiosi ei täsmää. "
 "Haluatko silti hyväksyä tämän julkisen avaimen?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Vastaanotettiin julkinen avain käyttäjältä %s. Hyväksytäänkö se?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9604,73 +9941,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Tarkista julkinen avain"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Näytä..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Palvelin katkaisi yhteyden"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Avaintenvaihto epäonnistui"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
+"luodaksesi uuden yhteyden."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Yhdistetään SILC-palvelimelle"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Ei voitu ladata SILC-avainparia"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Yhteyden luominen epäonnistui"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Pertti Perusnimi"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Ei voida alustaa SILC-yhteyskäytäntöä"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Ei voida löytää/käyttää ~/.silc-hakemistoa"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Yhdistetään SILC-palvelimelle"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Ei voitu ladata SILC-avainparia: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Yhteyden luominen epäonnistui"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Virhe ladattaessa SILC-avainparia"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Rakastunut"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9678,46 +10042,63 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online-palvelut"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Aikavyöhyke (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9727,168 +10108,212 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Avaimen pituus"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti asiakasohjelman virhe)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9896,7 +10321,8 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9904,15 +10330,18 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9920,37 +10349,45 @@
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
 "kanavan kutsu- listalta"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9967,116 +10404,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "Käytä täydellistä jatkosalaisuutta (PFS)"
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Evää katsominen toisilta käyttäjiltä"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Estä kutsut"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Evää paikallaolotilan pyynnöt"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "Avaa kirjoitustaulu automaattisesti"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "Luodaan SILC-avainpari"
+msgstr "Luodaan SILC-avainpari..."
+
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "SILC-avainparia ei voida luoda\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Palvelin: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus: \t%d bittiä\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versio: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10087,7 +10549,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10096,38 +10559,45 @@
 "Julkisen avaimen babbleprint\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Pääte"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s lähetti viestin kirjoitustaululle. Haluatko aukaista kirjoitustaulun?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10136,10 +10606,71 @@
 "%s lähetti viestin kirjoitustaululle kanavalla %s. Haluatko aukaista "
 "kirjoitustaulun?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Kirjoitustaulu"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Palvelimen tilastoja ei saatavilla."
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Virhe: Virheellinen allekirjoitus"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Virhe: Virheellinen eväste"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Virhe: Todennus epäonnistui"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Pertti Perusnimi"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Ei voida löytää/käyttää ~/.silc-hakemistoa"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Ei voitu ladata SILC-avainparia: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10366,7 +10897,8 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5821
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -10427,32 +10959,32 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Valtuutuksen eväysviesti:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10461,11 +10993,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10476,11 +11008,11 @@
 "luultavasti mahdollista kirjautua Yahoo-palveluun tällä asiakasohjelmalla. "
 "Tarkista päivitykset osoitteesta: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10490,152 +11022,170 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2488
-#: ../libpurple/protocols/yahoo/yahoo.c:2667
-#: ../libpurple/protocols/yahoo/yahoo.c:2770
-#: ../libpurple/protocols/yahoo/yahoo.c:2780
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Yhteys palvelimeen %s katkesi:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Ei voitu muodostaa yhteyttä palvelimeen %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "Olet lähettänyt tönäisyn!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -10649,56 +11199,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -10787,7 +11337,7 @@
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Virhe kirjoituksessa"
 
@@ -11066,7 +11616,7 @@
 msgstr "Altistus"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11096,7 +11646,7 @@
 msgid "Error resolving %s"
 msgstr "Virhe selvitettäessä %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Ei voitu selvittää isäntänimeä"
 
@@ -11189,27 +11739,27 @@
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11218,62 +11768,67 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "%s:n avaaminen epäonnistui: uudelleenohjattu liian monta kertaa"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11282,17 +11837,17 @@
 "Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3523
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ei voitu yhdistää kohteeseen %s: %s"
@@ -11318,55 +11873,71 @@
 msgstr "Tarjottimen asento."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "Paikallinen lempinimi:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Yhteyskäy_täntö:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "Näyttö_nimi:"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "Paika_llinen lempinimi:"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "Muista _salasana"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "Il_moita uudesta sähköpostista"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjätilille:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "Käytä GNOMEn välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleisiä välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -11375,60 +11946,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:982
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:985
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11451,105 +12022,103 @@
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavalista-ikkunassa."
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:717
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:738
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:749 ../pidgin/gtkblist.c:5415
+#: ../pidgin/gtkblist.c:5782 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1038
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1089
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1092 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1098
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1105
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1109 ../pidgin/gtkblist.c:1113
+#: ../pidgin/gtkblist.c:1215 ../pidgin/gtkblist.c:1238
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1125 ../pidgin/gtkblist.c:1134
+#: ../pidgin/gtkblist.c:1223 ../pidgin/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1128 ../pidgin/gtkblist.c:1136
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1185
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1188
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1191
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1193
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1211 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1213
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1251 ../pidgin/gtkblist.c:1274
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1279
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1524 ../pidgin/gtkblist.c:1536
+#: ../pidgin/gtkblist.c:4529 ../pidgin/gtkblist.c:4539
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkblist.c:1996 ../pidgin/gtkconv.c:4610
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11558,125 +12127,116 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2836
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2837
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2843
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/_About Pidgin"
+msgstr "/Tuttavat/Tietoj_a Pidginistä"
+
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2856
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2857 ../pidgin/gtkblist.c:6480
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/muokkaa"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2860
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:2857
-msgid "/Tools/Plu_gins"
-msgstr "/Työkalut/_Liitännäiset"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Tools/Pr_eferences"
-msgstr "/Työkalut/A_setukset"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Tools/Pr_ivacy"
-msgstr "/Työkalut/Yks_ityisyys"
-
-#: ../pidgin/gtkblist.c:2861
-msgid "/Tools/_File Transfers"
-msgstr "/Työkalut/_Tiedostonsiirrot..."
-
 #: ../pidgin/gtkblist.c:2862
-msgid "/Tools/R_oom List"
-msgstr "/Työkalut/Huone_lista"
+msgid "/Tools/Plu_gins"
+msgstr "/Työkalut/_Liitännäiset"
 
 #: ../pidgin/gtkblist.c:2863
+msgid "/Tools/Pr_eferences"
+msgstr "/Työkalut/A_setukset"
+
+#: ../pidgin/gtkblist.c:2864
+msgid "/Tools/Pr_ivacy"
+msgstr "/Työkalut/Yks_ityisyys"
+
+#: ../pidgin/gtkblist.c:2866
+msgid "/Tools/_File Transfers"
+msgstr "/Työkalut/_Tiedostonsiirrot..."
+
+#: ../pidgin/gtkblist.c:2867
+msgid "/Tools/R_oom List"
+msgstr "/Työkalut/Huone_lista"
+
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2869
+msgid "/Tools/_Debug Window"
+msgstr "/Työkalut/_Virheenjäljitysikkuna"
+
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
-#. Help
-#: ../pidgin/gtkblist.c:2868
-msgid "/_Help"
-msgstr "/O_hje"
-
-#: ../pidgin/gtkblist.c:2869
-msgid "/Help/Online _Help"
-msgstr "/Ohje/O_hjeita verkossa"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Help/_Debug Window"
-msgstr "/Ohje/_Virheenjäljitysikkuna"
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Help/_About"
-msgstr "/Ohje/Tietoj_a"
-
 #: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
@@ -11690,123 +12250,123 @@
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3005
 msgid "Logged In"
 msgstr "Kirjautui sisään"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3051
 msgid "Last Seen"
 msgstr "Viimeksi nähty"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3071
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3073
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3075
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3404
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3406
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3551
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3552 ../pidgin/gtkblist.c:3585
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3553
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3554
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3555 ../pidgin/gtkblist.c:3588
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3556
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3591
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3594
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3691 ../pidgin/gtkdocklet.c:153
 #, 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"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3768
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3770
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3771
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3772
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3974 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:3984
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4008
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4160
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4167
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4178
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4263
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4277
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11825,23 +12385,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4523
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4526
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4532
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4535
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5392
 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. "
@@ -11851,17 +12411,20 @@
 "myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 "aina kuin mahdollista.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Ryhmä:"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5427
+msgid "_Screen name:"
+msgstr "_Näyttönimi:"
+
+#: ../pidgin/gtkblist.c:5449 ../pidgin/gtkblist.c:5803
+msgid "A_lias:"
+msgstr "A_lias:"
+
+#: ../pidgin/gtkblist.c:5715
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5731
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11869,7 +12432,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5772
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11877,39 +12440,39 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5860
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6500
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6524
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6537 ../pidgin/gtkconv.c:2984
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6545
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6557
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6563
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6612
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6682
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -11926,210 +12489,218 @@
 "%s ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:812
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:865
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:895
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:916
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2542 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:999
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1035
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1393
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1401
 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."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1649
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1652
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1672
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1695
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2550
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2601
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2653
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2658
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2661
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2665
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2678
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2820
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2822
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2830
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2837
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2839
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2841
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2851
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2860
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Keskustelu/Lisää lin_kki..."
+
+#: ../pidgin/gtkconv.c:2862
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Keskustelu/Liitä _kuva..."
+
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2872
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2873
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2874
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2875
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2877
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2878
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2954
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
@@ -12138,225 +12709,233 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3008 ../pidgin/gtkconv.c:3040
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3048
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3054
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3058
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3068
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3074
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3078
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3082
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3086
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3090
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3096
+msgid "/Conversation/Insert Link..."
+msgstr "/Keskustelu/Lisää linkki..."
+
+#: ../pidgin/gtkconv.c:3100
+msgid "/Conversation/Insert Image..."
+msgstr "/Keskustelu/Lisää kuva..."
+
+#: ../pidgin/gtkconv.c:3106
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3109
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3122
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3125
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3128
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3212 ../pidgin/gtkconv.c:3254
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3257
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3439
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4153
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4304
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6191 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6197
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6202
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6207 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6212
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7344
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7376
 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?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:7898
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:7904
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:7912
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:7918
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8304
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8827
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8829
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8831 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8833
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8835
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Vain _kuvake"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "_Sekä kuvake että teksti"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Taso "
 
-#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Valitse virheenjäljityssuodattimen taso."
 
-#: ../pidgin/gtkdebug.c:831
-msgid "All"
-msgstr "Kaikki"
-
 #: ../pidgin/gtkdebug.c:832
+msgid "All"
+msgstr "Kaikki"
+
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Muut"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Varoitukset"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Virheet "
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
@@ -12370,8 +12949,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "kehittäjä"
 
@@ -12379,11 +12958,11 @@
 msgid "developer & webmaster"
 msgstr "kehittäjä & verkkosivujen ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "tuki"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "tuki/laadunvarmistus"
 
@@ -12421,7 +13000,7 @@
 msgstr "arabia"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -12434,8 +13013,8 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "katalaani"
 
@@ -12443,7 +13022,7 @@
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "tšekki"
 
@@ -12452,7 +13031,7 @@
 msgstr "tanska"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "saksa"
 
@@ -12481,9 +13060,9 @@
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "espanja"
 
@@ -12496,14 +13075,14 @@
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "ranska"
 
@@ -12519,7 +13098,7 @@
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "heprea"
 
@@ -12535,16 +13114,16 @@
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "georgia"
 
@@ -12560,7 +13139,7 @@
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "korea"
 
@@ -12569,126 +13148,128 @@
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "nepal"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:182
-msgid "Portuguese-Brazil"
-msgstr "portugali (brasilialainen)"
-
 #: ../pidgin/gtkdialogs.c:183
+msgid "Portuguese-Brazil"
+msgstr "portugali (brasilialainen)"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "paštu"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:195
-msgid "Thai"
-msgstr "thai"
-
 #: ../pidgin/gtkdialogs.c:196
+msgid "Thai"
+msgstr "thai"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:369
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -12711,92 +13292,86 @@
 "osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät anna "
 "ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode."
-"net<BR><BR>"
-
 #: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:867
 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ä."
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:959
 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."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12811,30 +13386,30 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12842,29 +13417,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1206
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12873,11 +13448,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -12995,43 +13570,43 @@
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
-msgstr "_Kopioi linkin sijainti"
-
-#: ../pidgin/gtkimhtml.c:3211
+msgstr "_Kopioi linkin osoite"
+
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13041,7 +13616,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13051,7 +13626,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13062,7 +13637,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13073,35 +13648,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13109,81 +13684,81 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "Suurempi kirjasinkoko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "Pienempi kirjasinkoko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "Kirjasintyyppi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "Kirjasimen etualaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "Poista muotoilu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
@@ -13306,7 +13881,7 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:496
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13519,8 +14094,8 @@
 msgstr "_Esikatselu"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
+msgid "P_ounce only when my status is not Available"
+msgstr "I_lmoita vain kun tilani on \"tavoittamattomissa\""
 
 #: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
@@ -13554,7 +14129,7 @@
 msgid "_Show system tray icon:"
 msgstr "_Näytä tarjotinkuvake:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13573,7 +14148,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "Poissaollessa"
 
@@ -13622,39 +14197,55 @@
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "Korosta _väärinkirjoitetut sanat"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "Käytä portaatonta tekstinvieritystä"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Kirjasin"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Käytä asiakirjojen kirjasinta _teemasta"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Käytä kirjasinta _teemasta"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "Keskustelujen _kirjasin:"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13662,119 +14253,119 @@
 "Tältä ulosmenevä viesti näyttää kun käytät yhteyskäytäntöä joka tukee "
 "muotoiluja. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "Portit"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13783,80 +14374,80 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
 msgid "(default)"
 msgstr "(oletus)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "Komento"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13865,117 +14456,117 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
-msgstr "Kun ei tavoitettavissa"
-
-#: ../pidgin/gtkprefs.c:1655
+msgstr "Kun tavoittamattomissa"
+
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
@@ -14064,23 +14655,23 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
@@ -14103,7 +14694,7 @@
 msgstr "Haluatko varmasti poistaa valitut tallenetut tilat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Käytä"
 
@@ -14115,25 +14706,25 @@
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -14190,25 +14781,25 @@
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:593
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14217,12 +14808,12 @@
 "%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
 "erikseen."
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1442
 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."
@@ -14230,31 +14821,31 @@
 "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."
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1454
 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?"
 
-#: ../pidgin/gtkutils.c:1524
-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."
-msgstr ""
-"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."
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Voit lähettää tämän kuvan tiedostonsiirtona tai käyttää sitä "
+"tuttavakuvakkeena tälle käyttäjälle."
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14267,11 +14858,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
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14279,7 +14870,7 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2267
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14290,25 +14881,25 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2563
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2565
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2566
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voitu asettaa"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ei voitu avata tiedostoa \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2715
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14354,6 +14945,26 @@
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Oletus"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin-hymiöt"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Tämän valitseminen ottaa graafiset hymiöt pois käytöstä"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "ei mitään"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Näytä tilastot"
@@ -14635,6 +15246,11 @@
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Ryhmä:"
+
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14666,34 +15282,34 @@
 msgid "_Associate Buddy"
 msgstr "_Yhdistä tuttava"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "Sähköpostia ei voitu lähettää."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "Tälle tuttavalle ei löytynyt sähköpostiosoitetta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Lähetä sähköposti"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Evolution-integraatioasetukset"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
@@ -14703,7 +15319,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Evolution-integrointi"
 
@@ -14711,8 +15327,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
@@ -15135,28 +15751,19 @@
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Käyttämäsi %s-versio on %s. Uusin versio on %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Muutosloki:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Version %s voi noutaa osoitteesta:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"Käyttämäsi %s-versio on %s. Nykyinen versio on %s. Se löytyy osoitteesta <a "
+"href=\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Muutosloki:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "Uusi versio saatavilla"
 
@@ -15166,19 +15773,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "Julkaisuilmoitus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15476,7 +16083,7 @@
 "Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten tuttavalistan "
 "telakoinnin."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Kirjauduttu ulos.</font>"
 
@@ -15486,45 +16093,93 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "XMPP-pääte"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "Käyttäjätili: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ei yhdistetty XMPP:hen</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "Lisää <iq/>-lohko."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "Lisää <presence/>-lohko."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "Lisää <message/>-lohko."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Lähetä ja vastaanota XMPP-raakalohkoja."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Reject watching by other users"
+#~ msgstr "Evää katsominen toisilta käyttäjiltä"
+
+#~ msgid "Block invites"
+#~ msgstr "Estä kutsut"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Evää paikallaolotilan pyynnöt"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteys katkesi kohteeseen %s seuraavasta syystä:\n"
+#~ "%s"
+
+#~ msgid "Alias..."
+#~ msgstr "Alias..."
+
+#~ msgid "/_Help"
+#~ msgstr "/O_hje"
+
+#~ msgid "/Help/Online _Help"
+#~ msgstr "/Ohje/O_hjeita verkossa"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Ohje/Tietoj_a"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode."
+#~ "net<BR><BR>"
+
+#~ 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."
+#~ msgstr ""
+#~ "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."
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "Version %s voi noutaa osoitteesta:<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>."
+
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Näytä/piilota poissaolevat tuttavat"
 
@@ -15683,18 +16338,6 @@
 #~ msgid "Provides options specific to Windows "
 #~ msgstr "Tarjoaa asetukset jotka liittyvät erityisesti Windows-versioon "
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Keskustelu/Lisää lin_kki..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Keskustelu/Liitä _kuva..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Keskustelu/Lisää linkki..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Keskustelu/Lisää kuva..."
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC:</FONT> #wingaim palvelimella irc.freenode."
@@ -15729,9 +16372,6 @@
 #~ msgid "Pidgin encountered errors loading the plugin."
 #~ msgstr "Liitännäistä ladattaessa tapahtui virheitä."
 
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin-käyttäjä"
-
 #~ msgid ""
 #~ "Always use AIM/ICQ proxy server for file transfers\n"
 #~ "(slower, but does not reveal your IP address)"
@@ -15941,9 +16581,6 @@
 #~ msgid "Invalid QQ Facea"
 #~ msgstr "Epäkelpo QQid"
 
-#~ msgid "Connection timeout!"
-#~ msgstr "Ei yhteyttä määräajassa"
-
 #~ msgid "User info is not updated"
 #~ msgstr "Käyttäjätietoja ei ole päivitetty"
 
@@ -16044,9 +16681,6 @@
 #~ msgid "Selection"
 #~ msgstr "Valinta"
 
-#~ msgid "Select a number"
-#~ msgstr "Valitse numero"
-
 #~ msgid "Faces"
 #~ msgstr "Kasvot"