rebase translations

2 files changed, 1460 insertions, 1459 deletions

diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
index 39bd77119..790548b7d 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.mo
+++ b/locale/fi_FI/LC_MESSAGES/messages.mo
diff --git a/locale/fi_FI/LC_MESSAGES/messages.po b/locale/fi_FI/LC_MESSAGES/messages.po
index 09e28c750..161a3f06b 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.po
+++ b/locale/fi_FI/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2015-06-25 22:05+0300\n"
 "Last-Translator: Henrik Ahlgren <[email protected]>\n"
 "Language-Team: \n"
@@ -96,8 +96,8 @@ msgid "Weekly"
 msgstr "Viikoittain"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -167,33 +167,33 @@ msgstr "Lisäosaa ei löydy"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Ladataan, odota..."
 
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "Kaikki artikkelit"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Tähdelliset"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Julkiset"
@@ -256,11 +256,11 @@ msgid "Title"
 msgstr "Otsikko"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Merkitse luetuiksi"
 
@@ -297,7 +297,7 @@ msgid "Feed actions:"
 msgstr "Syötetoiminnot:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Tilaa syöte..."
 
@@ -306,56 +306,44 @@ msgid "Edit this feed..."
 msgstr "Muokkaa tätä syötettä..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Uudelleenpisteytä syöte"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Peru tilaus"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Kaikki syötteet:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Muut toiminnot:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Vaihda näkymä"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Luo tunniste..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Luo suodatin..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Näytä pikanäppäimet"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Päivityksiä saatavilla Gitistä."
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Asetukset"
@@ -370,8 +358,8 @@ msgstr "Poistu asetuksista"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Syötteet"
 
@@ -381,8 +369,8 @@ msgid "Filters"
 msgstr "Suodattimet"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Tunnisteet"
 
@@ -394,80 +382,80 @@ msgstr "Käyttäjät"
 msgid "System"
 msgstr "Järjestelmä"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Luo uusi käyttäjätili"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Uusien käyttäjien rekisteröityminen on hallinnollisesti estetty."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Takaisin Tiny Tiny RSS:ään"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr ""
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Haluttu käyttäjätunnus:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Tarkasta saatavuus"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Paljonko on kaksi plus kaksi:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Lähetä rekisteröinti"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Antamasi rekisteröintitiedot ovat epätäydelliset."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Valitettavasti käyttäjätunnus on jo varattu."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Rekisteröinti epäonnistui."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Käyttäjätunnus luotu onnistuneesti."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Uusien käyttäjien rekisteröinti on tällä hetkellä suljettu."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS:n datapäivitysskripti."
 
@@ -480,10 +468,10 @@ msgstr "Kaikki syötteet"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Luokittelemattomat"
 
@@ -498,287 +486,287 @@ msgstr[1] "%d arkistoitua artikkelia"
 msgid "No feeds found."
 msgstr "Syötteitä ei löytynyt."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Valikko"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Avaa seuraava syöte"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Avaa edellinen syöte"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Avaa seuraava artikkeli"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Avaa edellinen artikkeli"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Avaa seuraava artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Avaa edellinen artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Siirry seuraavaan artikkeliin (älä laajenna tai merkitse luetuksi)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Siirry edelliseen artikkeliin (älä laajenna tai merkitse luetuksi)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Näytä hakudialogi"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artikkeli"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Lisää/Poista tähti"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Vaihda julkinen-tilaa"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Vaihda luettu/lukematon"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Muokkaa avainsanoja"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Merkitse alla olevat luetuiksi"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Merkitse yllä olevat luetuiksi"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Vieritä alas"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Vieritä ylös"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Valitse osoittimen kohdalla oleva artikkeli"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Lähetä artikkeli sähköpostilla"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Piilota/näytä artikkeli"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Vaihda automaattilaajennuksen tila (yhdistelmänäkymässä)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Vaihda alkuperäinen liitetty"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Artikkelin valinta"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Valitse kaikki artikkelit"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Valitse lukemattomat"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Valitse tähdellä merkityt"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Valitse julkaistu"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Vaihda valittujen tila"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Poista valinnat"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Syöte"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Päivitä tämänhetkinen syöte"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Tilaa syöte"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Muokkaa syötettä"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Otsikot käänteisjärjestyksessä"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Merkitse kaikki syötteet luetuiksi"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Piilota/näytä tämänhetkinen kansio"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Vaihda yhdistelmänäkymän tila"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Vaihda automaattilaajennuksen tila yhdistelmänäkymässä"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Vaihda yhdistelmänäkymän tila"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Mene"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Kaikki artikkelit"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Päivitä"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Avainsanapilvi"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Muu"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Luo tunniste"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Luo suodatin"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Piilota/näytä sivupalkki"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Näytä ohjeikkuna"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 msgid "No file was uploaded"
 msgstr ""
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -791,9 +779,9 @@ msgid "Profile:"
 msgstr "Profiili:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Oletusprofiili"
 
@@ -810,127 +798,59 @@ msgid "Remember me"
 msgstr "Muista kirjautumiseni"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Istunnon validointi epäonnistui (tietokantakaava muuttunut)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Session validointi epäonnistui (salasana vaihtunut)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Session validointi epäonnistui (salasana vaihtunut)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Istunnon validointi epäonnistui (käyttäjää ei löydy)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artikkelia ei löytynyt"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Tallenna"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Peru"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "ei avainsanoja"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tuntematon tyyppi"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Litteet"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "kommentti"
