missed some strings

[quassel.git] / po / quassel_fi.po

diff --git a/po/quassel_fi.po b/po/quassel_fi.po
index 6c49bd9..b4b6299 100644 (file)
--- a/po/quassel_fi.po
+++ b/po/quassel_fi.po
@@ -222,13 +222,13 @@ msgstr "Laajennos"
 
 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-msgid "Misc"
-msgstr "Sekalaiset"
+msgid "Aliases"
+msgstr "Aliakset"
 
 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-msgid "Aliases"
-msgstr "Aliakset"
+msgid "IRC"
+msgstr "IRC"
 
 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:13
@@ -246,18 +246,18 @@ msgid "Delete"
 msgstr "Poista"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:34
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:53
-#: ../src/qtui/settingspages/appearancesettingspage.ui:46
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:71
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
 msgid "<System Default>"
 msgstr "<Järjestelmän oletus>"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:151
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:214
 msgid "Please choose a stylesheet file"
 msgstr "Valitse tyylisivutiedosto"
 
@@ -267,46 +267,87 @@ msgid "Form"
 msgstr "Lomake"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:20
-msgid "Client Style"
-msgstr "Asiakkaan tyyli"
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:26
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
 msgstr "Aseta sovelluksen tyyli"
 
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
+msgid "Client style:"
+msgstr "Asiakkaan tyyli:"
+
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgid "Language"
-msgstr "Kieli"
+msgid "Language:"
+msgstr "Kieli:"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:42
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
 msgstr "Aseta sovelluksen kieli. Vaatii uudelleenkäynnistyksen!"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:51
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
 msgid "<Original>"
 msgstr "<Alkuperäinen>"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:62
-msgid "Use Custom Stylesheet"
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+msgid "Use custom stylesheet"
 msgstr "Käytä omaa tyylisivua"
 
 #. ts-context AppearanceSettingsPage
-#~ msgid "/UiStyle/UseCustomStyleSheet"
-#~ msgstr "/UiStyle/UseCustomStyleSheet"
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+msgid "Show system tray icon"
+msgstr "Näytä kuvake ilmoitusalueella"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+msgid "Hide to tray on close button"
+msgstr "Piilota ilmoitusalueelle suljettaessa"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:199
+msgid "Message Redirection"
+msgstr "Viestien uudelleenohjaus"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:205
+msgid "User Notices:"
+msgstr "Käyttäjäilmoitukset:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
+msgid "Server Notices:"
+msgstr "Palvelinilmoitukset:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:262
+msgid "Default Target"
+msgstr "Oletuskohde"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:269
+msgid "Status Window"
+msgstr "Tilaikuna"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:276
+msgid "Current Chat"
+msgstr "Nykyinen keskustelu"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:283
+msgid "Errors:"
+msgstr "Virheet:"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:82
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
 msgid "Path:"
 msgstr "Polku:"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:108
+#: ../src/qtui/settingspages/appearancesettingspage.ui:141
 msgid "..."
 msgstr "..."
 
@@ -325,16 +366,6 @@ msgstr "Näytä verkon nimi"
 msgid "Show Buffer Name"
 msgstr "Näytä puskurin nimi"
 
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-msgid "Misc"
-msgstr "Sekalaiset"
-
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-msgid "Backlog"
-msgstr "Takaloki"
-
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:14
 msgid "Form"
@@ -477,6 +508,16 @@ msgstr ""
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Maksimi määrä noudettuja viestejä kaikissa puskureissa yhteensä."
 
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Interface"
+msgstr "Käyttöliittymä"
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Backlog Fetching"
+msgstr "Takalokin nouto"
+
 #. ts-context BufferItem
 #: ../src/client/networkmodel.cpp:324
 msgid "<p> %1 - %2 </p>"
@@ -518,13 +559,13 @@ msgstr "Näytä / piilota keskustelut"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
-msgid "Misc"
-msgstr "Sekalaiset"
+msgid "Custom Chat Lists"
+msgstr "Omat keskustelulistaukset"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
-msgid "Custom Chat Lists"
-msgstr "Omat keskustelulistaukset"
+msgid "Interface"
+msgstr "Käyttöliittymä"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
@@ -692,17 +733,17 @@ msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:13
+#: ../src/qtui/ui/channellistdlg.ui:14
 msgid "Channel List"
 msgstr "Kanavalista"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:37
+#: ../src/qtui/ui/channellistdlg.ui:38
 msgid "Search Pattern:"
 msgstr "Hakulauseke:"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:47
+#: ../src/qtui/ui/channellistdlg.ui:48
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows to pass search strings to the IRC Server."
@@ -711,33 +752,34 @@ msgstr ""
 "Edistynyt tila sallii hakulausekkeiden antamisen IRC-palvelimelle."
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:61
+#: ../src/qtui/ui/channellistdlg.ui:62
 msgid "Show Channels"
 msgstr "Näytä kanavat"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:85
+#: ../src/qtui/ui/channellistdlg.ui:86
 msgid "Filter:"
 msgstr "Suodatin:"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:97
+#: ../src/qtui/ui/channellistdlg.ui:98
 msgid "Errors Occured:"
 msgstr "Tapahtuneet virheet:"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:131
+#: ../src/qtui/ui/channellistdlg.ui:132
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; "
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-"Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</p>\n"
+"margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
+"font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC "
+"ERROR!!11</span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
 "font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
@@ -747,11 +789,11 @@ msgstr ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; "
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-"Grande'; font-size:13pt;\">MAAILMANLOPPU!!11</p>\n"
+"margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
+"font-family:'Lucida Grande'; font-size:13pt;\">MAAILMANLOPPU!!11</span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
 "font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
@@ -1084,72 +1126,6 @@ msgstr "Kaikki keskustelut"
 msgid "Processed %1 messages in %2 seconds."
 msgstr "Prosessoitiin %1 viestiä %2 sekunnissa."
 
-#. ts-context ClientSyncer
-#~ msgid ""
-#~ "The Quassel Core you try to connect to is too old! Please consider "
-#~ "upgrading."
-#~ msgstr ""
-#~ "Quassel-ydin johon yrität yhdistää on liian vanha! Harkitse päivittämistä."
-
-#. ts-context ClientSyncer
-#~ msgid "<b>Invalid data received from core!</b><br>Disconnecting."
-#~ msgstr ""
-#~ "<b>Ytimeltä vastaanotettuun virheellistä dataa!</b><br>Katkaistaan yhteys."
-
-#. ts-context ClientSyncer
-#~ msgid "No Host to connect to specified."
-#~ msgstr "Verkko-osoitetta johon yhdistää ei ole määritelty."
-
-#. ts-context ClientSyncer
-#~ msgid ""
-#~ "<b>This client is built without SSL Support!</b><br />Disable the usage "
-#~ "of SSL in the account settings."
-#~ msgstr ""
-#~ "<b>Tämä asiakas on käännetty ilman SSL-tukea!</b><br />Kytke SSL:n käyttö "
-#~ "pois tilin asetuksista."
-
-#. ts-context ClientSyncer
-#~ msgid ""
-#~ "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need "
-#~ "at least core/client protocol v%1 to connect."
-#~ msgstr ""
-#~ "<b>Quassel-ydin johon yrität yhdistää on liian vanha!</b>Tarvitaan "
-#~ "vähintään ydin/asiakas -protokolla v%1 yhdistämiseen."
-
-#. ts-context ClientSyncer
-#~ msgid ""
-#~ "<b>The Quassel Core you are trying to connect to does not support "
-#~ "SSL!</b><br />If you want to connect anyways, disable the usage of SSL in "
-#~ "the account settings."
-#~ msgstr ""
-#~ "<b>Quassel-ydin johon yrität yhdistää ei tue SSL:ää!</b><br />Jos haluat "
-#~ "yhdistää siitä huolimatta, kytke SSL:n käyttö pois tilin asetuksista."
-
-#. ts-context ClientSyncer
-#~ msgid "Logging in..."
-#~ msgstr "Kirjaudutaan sisään..."
-
-#. ts-context ClientSyncer
-#~ msgid ""
-#~ "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-#~ msgstr ""
-#~ "<b>Quassel-ytimen versio:</b> %1<br>Käännetty: %2<br>Päällä %3d%4h%5m "
-#~ "(alkaen %6)"
-
-#. ts-context ClientSyncer
-#~ msgid "Cert Digest changed! was: %1"
-#~ msgstr "Varmennetiiviste vaihtunut! oli: %1"
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-msgid "Misc"
-msgstr "Sekalaiset"
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-msgid "Connection"
-msgstr "Yhteys"
-
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1218,6 +1194,11 @@ msgstr " käyttäjää"
 msgid "Minimum delay between requests:"
 msgstr "Vähimmäisiviive pyyntöjen välillä:"
 
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+msgid "IRC"
+msgstr "IRC"
+
 #. ts-context ContentsChatItem
 #: ../src/qtui/chatitem.cpp:594
 msgid "Copy Link Address"