-msgstr[1] "kommenttia"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "Litteet"
+#: classes/backend.php:31
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "Lisää käyttövinkkejä löydät Tiny Tiny RSS -wikistä."
 
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
+#: classes/backend.php:36
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
 
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Muokkaa tämän artikkelin avainsanoja"
+#: classes/backend.php:59
+msgid "Shift"
+msgstr "Shift"
 
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr ""
+#: classes/backend.php:62
+msgid "Ctrl"
+msgstr "Ctrl"
 
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Syötteen osoite"
+#: classes/backend.php:97
+msgid "Help topic not found."
+msgstr "Aiheesta ei löytynyt ohjeita."
 
-#: classes/article.php:811
 #: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
 #: classes/dlg.php:33
 #: classes/dlg.php:56
 #: classes/dlg.php:89
 #: classes/dlg.php:154
 #: classes/dlg.php:181
 #: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
+#: classes/article.php:810
 #: plugins/af_psql_trgm/init.php:109
 #: plugins/import_export/init.php:446
 #: plugins/import_export/init.php:490
@@ -938,260 +858,339 @@ msgstr "Syötteen osoite"
 msgid "Close this window"
 msgstr "Sulje ikkuna"
 
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(muokkaa muistiinpanoa)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML-työkalu"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Luetaan OPML-tiedostoa"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Näytä RSS-syötteenä"
 
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Palaa asetuksiin"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Näytä RSS-syötteenä"
 
-#: classes/opml.php:301
+#: classes/feeds.php:62
 #, php-format
-msgid "Adding feed: %s"
-msgstr "Lisätään syöte: %s"
+msgid "Last updated: %s"
+msgstr "Päivitetty viimeksi: %s"
 
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Syötteen kaksoiskappale: %s"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Valitse"
 
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Lisätään tunniste %s"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Kaikki"
 
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Tunnisteen kaksoiskappale: %s"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Käännä"
 
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ei mikään"
 
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Lisätään suodatin..."
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Vaihda valittujen tila:"
 
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr ""
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Valinta:"
 
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Lähettäminen epäonnistui virhekoodilla %d"
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Pisteytä"
 
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Ladatun tiedoston siirtäminen epäonnistui."
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arkistoi"
 
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Virhe: lähetä OPML-tiedosto."
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Siirrä takaisin"
 
-#: classes/opml.php:585
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Virhe: siirretty OPML-tiedosto katosi."
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Poista"
 
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Virhe tulkitessa dokumenttia."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Lähetä sähköpostilla"
 
-#: classes/backend.php:31
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr "Lisää käyttövinkkejä löydät Tiny Tiny RSS -wikistä."
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Syöte:"
 
-#: classes/backend.php:36
-msgid "Keyboard Shortcuts"
-msgstr "Pikanäppäimet"
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Syötettä ei löydy"
 
-#: classes/backend.php:59
-msgid "Shift"
-msgstr "Shift"
+#: classes/feeds.php:255
+#, fuzzy
+msgid "Never"
+msgstr "Älä poista koskaan"
 
-#: classes/backend.php:62
-msgid "Ctrl"
-msgstr "Ctrl"
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Tuotu %s"
 
-#: classes/backend.php:97
-msgid "Help topic not found."
-msgstr "Aiheesta ei löytynyt ohjeita."
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Merkitse syöte luetuksi"
 
-#: classes/dlg.php:17
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Sulje artikkeli"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
 msgstr ""
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Julkinen OPML URL:isi on:"
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Syötteen osoite"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Luo uusi URL"
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Muokkaa tämän artikkelin avainsanoja"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr ""
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "kommentti"
+msgstr[1] "kommenttia"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Viimeksi päivitetty:"
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "Litteet"
 
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Lukemattomia artikkeleita ei ole näytettäväksi"
 
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Tämän RSS-syötteen julkinen osoite on:"
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Päivitettyjä artikkeleita ei ole näytettäväksi"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Tähdellä merkittyjä artikkeleita ei ole näytettäväksi"
 
-#: classes/dlg.php:194
+#: classes/feeds.php:696
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Asetukset"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Jaa Tiny Tiny RSS:llä"
+msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
+msgstr "Ei näytettäviä artikkeleita. Voit merkitä artikkeleita tunnisteilla käsin (Toiminnot-valikko yläreunassa) tai käytää suodattimia."
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Otsikko:"
+#: classes/feeds.php:698
+msgid "No articles found to display."
+msgstr "Ei näytettäviä artikkeleita."
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Syötteet päivitetty viimeksi %s"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Sisältö:"
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Osassa syötteistä oli päivitysongelmia (napsauta nähdäksesi lisätietoja)"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Tunnisteet"
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Yhtään syötettä ei ole valittuna"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Jaetut artikkelit näkyvät 'Julkisissa syötteissä'."
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Syötteen/sivuston osoite"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Jaa"
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Siirrä kansioon:"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Et ole kirjautunut"
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Saatavilla olevat syötteet"
 
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Väärä käyttäjätunnus tai salasana"
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Tunnistautuminen"
 
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Olet jo tilannut syötteen <b>%s</b>."
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Käyttäjätunnus"
 
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Tilattu syöte <b>%s</b>."
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Salasana"
 
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Tätä syötettä ei voitu tilata <b>%s</b>."
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Tämä syöte vaatii kirjautumisen"
 
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "<b>%s</b> ei sisällä syötteitä."
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Tilaa"
 
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Useita syöteosoitteita löytyi."
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Lisää syötteitä"
 
-#: classes/handler/public.php:573
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr "Syötettä <b>%s</b> ei voitu tilata.<br>Osoitetta ei voi ladata."
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Peru"
 
-#: classes/handler/public.php:591
-msgid "Subscribe to selected feed"
-msgstr "Tilaa valittu syöte"
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Etsi"
 
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Muokkaa syötteen asetuksia"
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Suositut syötteet"
 
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Salasanan palautus"
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Syötearkisto"
 
-#: classes/handler/public.php:701
-#, fuzzy
-msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
-msgstr "Syötä tilisi sähköpostiosoite. Uusi salasana lähetetään sinulle sähköpostilla."
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "raja:"
 
-#: classes/handler/public.php:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Palauta salasana"
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Poista"
 
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Jotkin vaadituista parametreistä puuttuvat tai ovat väärin."
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Etsi"
 
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Takaisin"
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
 
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
 msgstr ""
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Tätä käyttäjätunnus-sähköposti -yhdistelmää ei valitettavasti löydy."
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Haun syntaksi"
 
-# Better this way...
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Käyttäjäoikeutesi eivät riitä päivitysscriptin suorittamiseen."
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Tähdelliset artikkelit"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Tietokannan päivitys"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Julkiset artikkelit"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Suorita päivityksiä"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Tuoreet artikkelit"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Arkistoidut artikkelit"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Viimeksi luetut"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Erikoiset"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Hakutulokset: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1211,201 +1210,196 @@ msgstr "Kirjasin:"
 msgid "Background:"
 msgstr "Tausta:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Tallenna"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Luotiin tunniste <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Valitse"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Kaikki"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ei mikään"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Poista"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Poista värit"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Käyttäjäoikeutesi eivät ole riittävät tämän alasivun avaamiseen."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Muokkaa sääntöä"
+msgid "Preview article"
+msgstr "Tuoreet artikkelit"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Tunnistautuminen"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(käänteinen)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Käyttäjäoikeudet:"
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Valinnat"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Täsmäys"
 
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Käyttäjätiedot"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Lisää"
 
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Rekisteröity"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Suorita toiminnot"
 
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Viimeksi kirjautunut"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Aktivoitu"
 
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Tilattujen syötteiden määrä"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Täsmää ainakin yhteen säännöistä"
 
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Tähdelliset artikkelit"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Käänteinen täsmäys"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Tilatut syötteet"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Kokeilu"
 
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Käyttäjätunnusta ei löydy"
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Yhdistä"
 
-#: classes/pref/users.php:246
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Käyttäjätunnus <b>%s</b> lisätty salasanalla <b>%s</b>"
+#: classes/pref/filters.php:807
+#: classes/pref/users.php:367
+msgid "Edit"
+msgstr "Muokkaa"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Käyttäjää <b>%s</b> ei voitu luoda"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Järjestä oletuksen mukaisesti"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Käyttäjätunnus <b>%s</b> on jo olemassa."
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Luo"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "Käyttäjän <b>%s</b> salasanaksi vaihdettu <b>%s</b>"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr "Lähetetään käyttäjän <b>%s</b> uusi salasana osoitteeseen <b>%s</b>"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Käänteinen täsmäys säännöllisellä lausekkeella"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr ""
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "kentässä"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Etsi"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+msgid "in"
+msgstr "kansiossa"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Luo käyttäjätunnus"
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Suodattimet"
 
-#: classes/pref/users.php:368
-#: classes/pref/filters.php:807
-msgid "Edit"
-msgstr "Muokkaa"
+#: classes/pref/filters.php:1019
+msgid "Save rule"
+msgstr "Tallenna sääntö"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Käyttäjätunnus"
+#: classes/pref/filters.php:1019
+#: js/functions.js:764
+msgid "Add rule"
+msgstr "Lisää sääntö"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Käyttäjäoikeudet"
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Suorita toiminto"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Viimeisin kirjautuminen"
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Uusi versio saatavilla!"
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Napsauta muokataksesi"
+#: classes/pref/filters.php:1112
+msgid "Save action"
+msgstr "Tallenna toiminto"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Käyttäjätunnuksia ei määritelty."
+#: classes/pref/filters.php:1112
+#: js/functions.js:786
+msgid "Add action"
+msgstr "Lisää toiminto"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Hakua vastaavia käyttäjätunnuksia ei löytynyt"
+#: classes/pref/filters.php:1139
+#, fuzzy
+msgid "[No caption]"
+msgstr "Nimi"
+
+#: classes/pref/filters.php:1141
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Lisää sääntö"
+msgstr[1] "Lisää sääntö"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Täsmää ainakin yhteen säännöistä"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Lisää toiminto"
+msgstr[1] "Lisää toiminto"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Käyttäjäoikeutesi eivät ole riittävät tämän alasivun avaamiseen."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1450,387 +1444,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Muokkaa syötettä"
 msgstr[1] "Muokkaa syötettä"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Yleinen"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Syötteen otsikko"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Siirrä kansioon:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Artikkelin osoite:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Syötteen osoite"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Kieli"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Päivitä"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Artikkeleiden siivous"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Salasana"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Vinkki:</b> sinun on annettava kirjautumistiedot jos syöte vaatii kirjautumisen, paitsi Twitter-syötteet."
 