@@ -1669,14 +1650,6 @@ msgstr "Käytä välityspalvelinta"
 msgid "localhost"
 msgstr "localhost"
 
-#. ts-context CoreAccountEditDlg
-#~ msgid "Use secure connection (SSL)"
-#~ msgstr "Käytä salattua yhteyttä (SSL)"
-
-#. ts-context CoreAccountEditDlg
-#~ msgid "Use a proxy:"
-#~ msgstr "Käytä välityspalvelinta:"
-
 #. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
 msgid "Proxy Type:"
@@ -1692,22 +1665,6 @@ msgstr ""
 msgid "HTTP"
 msgstr ""
 
-#. ts-context CoreAccountEditDlg
-#~ msgid "Proxy Host:"
-#~ msgstr "Verkko-osoite:"
-
-#. ts-context CoreAccountEditDlg
-#~ msgid "Proxy Port:"
-#~ msgstr "Portti:"
-
-#. ts-context CoreAccountEditDlg
-#~ msgid "Proxy Username:"
-#~ msgstr "Käyttäjätunnus:"
-
-#. ts-context CoreAccountEditDlg
-#~ msgid "Proxy Password:"
-#~ msgstr "Salasana:"
-
 #. ts-context CoreAccountModel
 #: ../src/client/coreaccountmodel.cpp:62
 msgid "Internal Core"
@@ -1715,11 +1672,10 @@ msgstr "Sisäinen Ydin"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
-msgid "Misc"
-msgstr "Sekalaiset"
+msgid "Remote Cores"
+msgstr "Ulkoiset ytimet"
 
 #. ts-context CoreAccountSettingsPage
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
 msgid "Core Accounts"
 msgstr "Ydintilit"
@@ -1747,7 +1703,7 @@ msgstr "Poista"
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
 msgid "Automatically connect on startup"
-msgstr "Yhdistä automaattisesti käynnistyksen yhteydessä"
+msgstr "Yhdistä käynnistyksen yhteydessä automaattisesti"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
@@ -1824,46 +1780,6 @@ msgstr ""
 "Jos sinun täytyy tehdä jotain näistä asioista, aja \"<tt><nobr>quasselcore "
 "--help</nobr></tt>\" palvelimellasi."
 
-#. ts-context CoreConfigWizardAdminUserPage
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-family:'Lucida Grande'; font-size:13pt;\"><span style=\" "
-#~ "font-size:10pt; font-weight:600;\">Note: </span><span style=\" "
-#~ "font-size:10pt;\">Adding more users and changing your username/password "
-#~ "is not possible via Quassel's interface yet.</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-family:'Lucida Grande'; font-size:10pt;\">If you need to do these "
-#~ "things have a look at the manageusers.py script which is located in the "
-#~ "/scripts directory.</p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-family:'Lucida Grande'; font-size:13pt;\"><span style=\" "
-#~ "font-size:10pt; font-weight:600;\">Huom: </span><span style=\" "
-#~ "font-size:10pt;\">Quassel-asiakas ei vielä pysty lisäämään käyttäjiä tai "
-#~ "vaihtamaan käyttäjätunnusta/salasanaa.</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-family:'Lucida Grande'; font-size:10pt;\">Kyseiset toiminnot "
-#~ "onnistuvat /scripts -kansiosta löytyvän manageusers.py -skriptin "
-#~ "avulla.</p></body></html>"
-
 #. ts-context CoreConfigWizardIntroPage
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
 msgid "Form"
@@ -2011,236 +1927,71 @@ msgstr "Käyttäjätunnus:"
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#. ts-context CoreConnectDlg
-#~ msgid "Remove Account Settings"
-#~ msgstr "Poista tilin asetukset"
-
-#. ts-context CoreConnectDlg
-#~ msgid ""
-#~ "Do you really want to remove your local settings for this Quassel Core "
-#~ "account?<br>Note: This will <em>not</em> remove or change any data on the "
-#~ "Core itself!"
-#~ msgstr ""
-#~ "Haluatko varmasti poistaa tämän Quassel-ytimen paikalliset "
-#~ "asetuksesi?<br>Huom: Tämä <em>ei</em> poista tai muuta ytimessä itsessään "
-#~ "sijaitsevaa dataa!"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Connect to %1"
-#~ msgstr "Yhdistä kohteeseen %1"
-
-#. ts-context CoreConnectDlg
-#~ msgid "<div style=color:red;>Connection to %1 failed!</div>"
-#~ msgstr "<div style=color:red;>Yhdistäminen kohteeseen %1 epäonnistui!</div>"
-
-#. ts-context CoreConnectDlg
-#~ msgid "<div>Errors occurred while connecting to \"%1\":</div>"
-#~ msgstr "<div>Kohteeseen \"%1\" yhdistettäessä tapahtui virhe:</div>"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Not connected to %1."
-#~ msgstr "Ei yhdistetty kohteeseen %1."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Looking up %1..."
-#~ msgstr "Selvitetään verkkonimeä %1..."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Connecting to %1..."
-#~ msgstr "Yhdistetään kohteeseen %1..."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Connected to %1"
-#~ msgstr "Yhdistetty kohteeseen %1"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Unknown connection state to %1"
-#~ msgstr "Tuntematon yhteyden tila kohteeseen %1"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Logging in..."
-#~ msgstr "Kirjaudutaan sisään..."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Login"
-#~ msgstr "Kirjaudu sisään"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Connect to Quassel Core"
-#~ msgstr "Yhdistä Quassel-ytimeen"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Edit..."
-#~ msgstr "Muokkaa..."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Add..."
-#~ msgstr "Lisää..."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Delete"
-#~ msgstr "Poista"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Use internal core"
-#~ msgstr "Käytä sisäistä ydintä"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Always use this account"
-#~ msgstr "Käytä aina tätä tiliä"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Initializing your connection"
-#~ msgstr "Yhteyttäsi alustetaan"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Connected to apollo.mindpool.net."
-#~ msgstr "Yhdistetty kohteeseen apollo.mindpool.net."
-
-#. ts-context CoreConnectDlg
-#~ msgid ""
-#~ "THIS IS A PLACEHOLDER\n"
-#~ "TO\n"
-#~ "RESERVE\n"
-#~ "SOME SPACE"
-#~ msgstr ""
-#~ "TÄMÄ ON TÄYTETEKSTIÄ\n"
-#~ "JOLLA\n"
-#~ "VARATAAN\n"
-#~ "TILAA"
-
-#. ts-context CoreConnectDlg
-#~ msgid "User:"
-#~ msgstr "Käyttäjä:"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Password:"
-#~ msgstr "Salasana:"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Remember"
-#~ msgstr "Muista"
-
-#. ts-context CoreConnectDlg
-#~ msgid "View SSL Certificate"
-#~ msgstr "Näytä SSL-varmenne"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Add to known hosts"
-#~ msgstr "Lisää tunnettuihin isäntiin"
-
-#. ts-context CoreConnectDlg
-#~ msgid "view SSL Certificate"
-#~ msgstr "näytä SSL-varmenne"
-
-#. ts-context CoreConnectDlg
-#~ msgid "add to known hosts"
-#~ msgstr "lisää tunnettuihin palvelimiin"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Continue connection"
-#~ msgstr "Jatka yhdistämistä"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Configure your Quassel Core"
-#~ msgstr "Tee Quassel-ytimesi asetukset"
-
-#. ts-context CoreConnectDlg
-#~ msgid ""
-#~ "The Quassel Core you are connected to is not configured yet. You may now "
-#~ "launch a configuration wizard that helps you setting up your Core."
-#~ msgstr ""
-#~ "Asetuksia ei ole vielä tehty Quassel-ytimellä johon olet yhdistetty. Voit "
-#~ "nyt käynnistää ohjatun asetusten tekemisen joka auttaa ytimesi "
-#~ "käyttöönotossa."
-
-#. ts-context CoreConnectDlg
-#~ msgid "Launch Wizard"
-#~ msgstr "Käynnistä ohjattu toiminto"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Initializing your session..."
-#~ msgstr "Istuntoasi alustetaan..."
-
-#. ts-context CoreConnectDlg
-#~ msgid ""
-#~ "<b>Please be patient while your client synchronizes with the Quassel "
-#~ "Core!</b>"
-#~ msgstr ""
-#~ "<b>Asiakastasi synkronoidaan Quassel-ytimen kanssa. Odota hetki...</b>"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Session state:"
-#~ msgstr "Istunnon tila:"
-
-#. ts-context CoreConnectDlg
-#~ msgid "Network states:"
-#~ msgstr "Verkkojen tilat:"
-
-#. ts-context CoreConnectDlg
-#~ msgid "0/0"
-#~ msgstr "0/0"
-
 #. ts-context CoreConnectDlg
 #: ../src/qtui/coreconnectdlg.cpp:40
 msgid "Connect to Core"
 msgstr "Yhdistä ytimeen"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:105
+#: ../src/client/coreconnection.cpp:342
 msgid "Disconnected from core."
 msgstr "Katkaise yhteys ytimeen."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:123 ../src/client/coreconnection.cpp:232
+#: ../src/client/coreconnection.cpp:200 ../src/client/coreconnection.cpp:315
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:126
+#: ../src/client/coreconnection.cpp:166
+msgid "Network is down"
+msgstr "Verkkoyhteys katkennut"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:203
 msgid "Looking up %1..."
 msgstr "Selvitetään verkkonimeä %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:129 ../src/client/coreconnection.cpp:331
+#: ../src/client/coreconnection.cpp:206 ../src/client/coreconnection.cpp:443
 msgid "Connecting to %1..."
 msgstr "Yhdistetään kohteeseen %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:132 ../src/client/coreconnection.cpp:452
+#: ../src/client/coreconnection.cpp:209 ../src/client/coreconnection.cpp:564
 msgid "Connected to %1"
 msgstr "Yhdistetty kohteeseen %1"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:135
+#: ../src/client/coreconnection.cpp:212
 msgid "Disconnecting from %1..."
 msgstr "Katkaistaan yhteyttä kohteeseen %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:193
+#: ../src/client/coreconnection.cpp:269
 msgid ""
 "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
 "Quassel-ydin johon yrität yhdistää on liian vanha! Harkitse päivittämistä."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:221
+#: ../src/client/coreconnection.cpp:297
 msgid "Invalid data received from core"
 msgstr "Ytimeltä vastaanotettiin virheellistä dataa"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:308 ../src/client/coreconnection.cpp:390
-#: ../src/client/coreconnection.cpp:435
+#: ../src/client/coreconnection.cpp:420 ../src/client/coreconnection.cpp:502
+#: ../src/client/coreconnection.cpp:547
 msgid "Unencrypted connection canceled"
 msgstr "Salaamaton yhteys peruutettu"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:338
+#: ../src/client/coreconnection.cpp:450
 msgid "Synchronizing to core..."
 msgstr "Synkronoidaan ytimen kanssa..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:359
+#: ../src/client/coreconnection.cpp:471
 msgid ""
 "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
 "least core/client protocol v%1 to connect."
@@ -2249,47 +2000,139 @@ msgstr ""
 "tarvitaan vähintään ydin/asiakas -protokolla v%1."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:583
 msgid "Logging in..."
 msgstr "Kirjaudutaan sisään..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:476
+#: ../src/client/coreconnection.cpp:588
 msgid "Login canceled"
 msgstr "Sisäänkirjautuminen peruutettu"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:499
+#: ../src/client/coreconnection.cpp:613
 msgid "Receiving session state"
 msgstr "Vastaanotetaan istunnon tilaa"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:501
+#: ../src/client/coreconnection.cpp:615
 msgid "Synchronizing to %1..."
 msgstr "Synkronoidaan kohteen %1 kanssa..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:522
+#: ../src/client/coreconnection.cpp:636
 msgid "Receiving network states"
 msgstr "Vastaanotetaan verkkojen tiloja"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:571
+#: ../src/client/coreconnection.cpp:686
 msgid "Synchronized to %1"
 msgstr "Synkronoitu kohteen %1 kanssa"
 
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgid "Remote Cores"
+msgstr "Ulkoiset ytimet"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgid "Connection"
+msgstr "Yhteys"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:14
+msgid "Form"
+msgstr "Lomake"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
+msgid "Network Status Detection"
+msgstr "Verkkoyhteyden tilan tunnistus"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
+msgid ""
+"Rely on KDE's hardware layer to detect if we're online. Recommended for most "
+"KDE users"
+msgstr ""
+"Käytä KDE:n laitteistorajapintaa verkkoyhteyden saatavuuden tunnistamiseen. "
+"Suositellaan useimmille KDE:n käyttäjille"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
+msgid "Use KDE's network status detection (via Solid)"
+msgstr "Käytä KDE:n verkkotilan tunnistusta (Solid:in kautta)"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgid ""
+"Actively ping the remote core and disconnect if we didn't get a reply after "
+"a certain time"
+msgstr ""
+"Lähetä ytimelle säännöllisesti ping -viesti, ja katkaise yhteys jos "
+"vastauksen saapuminen kestää yli määrätyn ajan"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
+msgid "Ping timeout after"
+msgstr "Ping -aikakatkaisu"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
+msgid " seconds"
+msgstr " sekuntia"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
+msgid ""
+"Only disconnect if the network socket gets closed by the operating system. "
+"This may take a long time after actually losing connectivity"
+msgstr ""
+"Katkaise yhteys vain jos käyttöjärjestelmä sulkee yhteyden. Tämä saattaa "
+"kestää pitkän ajan varsinaisen yhteyden kadottamisen jälkeen"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
+msgid "Never time out actively"
+msgstr "Älä koskaan aikakatkaise aktiivisesti"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
+msgid "Automatically reconnect on network failures"
+msgstr "Yhdistä uudelleen automaattisesti"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
+msgid "Retry every"
+msgstr "Uudelleenkokeiluväli"
+
 #. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgid "(Lag: %1 ms)"
-msgstr "(Viive: %1 ms)"
+msgctxt "seconds"
+msgid "s"
+msgstr "s"
 
 #. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:74
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "milliseconds"
+msgid "ms"
+msgstr "ms"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+msgid "(Lag: %1 %2)"
+msgstr "(Viive: %1 %2)"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:75
 msgid "The connection to your core is encrypted with SSL."
 msgstr "Yhteytesi ytimeen on salattu SSL:llä."
 
 #. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:77