-#: classes/pref/feeds.php:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Tämä syöte vaatii kirjautumisen"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Valinnat"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Piilota suosituista syötteistä"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Sisällytä sähköpostitiivistelmään"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Näytä aina liitetyt kuvat"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Älä näytä kuvia"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Merkitse päivitetyt artikkelit lukemattomiksi"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Suosikkikuvake"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Luo suodatin..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Vaihda"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Lisäosat"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Virheelliset syötteet"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Passiiviset syötteet"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Muokkaa valittuja syötteitä"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Järjestä oletuksen mukaisesti"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Tilaa useita"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kansiot"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Lisää kansio"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Poista valittu"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML:ää käyttäen voit viedä ja tuoda syötteitä, suodattimia, tunnisteita ja Tiny Tiny RSS:n asetuksia."
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Vain pääasetusprofiili voidaan siirtää OPML:ää käyttäen."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Tuo OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Tiedosto:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Sisältäen asetukset"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Vie OMPL"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "OPML:si voidaan julkaista ja kuka vain voi tilata ne käyttäen alla olevaa osoitetta."
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Julkinen OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Näytä julkaistu OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Julkaistut ja jaetut artikkelit / Luodut syötteet"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Julkistetut artikkelit näkyvät julkisena RSS-syötteenä ja niitä voi lukea ja tilata jokainen, joka tietää alla annetun osoitteen"
 
 #: classes/pref/feeds.php:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Näytä RSS-syötteenä"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Näytä osoite"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Poista kaikki luodut osoitteet"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Näihin syötteisiin ei ole tullut uusia artikkeleita 3 kuukauteen (vanhimmat ensin):"
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Napsauta muokataksesi syötettä"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Lopeta valittujen syötteiden tilaukset"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Lisää RSS-syötteitä riveittäin (syötteitä ei yritetä tunnistaa)"
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Tilattavat syötteet, yksi syöte riviä kohden"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Syötteet vaativat kirjautumisen."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Tilaa"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Tuoreet artikkelit"
-
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(käänteinen)"
-
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Täsmäys"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Lisää"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Poista"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Suorita toiminnot"
+msgid "Edit user"
+msgstr "Muokkaa sääntöä"
 
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Aktivoitu"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Käyttäjäoikeudet:"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Täsmää ainakin yhteen säännöistä"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Käyttäjätiedot"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Käänteinen täsmäys"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Rekisteröity"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Kokeilu"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Viimeksi kirjautunut"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Yhdistä"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Tilattujen syötteiden määrä"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Luo"
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Tähdelliset artikkelit"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Tilatut syötteet"
 
-#: classes/pref/filters.php:993
-msgid "Inverse regular expression matching"
-msgstr "Käänteinen täsmäys säännöllisellä lausekkeella"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Käyttäjätunnusta ei löydy"
 
-#: classes/pref/filters.php:995
-msgid "on field"
-msgstr "kentässä"
+#: classes/pref/users.php:246
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Käyttäjätunnus <b>%s</b> lisätty salasanalla <b>%s</b>"
 
-#: classes/pref/filters.php:1001
-#: js/PrefFilterTree.js:43
-msgid "in"
-msgstr "kansiossa"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Käyttäjää <b>%s</b> ei voitu luoda"
 
-#: classes/pref/filters.php:1014
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Suodattimet"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Käyttäjätunnus <b>%s</b> on jo olemassa."
 
-#: classes/pref/filters.php:1019
-msgid "Save rule"
-msgstr "Tallenna sääntö"
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr "Käyttäjän <b>%s</b> salasanaksi vaihdettu <b>%s</b>"
 
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-msgid "Add rule"
-msgstr "Lisää sääntö"
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr "Lähetetään käyttäjän <b>%s</b> uusi salasana osoitteeseen <b>%s</b>"
 
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Suorita toiminto"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr ""
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "Uusi versio saatavilla!"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Luo käyttäjätunnus"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Tallenna toiminto"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Palauta salasana"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Lisää toiminto"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Käyttäjäoikeudet"
 
-#: classes/pref/filters.php:1139
-#, fuzzy
-msgid "[No caption]"
-msgstr "Nimi"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Viimeisin kirjautuminen"
 
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Lisää sääntö"
-msgstr[1] "Lisää sääntö"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Napsauta muokataksesi"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Täsmää ainakin yhteen säännöistä"
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Käyttäjätunnuksia ei määritelty."
 
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Lisää toiminto"
-msgstr[1] "Lisää toiminto"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Hakua vastaavia käyttäjätunnuksia ei löytynyt"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2007,7 +1930,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Karsi erikoiset HTML-koodit artikkeleita luettaessa."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Muokkaa CSS-tyylitiedostoa"
 