+#: ../src/qtui/coreconnectionstatuswidget.cpp:78
 msgid "The connection to your core is not encrypted."
 msgstr "Yhteytesi ytimeen ei ole salattu."
 
@@ -2396,17 +2239,17 @@ msgid "Connection failure: %1"
 msgstr "Yhteysvirhe: %1"
 
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:192
+#: ../src/core/coresession.cpp:195
 msgid "Client"
 msgstr "Asiakas"
 
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:192
+#: ../src/core/coresession.cpp:195
 msgid "disconnected (UserId: %1)."
 msgstr "yhteys katkaistu (UserId: %1)."
 
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:386
+#: ../src/core/coresession.cpp:389
 msgid ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
 "create network %1!"
@@ -2415,7 +2258,7 @@ msgstr ""
 "yrittäessään luoda verkkoa %1!"
 
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:417
+#: ../src/core/coresession.cpp:420
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
@@ -2434,22 +2277,22 @@ msgid "sending CTCP-%1 request"
 msgstr "lähetetään CTCP-%1 -pyyntö"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:16
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
 msgstr "Luo uusi henkilöllisyys"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:24
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
 msgid "Identity name:"
 msgstr "Henkilöllisyyden nimi:"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:36
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
 msgid "Create blank identity"
 msgstr "Luo tyhjä henkilöllisyys"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:48
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
 msgid "Duplicate:"
 msgstr "Luo kopio:"
 
@@ -2513,10 +2356,6 @@ msgstr "Väliaik. poistetut puskurit:"
 msgid "Add Buffers Automatically:"
 msgstr "Lisää puskurit automaattisesti:"
 
-#. ts-context DebugBufferViewOverlay
-#~ msgid "Add Bufers Automatically:"
-#~ msgstr "Lisää puskurit automaattisesti:"
-
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:58
 msgid "Hide inactive buffers:"
@@ -2553,22 +2392,22 @@ msgid "Overlay Properties"
 msgstr "Ominaisuudet"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:13
+#: ../src/qtui/ui/debugconsole.ui:14
 msgid "Debug Console"
 msgstr "Vianjäljityskonsoli"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:52
+#: ../src/qtui/ui/debugconsole.ui:44
 msgid "local"
 msgstr "paikallinen"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:62
+#: ../src/qtui/ui/debugconsole.ui:54
 msgid "core"
 msgstr "ydin"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:90
+#: ../src/qtui/ui/debugconsole.ui:82
 msgid "Evaluate!"
 msgstr "Suorita!"
 
@@ -2583,48 +2422,48 @@ msgid "Close"
 msgstr "Sulje"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:13
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:14
 msgid "Form"
 msgstr "Lomake"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:19
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:20
 msgid "Desktop Notification (via D-Bus)"
 msgstr "Työpöytäilmoitus (D-Bus:in kautta)"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:33
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:34
 msgid "Timeout:"
 msgstr "Aikakatkaisu:"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:46
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:47
 msgid " s"
 msgstr " s"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:76
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:77
 msgid "Position hint:"
 msgstr "Paikkavihje:"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:86
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:102
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:87
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:103
 msgid " px"
 msgstr " px"
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:89
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:90
 msgid "X: "
 msgstr "X: "
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:105
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:106
 msgid "Y: "
 msgstr "Y: "
 
 #. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:130
+#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:131
 msgid "Queue unread notifications"
 msgstr "Jonota lukemattomat ilmoitukset"
 
@@ -2663,71 +2502,6 @@ msgstr "Skripti \"%1\" aiheutti virheen %2."
 msgid "Choose..."
 msgstr "Valitse..."
 
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.cpp:28
-msgid "Misc"
-msgstr "Sekalaiset"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:14
-msgid "Form"
-msgstr "Lomake"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:20
-msgid "Show System Tray Icon"
-msgstr "Näytä kuvake ilmoitusalueella"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:29
-msgid "Hide to tray on close button"
-msgstr "Piilota ilmoitusalueelle suljettaessa"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:39
-msgid "Tray Icon"
-msgstr "Ilmoitusaluekuvake"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:45
-msgid "Show system tray icon"
-msgstr "Näytä kuvake ilmoitusalueella"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:58
-msgid "Message Redirection"
-msgstr "Viestien uudelleenohjaus"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:64
-msgid "User Notices:"
-msgstr "Käyttäjäilmoitukset:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:107
-msgid "Server Notices:"
-msgstr "Palvelinilmoitukset:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:121
-msgid "Default Target"
-msgstr "Oletuskohde"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:128
-msgid "Status Window"
-msgstr "Tilaikuna"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:135
-msgid "Current Chat"
-msgstr "Nykyinen keskustelu"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:142
-msgid "Errors:"
-msgstr "Virheet:"
-
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 msgid "Interface"
@@ -2811,13 +2585,13 @@ msgstr "Sama kirjainkoko"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
-msgid "Misc"
-msgstr "Sekalaiset"
+msgid "Identities"
+msgstr "Henkilöllisyydet"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
-msgid "Identities"
-msgstr "Henkilöllisyydet"
+msgid "IRC"
+msgstr "IRC"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:178
@@ -2938,7 +2712,7 @@ msgstr "http://quassel-irc.org - Chat comfortably. Anywhere."
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:219
-#: ../src/qtui/settingspages/identityeditwidget.ui:398
+#: ../src/qtui/settingspages/identityeditwidget.ui:399
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
@@ -2950,15 +2724,15 @@ msgstr "Lataa avain"
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:317
 #: ../src/qtui/settingspages/identityeditwidget.cpp:328
-#: ../src/qtui/settingspages/identityeditwidget.ui:604
+#: ../src/qtui/settingspages/identityeditwidget.ui:605
 msgid "No Key loaded"
 msgstr "Ei ladattua avainta"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:318
 #: ../src/qtui/settingspages/identityeditwidget.cpp:365
-#: ../src/qtui/settingspages/identityeditwidget.ui:624
-#: ../src/qtui/settingspages/identityeditwidget.ui:722
+#: ../src/qtui/settingspages/identityeditwidget.ui:625
+#: ../src/qtui/settingspages/identityeditwidget.ui:723
 msgid "Load"
 msgstr "Lataa"
 
@@ -2986,147 +2760,147 @@ msgstr "Lataa varmenne"
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:363
 #: ../src/qtui/settingspages/identityeditwidget.cpp:364
-#: ../src/qtui/settingspages/identityeditwidget.ui:662
-#: ../src/qtui/settingspages/identityeditwidget.ui:696
+#: ../src/qtui/settingspages/identityeditwidget.ui:663
+#: ../src/qtui/settingspages/identityeditwidget.ui:697
 msgid "No Certificate loaded"
 msgstr "Ei ladattua varmennetta"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:29
+#: ../src/qtui/settingspages/identityeditwidget.ui:30
 msgid "General"
 msgstr "Yleiset"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:37
+#: ../src/qtui/settingspages/identityeditwidget.ui:38
 msgid "Real Name:"
 msgstr "Oikea nimi:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:44
+#: ../src/qtui/settingspages/identityeditwidget.ui:45
 msgid "The \"Real Name\" is shown in /whois."
 msgstr "\"Oikea nimi\" näytetään /whois:sä."
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:53
+#: ../src/qtui/settingspages/identityeditwidget.ui:54
 msgid "Nicknames"
 msgstr "Nimimerkit"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:89
+#: ../src/qtui/settingspages/identityeditwidget.ui:90
 msgid "Add Nickname"
 msgstr "Lisää nimimerkki"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:92
+#: ../src/qtui/settingspages/identityeditwidget.ui:93
 msgid "&Add..."
 msgstr "&Lisää..."
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:115
+#: ../src/qtui/settingspages/identityeditwidget.ui:116
 msgid "Remove Nickname"
 msgstr "Poista nimimerkki"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:118
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
 msgid "Remove"
 msgstr "Poista"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:135