@@ -2250,258 +2173,302 @@ msgstr "Poista valitut profiilit"
 msgid "Activate profile"
 msgstr "Aktivoi profiili"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Näytä RSS-syötteenä"
+#: classes/dlg.php:17
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+msgstr ""
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Päivitetty viimeksi: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Julkinen OPML URL:isi on:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Luo uusi URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Viimeksi päivitetty:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Tämän RSS-syötteen julkinen osoite on:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Valitse"
+msgid "Open Preferences"
+msgstr "Asetukset"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Käännä"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML-työkalu"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Vaihda valittujen tila:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Luetaan OPML-tiedostoa"
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Valinta:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Palaa asetuksiin"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Pisteytä"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Lisätään syöte: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arkistoi"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Syötteen kaksoiskappale: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Siirrä takaisin"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Lisätään tunniste %s"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Lähetä sähköpostilla"
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Tunnisteen kaksoiskappale: %s"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Syöte:"
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Syötettä ei löydy"
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Lisätään suodatin..."
 
-#: classes/feeds.php:255
-#, fuzzy
-msgid "Never"
-msgstr "Älä poista koskaan"
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr ""
 
-#: classes/feeds.php:342
+#: classes/opml.php:558
 #, php-format
-msgid "Imported at %s"
-msgstr "Tuotu %s"
+msgid "Upload failed with error code %d"
+msgstr "Lähettäminen epäonnistui virhekoodilla %d"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Merkitse syöte luetuksi"
+msgid "Unable to move uploaded file."
+msgstr "Ladatun tiedoston siirtäminen epäonnistui."
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Sulje artikkeli"
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Virhe: lähetä OPML-tiedosto."
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Lukemattomia artikkeleita ei ole näytettäväksi"
+#: classes/opml.php:585
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "Virhe: siirretty OPML-tiedosto katosi."
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Päivitettyjä artikkeleita ei ole näytettäväksi"
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Virhe tulkitessa dokumenttia."
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Tähdellä merkittyjä artikkeleita ei ole näytettäväksi"
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artikkelia ei löytynyt"
 
-#: classes/feeds.php:713
-#, fuzzy
-msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
-msgstr "Ei näytettäviä artikkeleita. Voit merkitä artikkeleita tunnisteilla käsin (Toiminnot-valikko yläreunassa) tai käytää suodattimia."
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
-msgstr "Ei näytettäviä artikkeleita."
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "ei avainsanoja"
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Syötteet päivitetty viimeksi %s"
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tuntematon tyyppi"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Osassa syötteistä oli päivitysongelmia (napsauta nähdäksesi lisätietoja)"
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Litteet"
 
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Yhtään syötettä ei ole valittuna"
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Syötteen/sivuston osoite"
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(muokkaa muistiinpanoa)"
 
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Saatavilla olevat syötteet"
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Jaa Tiny Tiny RSS:llä"
 
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Lisää syötteitä"
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Otsikko:"
 
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Suositut syötteet"
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Sisältö:"
 
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Syötearkisto"
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Tunnisteet"
 
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "raja:"
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Jaetut artikkelit näkyvät 'Julkisissa syötteissä'."
 
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Etsi"
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Jaa"
 
-#: classes/feeds.php:1109
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Et ole kirjautunut"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Väärä käyttäjätunnus tai salasana"
+
+#: classes/handler/public.php:581
 #, php-format
-msgid "in %s"
-msgstr ""
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Olet jo tilannut syötteen <b>%s</b>."
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Tilattu syöte <b>%s</b>."
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Haun syntaksi"
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Tätä syötettä ei voitu tilata <b>%s</b>."
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Tähdelliset artikkelit"
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b> ei sisällä syötteitä."
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Julkiset artikkelit"
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Useita syöteosoitteita löytyi."
 
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Tuoreet artikkelit"
+#: classes/handler/public.php:597
+#, php-format
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+msgstr "Syötettä <b>%s</b> ei voitu tilata.<br>Osoitetta ei voi ladata."
 
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Arkistoidut artikkelit"
+#: classes/handler/public.php:615
+msgid "Subscribe to selected feed"
+msgstr "Tilaa valittu syöte"
 
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Viimeksi luetut"
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Muokkaa syötteen asetuksia"
 
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Erikoiset"
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Salasanan palautus"
 
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Hakutulokset: %s"
+#: classes/handler/public.php:725
+#, fuzzy
+msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
+msgstr "Syötä tilisi sähköpostiosoite. Uusi salasana lähetetään sinulle sähköpostilla."
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Jotkin vaadituista parametreistä puuttuvat tai ovat väärin."
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr ""
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Takaisin"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Asetukset tallennettiin."
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "Tätä käyttäjätunnus-sähköposti -yhdistelmää ei valitettavasti löydy."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+# Better this way...
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "Käyttäjäoikeutesi eivät riitä päivitysscriptin suorittamiseen."
 
-#: plugins/vf_shared/init.php:17
-#: plugins/vf_shared/init.php:73
-msgid "Shared articles"
-msgstr "Jaetut artikkelit"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Tietokannan päivitys"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Syötä kertakäyttösalasanasi:"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Suorita päivityksiä"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Salasana on vaihdettu."
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Vanha salasana on virheellinen."
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Käytä syötekansioita"
 
-#: plugins/af_readability/init.php:25
+#: plugins/af_zz_imgproxy/init.php:236
 #, fuzzy
-msgid "Data saved."
-msgstr "Tiedot talletettu (%s, %d)"
+msgid "Don't cache files locally."
+msgstr "Tallenna kuvat välimuistiin"
 
-#: plugins/af_readability/init.php:41
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
 #, fuzzy
-msgid "Inline content"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+msgid "Configuration saved"
+msgstr "Asetukset tallennettiin."
 
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
+#: plugins/vf_shared/init.php:17
+#: plugins/vf_shared/init.php:73
+msgid "Shared articles"
+msgstr "Jaetut artikkelit"
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+msgstr "Raahaa allaoleva linkki selaimesi työkaluriville, avaa syöte josta olet kiinnsotunut selaimessasi ja klikkaa linkkiä tilataksesi syötteen."
 
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Tarkasta saatavuus"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "TIlataanko %s Tiny Tiny RSS:ssä?"
 
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tilaa Tiny Tiny RSS:ssä"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Käytä tätä kirjanmerkkiä tilataksesi sivuja Tiny Tiny RSS:ää käyttäen"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2515,11 +2482,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Asetukset tallennettiin."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "af_comics:n tukemat syötteet"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Seuraavat sarjakuvat ovat tuettuja:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2557,26 +2534,88 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Käytä syötekansioita"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "af_comics:n tukemat syötteet"
+#: plugins/af_readability/init.php:25
+#, fuzzy
+msgid "Data saved."
+msgstr "Tiedot talletettu (%s, %d)"
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Seuraavat sarjakuvat ovat tuettuja:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Muokkaa artikkelin muistiinpanoa"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Tarkasta saatavuus"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Muokkaa artikkelin muistiinpanoa"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr ""
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Monta artikkelia"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Lähetä valitut artikkeli(t) sähköpostitse."
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Sulje"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Asetukset tallennettiin."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr "Tuonti ja vienti"
@@ -2643,6 +2682,34 @@ msgstr "Lähettäminen epäonnistui virhekoodilla %d"
 msgid "No file uploaded."
 msgstr ""
 
+#: plugins/share/init.php:41
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "Tässä voit perua kaikki osoitteen kautta jaettujen artikkeleiden julkistukset."
+
+#: plugins/share/init.php:44
+msgid "Unshare all articles"
+msgstr "Poista kaikkien artikkeleiden jako"
+
+#: plugins/share/init.php:78
+msgid "Share by URL"
+msgstr "Jaa osoitteella"
+
+#: plugins/share/init.php:100
+msgid "You can share this article by the following unique URL:"
+msgstr "Voit jakaa tämän artikkelin seuraavalla uniikilla osoitteella:"
+
+#: plugins/share/init.php:122
+msgid "Unshare article"
+msgstr "Poista artikkelin jako"
+
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Sulje syöteluettelo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Sulje artikkeli"
+
 #: plugins/mail/init.php:29
 msgid "Mail addresses saved."
 msgstr "Sähköpostiosoite on tallennettu."
@@ -2655,18 +2722,6 @@ msgstr "Sähköpostilisäosa"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr "Voit listata sähköpostiosoitteita tähän (pilkulla erotettuna):"
 
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Monta artikkelia"
-
 #: plugins/mail/init.php:146
 msgid "To:"
 msgstr "Vastaanottaja:"
@@ -2679,532 +2734,570 @@ msgstr "Otsikko:"
 msgid "Send e-mail"
 msgstr "Lähetä sähköposti"
 
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Sulje artikkeli"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr ""
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Raahaa allaoleva linkki selaimesi työkaluriville, avaa syöte josta olet kiinnsotunut selaimessasi ja klikkaa linkkiä tilataksesi syötteen."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "TIlataanko %s Tiny Tiny RSS:ssä?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Tilaa Tiny Tiny RSS:ssä"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Käytä tätä kirjanmerkkiä tilataksesi sivuja Tiny Tiny RSS:ää käyttäen"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Sulje syöteluettelo"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Käytä syötekansioita"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Tallenna kuvat välimuistiin"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Lähetä valitut artikkeli(t) sähköpostitse."
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Sulje"
-
-#: plugins/share/init.php:41
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "Tässä voit perua kaikki osoitteen kautta jaettujen artikkeleiden julkistukset."
-
-#: plugins/share/init.php:44
-msgid "Unshare all articles"
-msgstr "Poista kaikkien artikkeleiden jako"
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Muokkaa artikkelin muistiinpanoa"
 
-#: plugins/share/init.php:78
-msgid "Share by URL"
-msgstr "Jaa osoitteella"
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Syötä kertakäyttösalasanasi:"
 
-#: plugins/share/init.php:100
-msgid "You can share this article by the following unique URL:"
-msgstr "Voit jakaa tämän artikkelin seuraavalla uniikilla osoitteella:"
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Salasana on vaihdettu."
 
-#: plugins/share/init.php:122
-msgid "Unshare article"
-msgstr "Poista artikkelin jako"
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Vanha salasana on virheellinen."
 