+#: ../src/qtui/settingspages/identityeditwidget.ui:136
 msgid "Rename Identity"
 msgstr "Nimeä nimimerkki uudelleen"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:138
+#: ../src/qtui/settingspages/identityeditwidget.ui:139
 msgid "Re&name..."
 msgstr "&Nimeä uudelleen..."
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:164
+#: ../src/qtui/settingspages/identityeditwidget.ui:165
 msgid "Move upwards in list"
 msgstr "Siirrä listalla ylöspäin"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:167
-#: ../src/qtui/settingspages/identityeditwidget.ui:181
+#: ../src/qtui/settingspages/identityeditwidget.ui:168
+#: ../src/qtui/settingspages/identityeditwidget.ui:182
 msgid "..."
 msgstr "..."
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:178
+#: ../src/qtui/settingspages/identityeditwidget.ui:179
 msgid "Move downwards in list"
 msgstr "Siirrä listalla alaspäin"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:226
+#: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgid "A&way"
 msgstr "&Poissaolo"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:232
+#: ../src/qtui/settingspages/identityeditwidget.ui:233
 msgid "Default Away Settings"
 msgstr "Oletuspoissaoloasetukset"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:243
+#: ../src/qtui/settingspages/identityeditwidget.ui:244
 msgid "Nick to be used when being away"
 msgstr "Nimimerkki jota käytetään poissa oltaessa"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:253
+#: ../src/qtui/settingspages/identityeditwidget.ui:254
 msgid "Default away reason"
 msgstr "Oletuspoissaolosyy"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:260
+#: ../src/qtui/settingspages/identityeditwidget.ui:261
 msgid "Away Nick:"
 msgstr "Nimimerkki:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:267
-#: ../src/qtui/settingspages/identityeditwidget.ui:296
-#: ../src/qtui/settingspages/identityeditwidget.ui:365
+#: ../src/qtui/settingspages/identityeditwidget.ui:268
+#: ../src/qtui/settingspages/identityeditwidget.ui:297
+#: ../src/qtui/settingspages/identityeditwidget.ui:366
 msgid "Away Reason:"
 msgstr "Poissaolosyy:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:279
+#: ../src/qtui/settingspages/identityeditwidget.ui:280
 msgid "Set away when all clients have detached from the core"
 msgstr ""
 "Siirry poissa-tilaan kun kaikki asiakkaat ovat katkaisseet yhteyden ytimeen"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:282
+#: ../src/qtui/settingspages/identityeditwidget.ui:283
 msgid "Away On Detach"
 msgstr "Poissa-tilaan asiakkaitten kadottua"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:314
+#: ../src/qtui/settingspages/identityeditwidget.ui:315
 msgid "Not implemented yet"
 msgstr "Ei vielä toteutettu"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:317
+#: ../src/qtui/settingspages/identityeditwidget.ui:318
 msgid "Away On Idle"
 msgstr "Poissa-tilaan jouten ollessa"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:331
+#: ../src/qtui/settingspages/identityeditwidget.ui:332
 msgid "Set away after"
 msgstr "Siirry poissa-tilaan"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:341
+#: ../src/qtui/settingspages/identityeditwidget.ui:342
 msgid "minutes of being idle"
 msgstr "minuutin joutenolon jälkeen"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:406
+#: ../src/qtui/settingspages/identityeditwidget.ui:407
 msgid "Ident:"
 msgstr "Ident:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:413
+#: ../src/qtui/settingspages/identityeditwidget.ui:414
 msgid ""
 "The \"ident\" is part of your hostmask and, together with your host, "
 "uniquely identifies you within the IRC network."
@@ -3135,27 +2909,27 @@ msgstr ""
 "sinut IRC-verkon sisällä."
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:422
+#: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgid "Messages"
 msgstr "Viestit"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:430
+#: ../src/qtui/settingspages/identityeditwidget.ui:431
 msgid "Part Reason:"
 msgstr "Poistumissyy:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:443
+#: ../src/qtui/settingspages/identityeditwidget.ui:444
 msgid "Quit Reason:"
 msgstr "Lopetussyy:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:453
+#: ../src/qtui/settingspages/identityeditwidget.ui:454
 msgid "Kick Reason:"
 msgstr "Potkimissyy:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:487
+#: ../src/qtui/settingspages/identityeditwidget.ui:488
 msgid ""
 "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
 msgstr ""
@@ -3163,7 +2937,7 @@ msgstr ""
 "SSL-asetuksia"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:516
+#: ../src/qtui/settingspages/identityeditwidget.ui:517
 msgid ""
 "Warning: you are not connected with a secured connection to the Quassel "
 "Core!\n"
@@ -3175,32 +2949,32 @@ msgstr ""
 "salaamattomana!"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:545
+#: ../src/qtui/settingspages/identityeditwidget.ui:546
 msgid "Continue"
 msgstr "Jatka"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:583
+#: ../src/qtui/settingspages/identityeditwidget.ui:584
 msgid "Use SSL Key"
 msgstr "Käytä SSL-avainta"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:597
+#: ../src/qtui/settingspages/identityeditwidget.ui:598
 msgid "Key Type:"
 msgstr "Avaimen tyyppi:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:636
+#: ../src/qtui/settingspages/identityeditwidget.ui:637
 msgid "Use SSL Certificate"
 msgstr "Käytä SSL-varmennetta"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:655
+#: ../src/qtui/settingspages/identityeditwidget.ui:656
 msgid "Organisation:"
 msgstr "Yritys:"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.ui:689
+#: ../src/qtui/settingspages/identityeditwidget.ui:690
 msgid "CommonName:"
 msgstr "CommonName:"
 
@@ -3214,82 +2988,6 @@ msgstr "Määritä henkilöllisyys"
 msgid "Default Identity"
 msgstr "Oletushenkilöllisyys"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid "Configure ignore rule"
-#~ msgstr "Määritä suodatussääntö"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Strictness:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Dynamic:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Messages are "
-#~ "filtered \"on the fly\".</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Whenever you "
-#~ "disable/delete the ignore rule,</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">the messages are "
-#~ "shown again.</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Permanent:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Messages are "
-#~ "filtered before they get stored in the database.</p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Taso:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Dynaaminen:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Viestit "
-#~ "suodatetaan \"lennossa\".</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Jos otat "
-#~ "suodattimen pois käytöstä tai poistat sen,</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">näytetään "
-#~ "viestit jälleen.</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Pysyvä:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Viestit "
-#~ "suodatetaan ennen kuin ne tallennetaan tietokantaan.</p></body></html>"
-
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
 msgid "Strictness"
@@ -3305,78 +3003,6 @@ msgstr "Dynaaminen"
 msgid "Permanent"
 msgstr "Pysyvä"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Rule Type:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">By Sender:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The rule is "
-#~ "matched against the sender string </p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\">\"nick!ident@host.name\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">By Message:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The rule is "
-#~ "matched against the actual message content</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "text-decoration: underline;\"></p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Sääntötyyppi:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Lähettäjä:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Sääntöä "
-#~ "verrataan lähettäjämerkkijonoon </p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\">\"nimimerkki!ident@verkko.osoite\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Viesti:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Sääntöä "
-#~ "verrataan viestin varsinaiseen sisältöön</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "text-decoration: underline;\"></p></body></html>"
-
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
 msgid "Rule Type"
@@ -3392,322 +3018,6 @@ msgstr "Lähettäjä"
 msgid "Message"
 msgstr "Viesti"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Ignore rule:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Depending on the "