-#: js/FeedTree.js:75
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Piilota/näytä sivupalkki"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Muokkaa kansiota"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Poista kansio"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Käänteiset valinnat"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Merkitäänkö kaikki päivää vanhemmat artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Merkitäänkö kaikki viikkoa vanhemmat artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Merkitäänkö kaikki kahta viikkoa vanhemmat artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Hakutulokset: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Kaikki artikkelit"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Sulje"
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "Napsauta muokataksesi"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Virheet selitettynä"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Lataus valmis."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Poista suosikkikuvake?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Poistetaan suosikkikuvake..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Suosikkikuvake poistettu."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Valitse ladattava kuvatiedosto."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Ladataanko uusi suosikkikuvake tälle syötteelle?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Ladataan, odota..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Syötä tunnisteen nimi:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Tilaa syöte"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Tilattiin syöte %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Antamasi osoite on viallinen."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Antamassasi osoitteessa ei ole syötteitä."
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "Muokkaa valittuja syötteitä"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Osoitteen %s lataaminen epäonnistui"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Olet jo tilannut tämän syötteen."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Vaihdetaan osoitetta..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Et voi muokata tämäntyyppistä syötettä."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Muokkaa syötettä"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Tallennetaan tiedot..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Lisää syötteitä"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Yhtään syötettä ei ole valittuna."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Poistetaanko valitut syötteet arkistosta? Syötteitä joissa on tallennettuja artikkeleita ei poisteta."
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Virheelliset syötteet"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Poistetaanko valitut syötteet?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Poistetaan valitut syötteet..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Syötä käyttäjätunnus:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Uutta käyttäjätunnusta ei voi luoda: käyttäjätunnus puuttuu."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Lisätään käyttäjä"
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Käyttäjätunnusten muokkaus"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Muokkaa suodatinta"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Poista suodatin?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Poistetaan suodatin..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Poistetaanko valitut tunnisteet?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Poistetaan valitut tunnisteet..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Yhtään tunnistetta ei ole valittuna"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Poistetaanko valitut käyttäjät? Ylläpitäjän tai sinun tunnustasi ei poisteta."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Poistetaan valitut käyttäjätunnukset..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Käyttäjätunnuksia ei ole valittu."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Poistetaanko valitut suodattimet?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Poistetaan valitut suodattimet..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Yhtään suodatinta ei ole valittuna."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Perutaanko valittujen syötteiden tilaukset?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Perutaan valittujen syötteiden tilaukset..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Valitse ainakin yksi käyttäjätunnus."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Nollaa valittujen käyttäjien salasanat?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Nollataan valittujen käyttäjien salasanat..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Valitse vain yksi syöte."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Yhdistetäänkö valitut suodattimet?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Yhdistetään suodattimet..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Muokkaa useampaa syötettä"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Tallenna valittujen syötteiden muutokset?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr ""
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Valitse ensin OPML-tiedosto."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importoidaan, odota..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Palautetaanko oletusasetukset?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Tilataan syötteet..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Poistetaanko kaikki tämän lisäosan tallentamat tiedot?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Poistetaan kansio..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Tyhjätäänkö kaikki viestit virhelokista?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Haluatko poistaa valitun kansion?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Poistetaan valitut kansiot..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Yhtään kansiota ei ole valittuna."
 
-#: js/tt-rss.js:118
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kansion nimi:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Luodaan kansio..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Syötteet joissa ei ole tuoreita artikkeleita"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Korvataanko nykyinen OPML-julkaisuosoite uudella?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Palautetaanko oletusväri valituille tunnisteille?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Profiilien asetukset"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Poistetaanko valitut profiilit? Aktiivisia ja oletusprofiilia ei poisteta."
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Poistetaan valitut profiilit..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Yhtään profiilia ei ole valittuna."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktivoidaanko valittu profiili?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Valitse profiili jonka haluat aktivoida."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Luodaan profiili..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Kaikki luodut syöteosoitteet poistetaan. Jatketaanko?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Poistetaan osoitteita..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Luodut osoitteet poistettiin."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Poista kansio"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Tunnisteiden muokkaus"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Merkitäänkö kaikki artikkelit luetuksi?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Merkitään kaikki syötteet luetuiksi..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Aktivoi ensin email-lisäosa."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "Leveä näyttö ei käytössä yhdistelmätilassa."
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Valitse syötteet ensin."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Uudelleenpisteytä artikkelit kansiossa %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Uudelleenpisteytetään artikkelit..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Yhtään artikkelia ei ole valittuna."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Poista %d valittu artikkeli syötteessä %s?"
 msgstr[1] "Poista %d valittua artikkelia syötteessä %s?"
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Poista %d valittu artikkeli?"
 msgstr[1] "Poista %d valittua artikkelia?"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arkistoi %d valittu artikkeli syötteestä %s?"
 msgstr[1] "Arkistoi %d valittua artikkelia syötteestä %s?"
 
-#: js/viewfeed.js:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Siirretäänkö %d arkistoitu artikkeli takaisin?"
 msgstr[1] "Siirretäänkö %d arkistoitua artikkelia takaisin?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Merkitäänkö %d valittu artikkeli syötteessä %s luetuksi?"
 msgstr[1] "Merkitäänkö %d valittua artikkelia syötteessä %s luetuiksi?"
 