-#~ "type of the rule, the text is matched against either:</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- <span style=\" "
-#~ "text-decoration: underline;\">the message content:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "text-decoration: underline;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-style:italic;\">Example:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">    \"*foobar*\" "
-#~ "matches any text containing the word \"foobar\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- <span style=\" "
-#~ "text-decoration: underline;\">the sender string </span><span style=\" "
-#~ "font-style:italic; text-decoration: "
-#~ "underline;\">nick!ident@host.name</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-style:italic; text-decoration: underline;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-style:italic;\">Examples:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">    "
-#~ "\"*@foobar.com\" matches any sender from host \"foobar.com\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">    "
-#~ "\"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from "
-#~ "any host</p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Suodatussääntö:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Säännön tyypistä "
-#~ "riippuen tekstiä verrataan joko:</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- <span style=\" "
-#~ "text-decoration: underline;\">viestin sisältöön:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "text-decoration: underline;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-style:italic;\">Esimerkki:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">    \"*foobar*\" "
-#~ "pätee jokaiseen viestiin joka sisältää sanan \"foobar\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- <span style=\" "
-#~ "text-decoration: underline;\">lähettäjämerkkijonoon </span><span style=\" "
-#~ "font-style:italic; text-decoration: "
-#~ "underline;\">nimimerkki!ident@verkko.osoite</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-style:italic; text-decoration: underline;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-style:italic;\">Esimerkkejä:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">    "
-#~ "\"*@foobar.com\" pätee jokaiseen lähettäjään verkko-osoitteesta "
-#~ "\"foobar.com\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">    "
-#~ "\"idiootti!.+\" (RegEx) pätee jokaiseen lähettäjään jonka nimimerkki on "
-#~ "\"idiootti\", mistä tahansa verkko-osoitteesta</p></body></html>"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid "Ignore rule"
-#~ msgstr "Suodatussääntö"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Use RegularExpressions:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">If enabled, "
-#~ "rules follow regular expression syntax.</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Otherwise rules "
-#~ "allow wildcard matching with </p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> *: represents "
-#~ "\"any amount of any character\"</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> ?: represents "
-#~ "\"one or none character\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Käytä säännöllisiä ilmauksia (RegEx):</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Jos valittu, "
-#~ "säännöt tulkitaan säännöllisinä ilmauksina (RegEx).</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Muuten säännöt "
-#~ "voivat sisältää jokerimerkkejä seuraavasti:</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> *: tarkoittaa "
-#~ "\"mitä tahansa merkkiä kuinka monta tahansa\"</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> ?: tarkoittaa "
-#~ "\"yksi tai ei yhtään merkkiä\"</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p></body></html>"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid "Use Regular Expressions"
-#~ msgstr "Käytä säännöllisiä ilmauksia (RegEx)"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Enable / Disable:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "-qt-user-state:768;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Only enabled "
-#~ "rules are filtered.</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "-qt-user-state:768;\">For dynamic rules, disabling actually shows the "
-#~ "filtered messages again.</p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Ota käyttöön / poista käytöstä:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "-qt-user-state:768;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Vain käytössä "
-#~ "olevat säännöt otetaan suodatuksessa huomioon.</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "-qt-user-state:768;\">Dynaamisen säännön käytöstä poistaminen näyttää "
-#~ "suodatetut viestit jälleen.</p></body></html>"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid "Enabled"
-#~ msgstr "Käytössä"
-
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Scope:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Global:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The rule is "
-#~ "active for any channel on any network</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Network:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The list below "
-#~ "is interpreted as a list of networks for which the rule should match</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Channel:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The list below "
-#~ "is interpreted as a list of channels for which the rule should "
-#~ "match</p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Laajuus:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Globaali:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Sääntö pätee "
-#~ "millä vain kanavalla missä tahansa verkossa</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Verkko:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Alla oleva lista "
-#~ "tulkitaan listaksi verkkoja joissa sääntö pätee</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "text-decoration: underline;\">Kanava:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Alla oleva lista "
-#~ "tulkitaan listaksi kanavia joissa sääntö pätee</p></body></html>"
-
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
 msgid "Configure Ignore Rule"
@@ -3731,22 +3041,6 @@ msgstr ""
 "<p><u>Pysyvä:</u></p>\n"
 "<p>Viestit suodatetaan jo ennen niiden tallentamista tietokantaan.</p>"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<p><b>Rule Type:</b></p>\n"
-#~ "<p><u>By Sender:</u></p>\n"
-#~ "<p>The rule is matched against the sender string\n"
-#~ "<i>nick!ident@host.name<i></p>\n"
-#~ "<p><u>By Message:</u></p>\n"
-#~ "<p>The rule is matched against the actual message content</p>"
-#~ msgstr ""
-#~ "<p><b>Sääntötyyppi:</b></p>\n"
-#~ "<p><u>Lähettäjän mukaan:</u></p>\n"
-#~ "<p>Sääntöä testataan seuraavan kaltaista lähettäjämerkkijonoa vastaan:\n"
-#~ "<i>nimimerkki!ident@verkko.osoite</i></p>\n"
-#~ "<p><u>Viestin mukaan:</u></p>\n"
-#~ "<p>Sääntöä testataan viestin varsinaista sisältöä vastaan.</p>"
-
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
 msgid ""
@@ -3910,73 +3204,6 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr "Käytössä"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Scope rule:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">A scope rule is "
-#~ "a semicolon separated list of either</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">network or "
-#~ "channel names.</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-style:italic;\">Example:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">\"#quassel*; "
-#~ "#foobar\"</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">would match on "
-#~ "#foobar and on any channel starting with \"#quassel\"</p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-weight:600;\">Laajuussääntö:</span></p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "
-#~ "font-weight:600;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Laajuussääntö on "
-#~ "puolipilkuilla eroteltu lista joko</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">verkkojen tai "
-#~ "kanavien nimiä.</p>\n"
-#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-#~ "text-indent:0px;\"></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" "
-#~ "font-style:italic;\">Esimerkki:</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">\"#quassel*; "
-#~ "#foobar\"</p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-#~ "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">pätisi kanavaan "
-#~ "#foobar ja mihin tahansa kanavaan jonka nimi alkaa "
-#~ "\"#quassel\"</p></body></html>"
-
 #. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:69
 msgid ""
@@ -4035,17 +3262,13 @@ msgstr "Suodatussääntö"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
-msgid "Misc"
-msgstr "Sekalaiset"
-
-#. ts-context IgnoreListSettingsPage
-#~ msgid "Ignorelist"
-#~ msgstr "Suodatuslista"
+msgid "Ignore List"
+msgstr "Suodatuslista"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
-msgid "Ignore List"
-msgstr "Suodatuslista"
+msgid "IRC"
+msgstr "IRC"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
@@ -4771,19 +3994,11 @@ msgstr "Aina"
 msgid "Core Connection Error"
 msgstr "Virhe yhteydessä ytimeen"
 
-#. ts-context MainWin
-#~ msgid "Core Lag: %1"
-#~ msgstr "Ydinviive: %1"
-
 #. ts-context MainWin
 #: ../src/qtui/mainwin.cpp:804
 msgid "Not connected to core."
 msgstr "Ei yhteyttä ytimeen."
 
-#. ts-context Message
-#~ msgid "Day changed to %1"
-#~ msgstr "Päivä vaihtui %1"
-
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:373
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -4812,47 +4027,47 @@ msgid "Paste Protection"
 msgstr "Liittämissuoja"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:13
+#: ../src/qtui/settingspages/networkadddlg.ui:14
 msgid "Add Network"
 msgstr "Lisää verkko"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:21
+#: ../src/qtui/settingspages/networkadddlg.ui:22
 msgid "Use preset:"
 msgstr "Käytä valmista:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:56
+#: ../src/qtui/settingspages/networkadddlg.ui:57
 msgid "Manually specify network settings"
 msgstr "Määritä verkon asetukset manuaalisesti"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:66
+#: ../src/qtui/settingspages/networkadddlg.ui:67
 msgid "Manual Settings"
 msgstr "Manuaaliset asetukset"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:74
+#: ../src/qtui/settingspages/networkadddlg.ui:75
 msgid "Network name:"
 msgstr "Verkon nimi:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:84
+#: ../src/qtui/settingspages/networkadddlg.ui:85
 msgid "Server address:"
 msgstr "Palvelimen osoite:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:94
+#: ../src/qtui/settingspages/networkadddlg.ui:95
 msgid "Port:"
 msgstr "Portti:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:114
+#: ../src/qtui/settingspages/networkadddlg.ui:115
 msgid "Server password:"
 msgstr "Salasana:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:130
+#: ../src/qtui/settingspages/networkadddlg.ui:131
 msgid "Use secure connection"
 msgstr "Käytä salattua yhteyttä"
 
@@ -4950,13 +4165,13 @@ msgstr "Määritä verkkoyhteys"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:37
-msgid "Misc"
-msgstr "Sekalaiset"
+msgid "Networks"
+msgstr "Verkot"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:37
-msgid "Networks"
-msgstr "Verkot"
+msgid "IRC"
+msgstr "IRC"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:160
@@ -4997,76 +4212,76 @@ msgstr ""
 "asetukset, mukaanlukien takalokin?"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:13
+#: ../src/qtui/settingspages/networkssettingspage.ui:14
 msgid "Form"
 msgstr "Lomake"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:47
+#: ../src/qtui/settingspages/networkssettingspage.ui:48
 msgid "Re&name..."
 msgstr "&Nimeä uudelleen..."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:64
-#: ../src/qtui/settingspages/networkssettingspage.ui:234
+#: ../src/qtui/settingspages/networkssettingspage.ui:65
+#: ../src/qtui/settingspages/networkssettingspage.ui:235
 msgid "&Add..."
 msgstr "&Lisää..."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:87
-#: ../src/qtui/settingspages/networkssettingspage.ui:251
+#: ../src/qtui/settingspages/networkssettingspage.ui:88
+#: ../src/qtui/settingspages/networkssettingspage.ui:252
 msgid "De&lete"
 msgstr "&Poista"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:123
+#: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgid "Network Details"
 msgstr "Verkon tiedot"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:131
+#: ../src/qtui/settingspages/networkssettingspage.ui:132
 msgid "Identity:"
 msgstr "Henkilöllisyys:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:148
-#: ../src/qtui/settingspages/networkssettingspage.ui:280
-#: ../src/qtui/settingspages/networkssettingspage.ui:294
+#: ../src/qtui/settingspages/networkssettingspage.ui:149
+#: ../src/qtui/settingspages/networkssettingspage.ui:281
+#: ../src/qtui/settingspages/networkssettingspage.ui:295
 msgid "..."
 msgstr "..."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:189
+#: ../src/qtui/settingspages/networkssettingspage.ui:190
 msgid "Servers"
 msgstr "Palvelimet"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:192
+#: ../src/qtui/settingspages/networkssettingspage.ui:193
 msgid "Manage servers for this network"
 msgstr "Hallitse tämän verkon palvelimia"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:216
+#: ../src/qtui/settingspages/networkssettingspage.ui:217
 msgid "&Edit..."
 msgstr "&Muokkaa..."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:277
+#: ../src/qtui/settingspages/networkssettingspage.ui:278
 msgid "Move upwards in list"
 msgstr "Siirrä listalla ylöspäin"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:291
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
 msgid "Move downwards in list"
 msgstr "Siirrä listalla alaspäin"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:336
+#: ../src/qtui/settingspages/networkssettingspage.ui:337
 msgid "Commands"
 msgstr "Komennot"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:339
+#: ../src/qtui/settingspages/networkssettingspage.ui:340
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
@@ -5075,12 +4290,12 @@ msgstr ""
 "palvelimelle yhdistämisen jälkeen"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:345
+#: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgid "Commands to execute on connect:"
 msgstr "Yhdistettäessä suoritettavat komennot:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:361
+#: ../src/qtui/settingspages/networkssettingspage.ui:362
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely "
@@ -5091,90 +4306,90 @@ msgstr ""
 "/join -komentoa tuskin tässä tarvitaan!"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:373
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
 msgid "Connection"
 msgstr "Yhteys"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:382
+#: ../src/qtui/settingspages/networkssettingspage.ui:383
 msgid "Control automatic reconnect to the network"
 msgstr "Määritä tämän verkon automaattisen uudelleenyhdistämisen asetukset"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:385
+#: ../src/qtui/settingspages/networkssettingspage.ui:386
 msgid "Automatic Reconnect"
 msgstr "Automaattinen uudelleenyhdistys"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:397
 msgid "Interval:"
 msgstr "Väli:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:403
+#: ../src/qtui/settingspages/networkssettingspage.ui:404
 msgid " s"
 msgstr " s"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:419
+#: ../src/qtui/settingspages/networkssettingspage.ui:420
 msgid "Retries:"
 msgstr "Yrityksiä:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:439
+#: ../src/qtui/settingspages/networkssettingspage.ui:440
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:465
 msgid "Rejoin all channels on reconnect"
 msgstr "Liity takaisin kanaville uudelleenyhdistyksen jälkeen"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:491
-#: ../src/qtui/settingspages/networkssettingspage.ui:500
+#: ../src/qtui/settingspages/networkssettingspage.ui:492
+#: ../src/qtui/settingspages/networkssettingspage.ui:501
 msgid "Auto Identify"
 msgstr "Automaattitunnistus"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:515
+#: ../src/qtui/settingspages/networkssettingspage.ui:516
 msgid "NickServ"
 msgstr "NickServ"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:532
+#: ../src/qtui/settingspages/networkssettingspage.ui:533
 msgid "Service:"
 msgstr "Palvelu:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:542
+#: ../src/qtui/settingspages/networkssettingspage.ui:543
 msgid "Password:"
 msgstr "Salasana:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:566
+#: ../src/qtui/settingspages/networkssettingspage.ui:567
 msgid "Encodings"
 msgstr "Merkkikoodaukset"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:569
+#: ../src/qtui/settingspages/networkssettingspage.ui:570
 msgid ""
 "Configure advanced settings such as message encodings and automatic reconnect"
 msgstr "Määritä edistyneitä asetuksia, kuten viestien merkkikoodauksia"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:578
+#: ../src/qtui/settingspages/networkssettingspage.ui:579
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Hallitse sisääntulevien ja uloslähtevien viestien merkkikoodauksia"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:581
+#: ../src/qtui/settingspages/networkssettingspage.ui:582
 msgid "Use Custom Encodings"
 msgstr "Käytä mukautettuja merkkikoodauksia"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:592
-#: ../src/qtui/settingspages/networkssettingspage.ui:612
+#: ../src/qtui/settingspages/networkssettingspage.ui:593
+#: ../src/qtui/settingspages/networkssettingspage.ui:613
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
@@ -5183,13 +4398,13 @@ msgstr ""
 "UTF-8 pitäisi olla hyvä valinta useimmille verkoille."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:596
+#: ../src/qtui/settingspages/networkssettingspage.ui:597
 msgid "Send messages in:"
 msgstr "Lähetetyt viestit:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:623
-#: ../src/qtui/settingspages/networkssettingspage.ui:643
+#: ../src/qtui/settingspages/networkssettingspage.ui:624
+#: ../src/qtui/settingspages/networkssettingspage.ui:644
 msgid ""
 "Incoming messages encoded in Utf8 will always be treated as such.\n"
 "This setting defines the encoding for messages that are not Utf8."
@@ -5198,13 +4413,13 @@ msgstr ""
 "Tämä asetus määrittää niiden viestien merkkikoodauksen jotka eivät ole Utf8."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:627
+#: ../src/qtui/settingspages/networkssettingspage.ui:628
 msgid "Receive fallback:"
 msgstr "Vastaanotetut:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:654