-#: js/viewfeed.js:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Muokkaa artikkelin avainsanoja"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Tallennetaan artikkelin avainsanat..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Yhtään artikkelia ei ole valittuna."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Artikkeleita ei ole merkittäväksi"
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "Merkitäänkö %d artikkeli luetuksi?"
+msgstr[1] "Merkitäänkö %d artikkelia luetuiksi?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Avaa alkuperäinen artikkeli"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Näytä artikkelin osoite"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Liitä tunniste"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Poista tunniste"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Valitse osoittimen kohdalla oleva artikkeli"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Merkitse ryhmä luetuiksi"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Merkitse syöte luetuksi"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Anna uusi pistemäärä valituille artikkeleille:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Anna uusi pistemäärä tälle artikkelille:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Artikkelin osoite:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Liittyvät artikkelit"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Lähetä sähköpostilla"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Napsauta nähdäksesi koko artikkelin."
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Vie tiedot"
@@ -3224,259 +3317,167 @@ msgstr "Tuo tiedot"
 msgid "Please choose the file first."
 msgstr "Valitse ensin tiedosto."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Lähetä sähköpostilla"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Virhe lähtettäessä sähköpostia:"
-
-#: plugins/mail/mail.js:38
-msgid "Your message has been sent."
-msgstr "Viestisi lähetettiin."
-
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Kaikki jaettujen artikkeleiden osoitteet poistetaan. Jatketaanko?"
 
-#: plugins/shorten_expanded/init.js:45
-msgid "Click to expand article"
-msgstr "Napsauta nähdäksesi koko artikkelin."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Jaetut osoitteet poistettiin."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Jaa artikkeli URL:lla"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Luodaanko uusi jako-URL tälle artikkelille?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Vaihdetaan osoitetta..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Poistetaanko tämän artikkelin jakaminen?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Poistetaan jakaminen..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Kaikki jaettujen artikkeleiden osoitteet poistetaan. Jatketaanko?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Virhe lähtettäessä sähköpostia:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Poistetaan osoitteita..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Viestisi lähetettiin."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Jaetut osoitteet poistettiin."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr ""
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Käytät vieläkin oletussalasanaa, se kannattaa vaihtaa."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Lataus valmis."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Poista suosikkikuvake?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Poistetaan suosikkikuvake..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Suosikkikuvake poistettu."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Valitse ladattava kuvatiedosto."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Ladataanko uusi suosikkikuvake tälle syötteelle?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Ladataan, odota..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Syötä tunnisteen nimi:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Tunnistetta ei luotu: nimi puuttuu."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Muokkaa sääntöä"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Muokkaa toimintoa"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Suodatinta vastaavat artikkelit:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Luo suodatin"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Perutaanko syötteen %s tilaus?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Poistetaan syöte..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Apua"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
-
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Poistetaan kansio..."
-
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Haluatko poistaa valitun kansion?"
-
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Poistetaan valitut kansiot..."
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Yhtään kansiota ei ole valittuna."
-
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kansion nimi:"
-
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Luodaan kansio..."
-
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Syötteet joissa ei ole tuoreita artikkeleita"
-
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Korvataanko nykyinen OPML-julkaisuosoite uudella?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Palautetaanko oletusväri valituille tunnisteille?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Profiilien asetukset"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "Poistetaanko valitut profiilit? Aktiivisia ja oletusprofiilia ei poisteta."
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Poistetaan valitut profiilit..."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Syötä käyttäjätunnus:"
 
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Yhtään profiilia ei ole valittuna."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Uutta käyttäjätunnusta ei voi luoda: käyttäjätunnus puuttuu."
 
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktivoidaanko valittu profiili?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Lisätään käyttäjä"
 
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Valitse profiili jonka haluat aktivoida."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Käyttäjätunnusten muokkaus"
 
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Luodaan profiili..."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Muokkaa suodatinta"
 
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Kaikki luodut syöteosoitteet poistetaan. Jatketaanko?"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Tilataan syötteet..."
 
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Luodut osoitteet poistettiin."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Poistetaanko kaikki tämän lisäosan tallentamat tiedot?"
 
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Tunnisteiden muokkaus"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Tyhjätäänkö kaikki viestit virhelokista?"
 
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Et voi perua tämän kansion tilausta."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Valitse syötteet ensin."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Napsauta avataksesi seuraavan lukemattoman syötteen."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Peru haku"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Ei näytettäviä artikkeleita."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikkeli valittu"
 msgstr[1] "%d artikkelia valittu"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Yhtään artikkelia ei ole valittuna."
+#~ msgid "Rescore feed"
+#~ msgstr "Uudelleenpisteytä syöte"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Artikkeleita ei ole merkittäväksi"
+#~ msgid "Create label..."
+#~ msgstr "Luo tunniste..."
 
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "Merkitäänkö %d artikkeli luetuksi?"
-msgstr[1] "Merkitäänkö %d artikkelia luetuiksi?"
+#~ msgid "Create filter..."
+#~ msgstr "Luo suodatin..."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Uudelleenpisteytä artikkelit kansiossa %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Uudelleenpisteytetään artikkelit..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Tunnistetta ei luotu: nimi puuttuu."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox-integraatio"