-#: ../src/qtui/settingspages/networkssettingspage.ui:668
+#: ../src/qtui/settingspages/networkssettingspage.ui:655
+#: ../src/qtui/settingspages/networkssettingspage.ui:669
 msgid ""
 "This specifies how control messages, nicks and servernames are encoded.\n"
 "Unless you *really* know what you do, leave this as ISO-8859-1!"
@@ -5214,7 +4429,7 @@ msgstr ""
 "Josset *todella* tiedä mitä teet, jätä tämä ISO-8859-1:ksi!"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:658
+#: ../src/qtui/settingspages/networkssettingspage.ui:659
 msgid "Server encoding:"
 msgstr "Palvelin:"
 
@@ -5504,121 +4719,121 @@ msgid "Abort"
 msgstr "Keskeytä"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:13
+#: ../src/qtui/settingspages/servereditdlg.ui:14
 msgid "Dialog"
 msgstr "Valintaikkuna"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:37
+#: ../src/qtui/settingspages/servereditdlg.ui:30
 msgid "Server Info"
 msgstr "Palvelimen tiedot"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:45
+#: ../src/qtui/settingspages/servereditdlg.ui:38
 msgid "Server address:"
 msgstr "Palvelimen osoite:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:52
-#: ../src/qtui/settingspages/servereditdlg.ui:242
+#: ../src/qtui/settingspages/servereditdlg.ui:45
+#: ../src/qtui/settingspages/servereditdlg.ui:227
 msgid "Port:"
 msgstr "Portti:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:79
+#: ../src/qtui/settingspages/servereditdlg.ui:72
 msgid "Password:"
 msgstr "Salasana:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:101
+#: ../src/qtui/settingspages/servereditdlg.ui:94
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:134
+#: ../src/qtui/settingspages/servereditdlg.ui:119
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:155
+#: ../src/qtui/settingspages/servereditdlg.ui:140
 msgid "SSL Version:"
 msgstr "SSL-versio:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:162
+#: ../src/qtui/settingspages/servereditdlg.ui:147
 msgid ""
 "Do not change unless you're going to connect to a server not supporting "
 "SSLv3!"
 msgstr "Älä vaihda ellet yhdistä palvelimeen joka ei tue SSLv3:a!"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:166
+#: ../src/qtui/settingspages/servereditdlg.ui:151
 msgid "SSLv3 (default)"
 msgstr "SSLv3 (default)"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+#: ../src/qtui/settingspages/servereditdlg.ui:156
 msgid "SSLv2"
 msgstr "SSLv2"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:176
+#: ../src/qtui/settingspages/servereditdlg.ui:161
 msgid "TLSv1"
 msgstr "TLSv1"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:186
+#: ../src/qtui/settingspages/servereditdlg.ui:171
 msgid "Use a Proxy"
 msgstr "Käytä välityspalvelinta"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:203
+#: ../src/qtui/settingspages/servereditdlg.ui:188
 msgid "Proxy Type:"
 msgstr "Tyyppi:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:211
+#: ../src/qtui/settingspages/servereditdlg.ui:196
 msgid "Socks 5"
 msgstr "Socks 5"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:216
+#: ../src/qtui/settingspages/servereditdlg.ui:201
 msgid "HTTP"
 msgstr "HTTP"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:228
+#: ../src/qtui/settingspages/servereditdlg.ui:213
 msgid "Proxy Host:"
 msgstr "Verkko-osoite:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:235
+#: ../src/qtui/settingspages/servereditdlg.ui:220
 msgid "localhost"
 msgstr "localhost"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:266
+#: ../src/qtui/settingspages/servereditdlg.ui:251
 msgid "Proxy Username:"
 msgstr "Käyttäjätunnus:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:276
+#: ../src/qtui/settingspages/servereditdlg.ui:261
 msgid "Proxy Password:"
 msgstr "Salasana:"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:77 ../src/qtui/ui/settingsdlg.ui:34
-#: ../src/qtui/ui/settingsdlg.ui:49
+#: ../src/qtui/settingsdlg.cpp:99 ../src/qtui/ui/settingsdlg.ui:35
+#: ../src/qtui/ui/settingsdlg.ui:50
 msgid "Settings"
 msgstr "Asetukset"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:87
+#: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:88
+#: ../src/qtui/settingsdlg.cpp:110
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
@@ -5627,34 +4842,34 @@ msgstr ""
 "muutoksesi käyttöön nyt?"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:100 ../src/qtui/settingsdlg.cpp:104
+#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
 msgid "Configure %1"
 msgstr "Asetukset: %1"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:171
+#: ../src/qtui/settingsdlg.cpp:193
 msgid "Reload Settings"
 msgstr "Lataa asetukset uudelleen"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:171
+#: ../src/qtui/settingsdlg.cpp:193
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 "Haluatko ladata asetukset uudelleen, kumoten tällä sivulla tekemäsi "
 "muutokset?"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:180
+#: ../src/qtui/settingsdlg.cpp:202
 msgid "Restore Defaults"
 msgstr "Palauta oletukset"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:180
+#: ../src/qtui/settingsdlg.cpp:202
 msgid "Do you like to restore the default values for this page?"
 msgstr "Haluatko palauttaa tämän sivun vakioarvot?"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/ui/settingsdlg.ui:13
+#: ../src/qtui/ui/settingsdlg.ui:14
 msgid "Configure Quassel"
 msgstr "Quasselin asetukset"
 
@@ -5696,27 +4911,27 @@ msgid "Settings"
 msgstr "Asetukset"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:865
+#: ../src/common/signalproxy.cpp:878
 msgid "Peer tried to send package larger than max package size!"
 msgstr "Vertainen yritti lähettää paketin joka on sallittua suurempi!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:870
+#: ../src/common/signalproxy.cpp:883
 msgid "Peer tried to send 0 byte package!"
 msgstr "Vertainen yritti lähettää 0 tavun paketin!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:887
+#: ../src/common/signalproxy.cpp:900
 msgid "Peer sent corrupted compressed data!"
 msgstr "Vertainen lähetti viallista pakattua dataa!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:902
+#: ../src/common/signalproxy.cpp:915
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr "Vertainen lähetti viallista dataa: ei voi ladata QVariant:ia!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:1035
+#: ../src/common/signalproxy.cpp:1048
 msgid "Disconnecting"
 msgstr "Katkaistaan yhteys"
 
@@ -5814,62 +5029,6 @@ msgstr ""
 "tallentaa data samalle koneelle kuin millä sitä ajetaan, ja jos ydintäsi "
 "tulee käyttämään vain muutama käyttäjä."
 
-#. ts-context SslCertDisplayDialog
-#~ msgid "SSL Certificate used by %1"
-#~ msgstr "SSL-varmenne jota käyttää %1"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Issuer Info"
-#~ msgstr "Julkaisija"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Organization:"
-#~ msgstr "Organisaatio (O):"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Locality Name:"
-#~ msgstr "Paikkanimi:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Organizational Unit Name:"
-#~ msgstr "Organisaation yksikkö (OU):"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Country Name:"
-#~ msgstr "Maan nimi:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "State or Province Name:"
-#~ msgstr "Osavaltion tai maakunnan nimi:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Subject Info"
-#~ msgstr "Asetettu taholle"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Additional Info"
-#~ msgstr "Lisätietoja"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Valid From:"
-#~ msgstr "Julkaisupäivä:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Valid To:"
-#~ msgstr "Vanhenemispäivä:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Hostname %1:"
-#~ msgstr "Verkko-osoite %1:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "E-Mail Address %1:"
-#~ msgstr "Sähköpostiosoite %1:"
-
-#. ts-context SslCertDisplayDialog
-#~ msgid "Digest:"
-#~ msgstr "Tiiviste:"
-
 #. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:69
 msgid "Yes"