rebase translations

2 files changed, 584 insertions, 566 deletions

diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index f1755b1fc..ddcf21621 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.mo
+++ b/locale/sv_SE/LC_MESSAGES/messages.mo
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index e93acf95a..214f77274 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/locale/sv_SE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS sv_SE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-01 12:59+0300\n"
+"POT-Creation-Date: 2018-12-02 16:30+0300\n"
 "PO-Revision-Date: 2013-05-24 19:41+0100\n"
 "Last-Translator: Mattias Tengblad <[email protected]>\n"
 "Language-Team: Mattias Tengblad <[email protected]>\n"
@@ -179,27 +179,25 @@ msgstr "Hittade inte användaren"
 #: classes/pref/labels.php:294
 #: classes/pref/filters.php:822
 #: 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
+#: js/PrefFeedTree.js:122
+#: js/PrefFeedTree.js:129
+#: js/PrefFeedTree.js:246
+#: js/PrefFeedTree.js:315
+#: js/functions.js:224
+#: js/functions.js:660
+#: js/functions.js:736
+#: js/prefs.js:156
+#: js/prefs.js:205
+#: js/prefs.js:271
 #: plugins/import_export/import_export.js:17
-#: js/prefs.js:1192
-#: js/prefs.js:1205
-#: js/tt-rss.js:510
+#: js/PrefFilterTree.js:100
+#: js/feedlist.js:359
+#: js/feedlist.js:460
+#: js/feedlist.js:519
+#: js/tt-rss.js:457
+#: js/tt-rss.js:470
+#: js/viewfeed.js:466
+#: js/viewfeed.js:795
 msgid "Loading, please wait..."
 msgstr "Laddar, vänta..."
 
@@ -375,7 +373,7 @@ msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:147
-#: classes/feeds.php:1696
+#: classes/feeds.php:1697
 #: classes/pref/labels.php:94
 msgid "Labels"
 msgstr "Etiketter"
@@ -475,20 +473,20 @@ msgstr "Alla flöden"
 #: include/controls.php:138
 #: include/controls.php:230
 #: classes/digest.php:124
-#: classes/feeds.php:1708
+#: classes/feeds.php:1709
 #: classes/pref/feeds.php:233
 #: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Okategoriserat"
 
-#: include/feedbrowser.php:84
+#: include/feedbrowser.php:80
 #, php-format
 msgid "%d archived article"
 msgid_plural "%d archived articles"
 msgstr[0] "%d arkiverad artikel"
 msgstr[1] "%d arkiverade artiklar"
 
-#: include/feedbrowser.php:108
+#: include/feedbrowser.php:104
 msgid "No feeds found."
 msgstr "Inga flöden funna."
 
@@ -542,17 +540,17 @@ msgid "Article"
 msgstr "Artikel"
 
 #: include/functions.php:1133
-#: js/viewfeed.js:1341
+#: js/viewfeed.js:1410
 msgid "Toggle starred"
 msgstr "Växla stjärnmarkering"
 
 #: include/functions.php:1134
-#: js/viewfeed.js:1353
+#: js/viewfeed.js:1422
 msgid "Toggle published"
 msgstr "Växla publicering"
 
 #: include/functions.php:1135
-#: js/viewfeed.js:1328
+#: js/viewfeed.js:1397
 msgid "Toggle unread"
 msgstr "Växla olästa"
 
@@ -565,12 +563,12 @@ msgid "Open in new window"
 msgstr "Öppna i nytt fönster"
 
 #: include/functions.php:1138
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1443
 msgid "Mark below as read"
 msgstr "Märk nedanstående som lästa"
 
 #: include/functions.php:1139
-#: js/viewfeed.js:1367
+#: js/viewfeed.js:1436
 msgid "Mark above as read"
 msgstr "Märk ovanstående som lästa"
 
@@ -653,7 +651,7 @@ msgstr "Prenumerera på flöde"
 #: include/functions.php:1159
 #: js/FeedTree.js:49
 #: js/PrefFeedTree.js:56
-#: js/viewfeed.js:1492
+#: js/viewfeed.js:1560
 msgid "Edit feed"
 msgstr "Redigera flöde"
 
@@ -696,7 +694,7 @@ msgid "Go to"
 msgstr "Gå till"
 
 #: include/functions.php:1170
-#: classes/feeds.php:1569
+#: classes/feeds.php:1570
 msgid "All articles"
 msgstr "Alla artiklar"
 
@@ -705,8 +703,8 @@ msgid "Fresh"
 msgstr "Nya"
 
 #: include/functions.php:1174
-#: js/tt-rss.js:439
-#: js/tt-rss.js:599
+#: js/tt-rss.js:399
+#: js/tt-rss.js:489
 msgid "Tag cloud"
 msgstr "Taggmoln"
 
@@ -785,7 +783,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/pref/prefs.php:1037
+#: classes/pref/prefs.php:1036
 #: classes/rpc.php:69
 #: classes/handler/public.php:272
 msgid "Default profile"
@@ -850,15 +848,15 @@ msgstr "Hittade inte något hjälpavsnitt."
 
 #: 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/pref/feeds.php:1462
+#: classes/pref/feeds.php:1526
+#: classes/pref/prefs.php:1096
 #: 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/dlg.php:183
+#: classes/dlg.php:199
 #: classes/article.php:810
 #: plugins/af_psql_trgm/init.php:109
 #: plugins/import_export/init.php:446
@@ -868,14 +866,13 @@ msgid "Close this window"
 msgstr "Stäng fönstret"
 
 #: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Visa RSS-flöde"
-
 #: classes/feeds.php:54
 #: classes/feeds.php:140
+#: classes/feeds.php:141
 #: classes/pref/feeds.php:1326
-msgid "View as RSS"
-msgstr "Visa som RSS"
+#, fuzzy
+msgid "Show as feed"
+msgstr "Detta flöde"
 
 #: classes/feeds.php:62
 #, php-format
@@ -896,8 +893,8 @@ msgstr "Markera"
 #: 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/feeds.php:1478
+#: classes/pref/users.php:359
 #: classes/pref/prefs.php:996
 msgid "All"
 msgstr "Alla"
@@ -915,8 +912,8 @@ msgstr "Invertera"
 #: 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/feeds.php:1480
+#: classes/pref/users.php:361
 #: classes/pref/prefs.php:998
 msgid "None"
 msgstr "Ingen"
@@ -960,47 +957,47 @@ msgstr "Skicka med e-post"
 msgid "Feed:"
 msgstr "Flöde:"
 
-#: classes/feeds.php:193
-#: classes/feeds.php:802
+#: classes/feeds.php:194
+#: classes/feeds.php:803
 msgid "Feed not found."
 msgstr "Kunde inte hitta flöde."
 
-#: classes/feeds.php:255
+#: classes/feeds.php:256
 msgid "Never"
 msgstr "Aldrig"
 
-#: classes/feeds.php:341
+#: classes/feeds.php:342
 #, php-format
 msgid "Imported at %s"
 msgstr "Importerad kl. %s"
 
-#: classes/feeds.php:391
-#: classes/feeds.php:484
+#: classes/feeds.php:392
+#: classes/feeds.php:485
 #, fuzzy
 msgid "mark feed as read"
 msgstr "Flagga kanal som läst"
 
-#: classes/feeds.php:540
+#: classes/feeds.php:541
 msgid "Collapse article"
 msgstr "Minimera artikel"
 
-#: classes/feeds.php:592
+#: classes/feeds.php:593
 #: classes/article.php:762
 msgid "Originally from:"
 msgstr "Ursprungligen från:"
 
-#: classes/feeds.php:603
+#: classes/feeds.php:604
 #: classes/pref/feeds.php:538
 #: classes/article.php:773
 msgid "Feed URL"
 msgstr "URL för flöde"
 
-#: classes/feeds.php:630
+#: classes/feeds.php:631
 #: classes/article.php:729
 msgid "Edit tags for this article"
 msgstr "Redigera taggar för denna artikel"
 
-#: classes/feeds.php:644
+#: classes/feeds.php:645
 #: classes/article.php:625
 #, fuzzy
 msgid "comment"
@@ -1008,104 +1005,104 @@ msgid_plural "comments"
 msgstr[0] "Kommentarer?"
 msgstr[1] "Kommentarer?"
 
-#: classes/feeds.php:648
+#: classes/feeds.php:649
 #: classes/article.php:629
 #, fuzzy
 msgid "comments"
 msgstr "Kommentarer?"
 
-#: classes/feeds.php:686
+#: classes/feeds.php:687
 msgid "No unread articles found to display."
 msgstr "Hittade inga olästa artiklar."
 
-#: classes/feeds.php:689
+#: classes/feeds.php:690
 msgid "No updated articles found to display."
 msgstr "Hittade inga uppdaterade artiklar."
 
-#: classes/feeds.php:692
+#: classes/feeds.php:693
 msgid "No starred articles found to display."
 msgstr "Hittade inga stjärnmarkerade artiklar."
 
-#: classes/feeds.php:696
+#: classes/feeds.php:697
 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 "Hittade inga artiklar att visa. Du kan ge artiklar etiketter manuellt  via snabbmenyn för artiklar (gäller alla valda artiklar) eller genom att använda filter."
 
-#: classes/feeds.php:698
+#: classes/feeds.php:699
 msgid "No articles found to display."
 msgstr "Hittade inga artiklar att visa."
 
-#: classes/feeds.php:714
-#: classes/feeds.php:905
+#: classes/feeds.php:715
+#: classes/feeds.php:906
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flöden senast uppdaterade %s"
 
-#: classes/feeds.php:726
-#: classes/feeds.php:917
+#: classes/feeds.php:727
+#: classes/feeds.php:918
 msgid "Some feeds have update errors (click for details)"
 msgstr "Vissa flöden har uppdateringsfel (klicka för detaljer)"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:895
 msgid "No feed selected."
 msgstr "Inget flöde valt."
 
-#: classes/feeds.php:958
-#: classes/feeds.php:966
+#: classes/feeds.php:959
+#: classes/feeds.php:967
 msgid "Feed or site URL"
 msgstr "URL för flöde eller webbplats"
 
-#: classes/feeds.php:972
+#: classes/feeds.php:973
 #: classes/pref/feeds.php:559
 #: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1626
 msgid "Place in category:"
 msgstr "Placera i kategori:"
 
-#: classes/feeds.php:980
+#: classes/feeds.php:981
 msgid "Available feeds"
 msgstr "Tillgängliga flöden"
 
-#: classes/feeds.php:992
+#: classes/feeds.php:993
 #: classes/pref/feeds.php:621
 #: classes/pref/feeds.php:848
 #: classes/pref/users.php:61
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: classes/feeds.php:996
+#: classes/feeds.php:997
 #: classes/pref/feeds.php:625
 #: classes/pref/feeds.php:852
-#: classes/pref/feeds.php:1646
-#: classes/pref/users.php:403
+#: classes/pref/feeds.php:1640
+#: classes/pref/users.php:404
 msgid "Login"
 msgstr "Användarnamn"
 
-#: classes/feeds.php:1000
+#: classes/feeds.php:1001
 #: classes/pref/feeds.php:631
 #: classes/pref/feeds.php:860
-#: classes/pref/feeds.php:1649
+#: classes/pref/feeds.php:1643
 #: classes/pref/prefs.php:243
 msgid "Password"
 msgstr "Lösenord"
 
-#: classes/feeds.php:1011
+#: classes/feeds.php:1012
 #: classes/pref/feeds.php:645
 msgid "This feed requires authentication."
 msgstr "Detta flöde kräver autentisering."
 
-#: classes/feeds.php:1014
-#: classes/feeds.php:1070
-#: classes/pref/feeds.php:1668
+#: classes/feeds.php:1015
+#: classes/feeds.php:1071
+#: classes/pref/feeds.php:1662
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: classes/feeds.php:1017
+#: classes/feeds.php:1018
 msgid "More feeds"
 msgstr "Fler flöden"
 
-#: classes/feeds.php:1020
-#: classes/feeds.php:1072
-#: classes/feeds.php:1111
+#: classes/feeds.php:1021
+#: classes/feeds.php:1073
+#: classes/feeds.php:1112
 #: classes/pref/labels.php:84
 #: classes/pref/filters.php:528
 #: classes/pref/filters.php:945
@@ -1113,7 +1110,7 @@ msgstr "Fler flöden"
 #: classes/pref/filters.php:1115
 #: classes/pref/feeds.php:774
 #: classes/pref/feeds.php:916
-#: classes/pref/feeds.php:1669
+#: classes/pref/feeds.php:1663
 #: classes/pref/users.php:105
 #: classes/pref/prefs.php:984
 #: classes/article.php:238
@@ -1124,79 +1121,79 @@ msgstr "Fler flöden"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: classes/feeds.php:1042
-#: classes/feeds.php:1110
+#: classes/feeds.php:1043
+#: classes/feeds.php:1111
 #: classes/pref/filters.php:788
 #: classes/pref/feeds.php:1178
-#: classes/pref/users.php:345
-#: js/tt-rss.js:152
+#: classes/pref/users.php:346
+#: js/feedlist.js:617
 msgid "Search"
 msgstr "Sök"
 
-#: classes/feeds.php:1046
+#: classes/feeds.php:1047
 msgid "Popular feeds"
 msgstr "Populära flöden"
 
-#: classes/feeds.php:1047
+#: classes/feeds.php:1048
 msgid "Feed archive"
 msgstr "Flödesarkiv"
 
-#: classes/feeds.php:1050
+#: classes/feeds.php:1051
 msgid "limit:"
 msgstr "gräns:"
 
-#: classes/feeds.php:1071
+#: classes/feeds.php:1072
 #: 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
+#: classes/pref/users.php:370
 msgid "Remove"
 msgstr "Ta bort"
 
-#: classes/feeds.php:1084
+#: classes/feeds.php:1085
 msgid "Look for"
 msgstr "Sök efter"
 
-#: classes/feeds.php:1092
+#: classes/feeds.php:1093
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1097
+#: classes/feeds.php:1098
 msgid "Used for word stemming"
 msgstr ""
 
-#: classes/feeds.php:1106
+#: classes/feeds.php:1107
 #, fuzzy
 msgid "Search syntax"
 msgstr "Sök"
 
-#: classes/feeds.php:1563
+#: classes/feeds.php:1564
 msgid "Starred articles"
 msgstr "Stjärnmärkta artiklar"
 
-#: classes/feeds.php:1565
+#: classes/feeds.php:1566
 msgid "Published articles"
 msgstr "Publicerade artiklar"
 
-#: classes/feeds.php:1567
+#: classes/feeds.php:1568
 msgid "Fresh articles"
 msgstr "Nya artiklar"
 
-#: classes/feeds.php:1571
+#: classes/feeds.php:1572
 msgid "Archived articles"
 msgstr "Arkiverade artiklar"
 
-#: classes/feeds.php:1573
+#: classes/feeds.php:1574
 msgid "Recently read"
 msgstr "Nyligen lästa"
 
-#: classes/feeds.php:1694
+#: classes/feeds.php:1695
 msgid "Special"
 msgstr "Special"
 
-#: classes/feeds.php:1951
+#: classes/feeds.php:1952
 #, php-format
 msgid "Search results: %s"
 msgstr "Sökresultat: %s"
@@ -1249,8 +1246,8 @@ msgstr "Skapade etikett <b>%s</b>"
 #: 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/feeds.php:1475
+#: classes/pref/users.php:356
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Markera"
@@ -1318,7 +1315,7 @@ msgid "Combine"
 msgstr "Kombinera"
 
 #: classes/pref/filters.php:807
-#: classes/pref/users.php:367
+#: classes/pref/users.php:368
 msgid "Edit"
 msgstr "Redigera"
 
@@ -1359,7 +1356,7 @@ msgid "Save rule"
 msgstr "Spara regel"
 
 #: classes/pref/filters.php:1019
-#: js/functions.js:764
+#: js/functions.js:1241
 msgid "Add rule"
 msgstr "Tillämpa regel"
 
@@ -1377,7 +1374,7 @@ msgid "Save action"
 msgstr "Spara aktivitet"
 
 #: classes/pref/filters.php:1112
-#: js/functions.js:786
+#: js/functions.js:1263
 msgid "Add action"
 msgstr "Lägg till aktivitet"
 
@@ -1410,17 +1407,17 @@ msgid "Your access level is insufficient to open this tab."
 msgstr "Du saknar behörighet för att öppna denna flik"
 
 #: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "Fellogg"
+msgid "Event Log"
+msgstr ""
 
 #: classes/pref/system.php:40
 msgid "Refresh"
 msgstr "Uppdatera"
 
 #: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "Rensa färger"
+#: classes/pref/prefs.php:616
+msgid "Clear"
+msgstr "Rensa"
 
 #: classes/pref/system.php:48
 msgid "Error"
@@ -1567,7 +1564,7 @@ msgid "Edit selected feeds"
 msgstr "Redigera valda flöden"
 
 #: classes/pref/feeds.php:1200
-#: js/prefs.js:1171
+#: js/PrefFeedTree.js:343
 msgid "Batch subscribe"
 msgstr "Massprenumerera"
 
@@ -1643,25 +1640,25 @@ msgstr "Rensa alla genererade URLer"
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Följande flöden har inte uppdaterats med nytt innehåll på 3 månader (äldst först): "
 
-#: classes/pref/feeds.php:1443
-#: classes/pref/feeds.php:1508
+#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1502
 msgid "Click to edit feed"
 msgstr "Klicka för att redigera flöde"
 
-#: classes/pref/feeds.php:1461
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1458
+#: classes/pref/feeds.php:1522
 msgid "Unsubscribe from selected feeds"
 msgstr "Ta bort prenumeration för valda flöden"
 
-#: classes/pref/feeds.php:1629
+#: classes/pref/feeds.php:1623
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Lägg till ett giltigt RSS-flöde per rad (ingen flödesupptäckt görs)"
 
-#: classes/pref/feeds.php:1638
+#: classes/pref/feeds.php:1632
 msgid "Feeds to subscribe, One per line"
 msgstr "Flöden att prenumerera på, ett per rad"
 
-#: classes/pref/feeds.php:1661
+#: classes/pref/feeds.php:1655
 msgid "Feeds require authentication."
 msgstr "Flödet kräver inloggning."
 
@@ -1675,12 +1672,11 @@ msgid "Access level: "
 msgstr "Behörighetsnivå: "
 
 #: classes/pref/users.php:96
-#: js/prefs.js:403
 msgid "User details"
 msgstr "Användardetaljer"
 
 #: classes/pref/users.php:136
-#: classes/pref/users.php:406
+#: classes/pref/users.php:407
 msgid "Registered"
 msgstr "Registrerad"
 
@@ -1698,7 +1694,7 @@ msgid "Stored articles"
 msgstr "Stjärnmärkta artiklar"
 
 #: classes/pref/users.php:150
-#: classes/pref/users.php:405
+#: classes/pref/users.php:406
 msgid "Subscribed feeds"
 msgstr "Prenumererade flöden"
 
@@ -1706,61 +1702,61 @@ msgstr "Prenumererade flöden"
 msgid "User not found"
 msgstr "Hittade inte användaren"
 
-#: classes/pref/users.php:246
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+#: classes/pref/users.php:247
+#, fuzzy, php-format
+msgid "Added user %s with password %s"
 msgstr "Lade till användare <b>%s</b> med lösenord <b>%s</b>"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
+#: classes/pref/users.php:254
+#, fuzzy, php-format
+msgid "Could not create user %s"
 msgstr "Kunde inte skapa användare <b>%s</b>"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
+#: classes/pref/users.php:258
+#, fuzzy, php-format
+msgid "User %s already exists."
 msgstr "Användaren <b>%s</b> finns redan."
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/users.php:286
+#, fuzzy, php-format
+msgid "Changed password of user %s to %s"
 msgstr "Lösenord för användare <b>%s</b> ändrat till <b>%s</b>"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/users.php:288
+#, fuzzy, php-format
+msgid "Sending new password of user %s to %s"
 msgstr "Nytt lösenord för användare <b>%s</b> skickat till <b>%s</b>"
 
-#: classes/pref/users.php:310
+#: classes/pref/users.php:311
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifikation för ändring av lösenord"
 
-#: classes/pref/users.php:363
+#: classes/pref/users.php:364
 msgid "Create user"
 msgstr "Skapa användare"
 
-#: classes/pref/users.php:371
+#: classes/pref/users.php:372
 #: classes/handler/public.php:747
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-#: classes/pref/users.php:404
+#: classes/pref/users.php:405
 msgid "Access Level"
 msgstr "Behörighetsnivå"
 
-#: classes/pref/users.php:407
+#: classes/pref/users.php:408
 msgid "Last login"
 msgstr "Senaste inloggning"
 
-#: classes/pref/users.php:426
+#: classes/pref/users.php:425
 msgid "Click to edit"
 msgstr "Klicka för att redigera"
 
-#: classes/pref/users.php:446
+#: classes/pref/users.php:441
 msgid "No users defined."
 msgstr "Inga användare definierade."
 
-#: classes/pref/users.php:448
+#: classes/pref/users.php:443
 msgid "No matching users found."
 msgstr "Hittade inga matchande användare."
 
@@ -1938,7 +1934,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Ta bort alla utom de vanligast HTML-taggarna från artiklarna."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1136
+#: js/prefs.js:246
 msgid "Customize stylesheet"
 msgstr "Anpassa stilmall"
 
@@ -2075,10 +2071,6 @@ msgstr "Anpassa"
 msgid "Register"
 msgstr "Registrera"
 
-#: classes/pref/prefs.php:616
-msgid "Clear"
-msgstr "Rensa"
-
 #: classes/pref/prefs.php:622
 #, php-format
 msgid "Current server time: %s (UTC)"
@@ -2168,16 +2160,16 @@ msgstr "Du kan åsidosätta färger, typsnitt och layout för ditt för närvara
 msgid "Create profile"
 msgstr "Skapa profil"
 
-#: classes/pref/prefs.php:1031
-#: classes/pref/prefs.php:1059
+#: classes/pref/prefs.php:1030
+#: classes/pref/prefs.php:1056
 msgid "(active)"
 msgstr "(aktiva)"
 
-#: classes/pref/prefs.php:1093
+#: classes/pref/prefs.php:1090
 msgid "Remove selected profiles"
 msgstr "Radera markerade profiler"
 
-#: classes/pref/prefs.php:1095
+#: classes/pref/prefs.php:1092
 msgid "Activate profile"
 msgstr "Aktivera profil"
 
@@ -2190,7 +2182,7 @@ msgid "Your Public OPML URL is:"
 msgstr "Din publika OPML-URL är:"
 
 #: classes/dlg.php:53
-#: classes/dlg.php:178
+#: classes/dlg.php:180
 #: plugins/share/init.php:125
 msgid "Generate new URL"
 msgstr "Skapa ny URL"
@@ -2208,15 +2200,16 @@ msgstr "Senaste uppdatering:"
 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 "Uppdateringsprocessen tar för lång tid på sig att uppdatera. Detta kan indikera en låsning eller hängning. Kontrollera processen eller kontakta administratören."
 
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Du kan se detta flöde som RSS på följande URL:"
+#: classes/dlg.php:171
+#, fuzzy, php-format
+msgid "%s can be accessed via the following secret URL:"
+msgstr "Du kan dela denna artikel genom följande unika URL:"
 
-#: classes/dlg.php:190
+#: classes/dlg.php:192
 msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
 msgstr ""
 
-#: classes/dlg.php:194
+#: classes/dlg.php:196
 #, fuzzy
 msgid "Open Preferences"
 msgstr "Inställningar"
@@ -2775,523 +2768,424 @@ msgstr "Redigera kategori"
 msgid "Remove category"
 msgstr "Ta bort kategori"
 
-#: js/PrefFilterTree.js:47
-msgid "Inverse"
-msgstr "Invertera"
+#: js/PrefFeedTree.js:136
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "Radera kategori %s? Nästlade flöden placeras i Okategoriserat."
 
-#: js/feedlist.js:461
-#, fuzzy
-msgid "Mark %w in %s older than 1 day as read?"
-msgstr "Markera alla artiklar i %s äldre än 1 dag som lästa?"
+#: js/PrefFeedTree.js:137
+msgid "Removing category..."
+msgstr "Tar bort kategori..."
 
-#: js/feedlist.js:464
-#, fuzzy
-msgid "Mark %w in %s older than 1 week as read?"
-msgstr "Markera alla artiklar i %s äldre än 1 vecka som lästa?"
+#: js/PrefFeedTree.js:149
+msgid "Unsubscribe from selected feeds?"
+msgstr "Avsluta prenumeration på markerade flöden?"
 
-#: js/feedlist.js:467
-#, fuzzy
-msgid "Mark %w in %s older than 2 weeks as read?"
-msgstr "Markera alla artiklar i %s äldre än 2 veckor som lästa?"
+#: js/PrefFeedTree.js:151
+msgid "Unsubscribing from selected feeds..."
+msgstr "Tar bort prenumeration för valda flöden..."
 
-#: js/feedlist.js:470
+#: js/PrefFeedTree.js:164
+#: js/PrefFeedTree.js:226
+#: js/PrefFeedTree.js:242
+#: js/PrefFeedTree.js:394
+#: js/functions.js:592
+#: js/functions.js:673
 #, fuzzy
-msgid "Mark %w in %s as read?"
-msgstr "Märk alla artiklar i %s som lästa?"
+msgid "No feeds selected."
+msgstr "Inget flöde valt."
 
-#: js/feedlist.js:473
-#, fuzzy
-msgid "search results"
-msgstr "Sökresultat: %s"
+#: js/PrefFeedTree.js:192
+msgid "Remove selected categories?"
+msgstr "Radera markekrade kategorier?"
 
-#: js/feedlist.js:473
+#: js/PrefFeedTree.js:193
+msgid "Removing selected categories..."
+msgstr "Raderar valda kategorier..."
+
+#: js/PrefFeedTree.js:205
 #, fuzzy
-msgid "all articles"
-msgstr "Alla artiklar"
+msgid "No categories selected."
+msgstr "Inga kategorier valda."
+
+#: js/PrefFeedTree.js:256
+msgid "Edit Multiple Feeds"
+msgstr "Redigera flera flöden"
+
+#: js/PrefFeedTree.js:280
+msgid "Save changes to selected feeds?"
+msgstr "Spara ändringar för valda flöden?"
 
-#: js/functions.js:100
+#: js/PrefFeedTree.js:292
+#: js/PrefFilterTree.js:223
+#: js/functions.js:797
+#: js/prefs.js:249
+#: js/prefs.js:323
+msgid "Saving data..."
+msgstr "Sparar data..."
+
+#: js/PrefFeedTree.js:311
 #, fuzzy
-msgid "Close"
-msgstr "stäng"
+msgid "Rename category to:"
+msgstr "Ta bort kategori"
 
-#: js/functions.js:167
-msgid "Click to close"
-msgstr "Klicka för att stänga"
+#: js/PrefFeedTree.js:323
+msgid "Category title:"
+msgstr "Kategorinamn:"
 
-#: js/functions.js:456
-msgid "Error explained"
-msgstr "Fel förklarat"
+#: js/PrefFeedTree.js:326
+msgid "Creating category..."
+msgstr "Skapar kategori..."
 
-#: js/functions.js:490
-msgid "Upload complete."
-msgstr "Uppladdning klar."
+#: js/PrefFeedTree.js:347
+msgid "Subscribing to feeds..."
+msgstr "Prenumererar på flöden..."
 
-#: js/functions.js:508
-msgid "Remove stored feed icon?"
-msgstr "Ta bort sparad ikon för flöden?"
+#: js/PrefFeedTree.js:369
+msgid "Feeds without recent updates"
+msgstr "Flöden som inte uppdaterats på länge"
 
-#: js/functions.js:510
-msgid "Removing feed icon..."
-msgstr "Tar bort flödesikon..."
+#: js/PrefFeedTree.js:378
+#: js/functions.js:576
+msgid "Remove selected feeds?"
+msgstr "Ta bort markerade flöden?"
 
-#: js/functions.js:515
-msgid "Feed icon removed."
-msgstr "Flödesikon borttagen."
+#: js/PrefFeedTree.js:379
+#: js/functions.js:577
+msgid "Removing selected feeds..."
+msgstr "Tar bort valda flöden..."
 
-#: js/functions.js:532
-msgid "Please select an image file to upload."
-msgstr "Välj en bild att ladda upp."
+#: js/PrefFilterTree.js:47
+msgid "Inverse"
+msgstr "Invertera"
 
-#: js/functions.js:533
-msgid "Upload new icon for this feed?"
-msgstr "Ladda upp ny ikon för detta flöde?"
+#: js/PrefFilterTree.js:240
+msgid "Remove selected filters?"
+msgstr "Radera markerade filter?"
 
-#: js/functions.js:534
-msgid "Uploading, please wait..."
-msgstr "Laddar upp, vänligen vänta..."
+#: js/PrefFilterTree.js:241
+msgid "Removing selected filters..."
+msgstr "Tar bort valda filter..."
 
-#: js/functions.js:542
-msgid "Please enter label caption:"
-msgstr "Ange titel för etikett:"
+#: js/PrefFilterTree.js:253
+#: js/PrefFilterTree.js:110
+#: js/PrefFilterTree.js:126
+#, fuzzy
+msgid "No filters selected."
+msgstr "Inga filter valda."
+
+#: js/feedlist.js:229
+#, fuzzy
+msgid "Your password is at default value"
+msgstr "Byt lösenord."
+
+#: js/functions.js:216
+msgid "Help"
+msgstr "Hjälp"
+
+#: js/functions.js:447
+msgid "Error explained"
+msgstr "Fel förklarat"
 
-#: js/functions.js:575
+#: js/functions.js:461
 msgid "Subscribe to Feed"
 msgstr "Prenumerera på flöde"
 
-#: js/functions.js:602
+#: js/functions.js:488
 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:617
+#: js/functions.js:503
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Prenumererar på %s"
 
-#: js/functions.js:622
+#: js/functions.js:508
 msgid "Specified URL seems to be invalid."
 msgstr "Den angivna URLen verkar vara felaktig."
 
-#: js/functions.js:625
+#: js/functions.js:511
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Den angivna URLen verkar inte innehålla något flöde."
 
-#: js/functions.js:637
+#: js/functions.js:523
 msgid "Expand to select feed"
 msgstr "Expandera för att välja flöde"
 
-#: js/functions.js:649
+#: js/functions.js:537
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Kunde inte ladda ned följande URL: %s"
 
-#: js/functions.js:653
+#: js/functions.js:540
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Validering av XML misslyckades: %s"
 
-#: js/functions.js:657
+#: js/functions.js:543
 msgid "You are already subscribed to this feed."
 msgstr "Du prenumererar redan på detta flöde."
 
-#: js/functions.js:1098
-msgid "Generate new syndication address for this feed?"
-msgstr "Generera en ny syndikeringsadress för detta flöde?"
-
-#: js/functions.js:1100
-#: js/prefs.js:870
-msgid "Trying to change address..."
-msgstr "Försöker ändra adress..."
-
-#: js/functions.js:1199
-#: js/tt-rss.js:399
-#: js/tt-rss.js:612
-msgid "You can't edit this kind of feed."
-msgstr "Detta typ av flöde kan inte redigeras."
-
-#: js/functions.js:1213
-msgid "Edit Feed"
-msgstr "Redigera flöde"
-
-#: js/functions.js:1217
-#: js/prefs.js:176
-#: js/prefs.js:523
-#: js/prefs.js:1139
-#: js/prefs.js:78
-msgid "Saving data..."
-msgstr "Sparar data..."
+#: js/functions.js:567
+msgid "Feeds with update errors"
+msgstr "Flöden med uppdateringsfel"
 
-#: js/functions.js:1243
+#: js/functions.js:617
 msgid "More Feeds"
 msgstr "Fler flöden"
 
-#: 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 "Inget flöde valt."
-
-#: js/functions.js:1329
+#: js/functions.js:705
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Radera markerade flöden från arkivet? Flöden med sparade artiklar kommer inte raderas."
 
-#: js/functions.js:1360
-msgid "Feeds with update errors"
-msgstr "Flöden med uppdateringsfel"
-
-#: js/functions.js:1369
-#: js/prefs.js:841
-msgid "Remove selected feeds?"
-msgstr "Ta bort markerade flöden?"
-
-#: js/functions.js:1370
-#: js/prefs.js:842
-msgid "Removing selected feeds..."
-msgstr "Tar bort valda flöden..."
-
-#: js/prefs.js:143
-msgid "Remove filter?"
-msgstr "Radera filter?"
-
-#: js/prefs.js:148
-msgid "Removing filter..."
-msgstr "Tar bort filter..."
-
-#: js/prefs.js:251
-msgid "Remove selected labels?"
-msgstr "Radera markerade etiketter?"
-
-#: js/prefs.js:252
-msgid "Removing selected labels..."
-msgstr "Tar bort valda etiketter..."
-
-#: js/prefs.js:262
-#: js/prefs.js:909
-msgid "No labels are selected."
-msgstr "Inga etiketter valda."
-
-#: js/prefs.js:274
-msgid "Remove selected users? Neither default admin nor your account will be removed."
-msgstr "Radera markerade användare? Varken admin eller ditt konto kan raderas."
-
-#: js/prefs.js:275
-msgid "Removing selected users..."
-msgstr "Tar bort valda användare..."
-
-#: js/prefs.js:286
-#: js/prefs.js:342
-#: js/prefs.js:361
-#: js/prefs.js:387
-msgid "No users are selected."
-msgstr "Ingen användare vald."
-
-#: js/prefs.js:297
-msgid "Remove selected filters?"
-msgstr "Radera markerade filter?"
-
-#: js/prefs.js:298
-msgid "Removing selected filters..."
-msgstr "Tar bort valda filter..."
-
-#: js/prefs.js:308
-#: js/prefs.js:419
-#: js/prefs.js:438
-msgid "No filters are selected."
-msgstr "Inga filter valda."
-
-#: js/prefs.js:319
-msgid "Unsubscribe from selected feeds?"
-msgstr "Avsluta prenumeration på markerade flöden?"
-
-#: js/prefs.js:321
-msgid "Unsubscribing from selected feeds..."
-msgstr "Tar bort prenumeration för valda flöden..."
-
-#: js/prefs.js:347
-#: js/prefs.js:366
-#: js/prefs.js:392
-msgid "Please select only one user."
-msgstr "Markera endast en användare."
-
-#: js/prefs.js:370
-msgid "Reset password of selected user?"
-msgstr "Återställ lösenordet för markerad användare?"
-
-#: js/prefs.js:371
-msgid "Resetting password for selected user..."
-msgstr "Återställer lösenord för vald användare..."
+#: js/functions.js:727
+msgid "Please enter label caption:"
+msgstr "Ange titel för etikett:"
 
-#: js/prefs.js:424
-msgid "Please select only one filter."
-msgstr "Markera endast ett filter."
+#: js/functions.js:751
+#: js/tt-rss.js:521
+#, perl-format
+msgid "Unsubscribe from %s?"
+msgstr "Säg upp prenumeration på %s?"
 
-#: js/prefs.js:442
-msgid "Combine selected filters?"
-msgstr "Slå ihop markerade filter?"
+#: js/functions.js:754
+msgid "Removing feed..."
+msgstr "Tar bort flöde..."
 
-#: js/prefs.js:443
-msgid "Joining filters..."
-msgstr "Slår ihop filter..."
+#: js/functions.js:779
+#: js/tt-rss.js:361
+#: js/tt-rss.js:502
+msgid "You can't edit this kind of feed."
+msgstr "Detta typ av flöde kan inte redigeras."
 
-#: js/prefs.js:487
-msgid "Edit Multiple Feeds"
-msgstr "Redigera flera flöden"
+#: js/functions.js:793
+msgid "Edit Feed"
+msgstr "Redigera flöde"
 
-#: js/prefs.js:511
-msgid "Save changes to selected feeds?"
-msgstr "Spara ändringar för valda flöden?"
+#: js/functions.js:812
+msgid "Generate new syndication address for this feed?"
+msgstr "Generera en ny syndikeringsadress för detta flöde?"
 
-#: js/prefs.js:552
-msgid "OPML Import"
-msgstr "OPML-import"
+#: js/functions.js:814
+#: js/prefs.js:448
+msgid "Trying to change address..."
+msgstr "Försöker ändra adress..."
 
-#: js/prefs.js:571
-msgid "Please choose an OPML file first."
-msgstr "Välj en OPML-fil först."
+#: js/functions.js:882
+#, fuzzy
+msgid "Close"
+msgstr "stäng"
 
-#: js/prefs.js:574
-#: plugins/import_export/import_export.js:115
-msgid "Importing, please wait..."
-msgstr "Importerar, vänligen vänta..."
+#: js/functions.js:949
+msgid "Click to close"
+msgstr "Klicka för att stänga"
 
-#: js/prefs.js:737
-msgid "Reset to defaults?"
-msgstr "Återställ till standardvärden?"
+#: js/functions.js:1509
+msgid "Upload complete."
+msgstr "Uppladdning klar."
 
-#: js/prefs.js:777
-#, perl-format
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr "Radera kategori %s? Nästlade flöden placeras i Okategoriserat."
+#: js/functions.js:1527
+msgid "Remove stored feed icon?"
+msgstr "Ta bort sparad ikon för flöden?"
 
-#: js/prefs.js:778
-msgid "Removing category..."
-msgstr "Tar bort kategori..."
+#: js/functions.js:1529
+msgid "Removing feed icon..."
+msgstr "Tar bort flödesikon..."
 
-#: js/prefs.js:794
-msgid "Remove selected categories?"
-msgstr "Radera markekrade kategorier?"
+#: js/functions.js:1534
+msgid "Feed icon removed."
+msgstr "Flödesikon borttagen."
 
-#: js/prefs.js:795
-msgid "Removing selected categories..."
-msgstr "Raderar valda kategorier..."
+#: js/functions.js:1551
+msgid "Please select an image file to upload."
+msgstr "Välj en bild att ladda upp."
 
-#: js/prefs.js:805
-msgid "No categories are selected."
-msgstr "Inga kategorier valda."
+#: js/functions.js:1552
+msgid "Upload new icon for this feed?"
+msgstr "Ladda upp ny ikon för detta flöde?"
 
-#: js/prefs.js:812
-msgid "Category title:"
-msgstr "Kategorinamn:"
+#: js/functions.js:1553
+msgid "Uploading, please wait..."
+msgstr "Laddar upp, vänligen vänta..."
 
-#: js/prefs.js:815
-msgid "Creating category..."
-msgstr "Skapar kategori..."
+#: js/prefs.js:137
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Detta tar bort alla tidigare skapade flödes-URLer. Vill du fortsätta?"
 
-#: js/prefs.js:832
-msgid "Feeds without recent updates"
-msgstr "Flöden som inte uppdaterats på länge"
+#: js/prefs.js:138
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Rensar URLer..."
 
-#: js/prefs.js:869
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Byt nuvarande OPML-adress med en ny?"
+#: js/prefs.js:141
+msgid "Generated URLs cleared."
+msgstr "Genererade URLer rensade."
 
-#: js/prefs.js:898
-msgid "Reset selected labels to default colors?"
-msgstr "Återställ valda etiketter till standardfärger?"
+#: js/prefs.js:154
+#, fuzzy
+msgid "Clear event log?"
+msgstr "Rensa färger"
 
-#: js/prefs.js:926
+#: js/prefs.js:173
 msgid "Settings Profiles"
 msgstr "Inställningsprofiler"
 
-#: js/prefs.js:935
+#: js/prefs.js:182
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "Radera markerade profiler? Aktiva profiler tas inte bort."
 
-#: js/prefs.js:936
+#: js/prefs.js:183
 msgid "Removing selected profiles..."
 msgstr "Raderar valda profiler...."
 
-#: js/prefs.js:948
-msgid "No profiles are selected."
+#: js/prefs.js:197
+#, fuzzy
+msgid "No profiles selected."
 msgstr "Inga profiler valda."
 
-#: js/prefs.js:955
-#: js/prefs.js:997
+#: js/prefs.js:204
 msgid "Activate selected profile?"
 msgstr "Aktivera markerad profil?"
 
-#: js/prefs.js:964
-#: js/prefs.js:1008
+#: js/prefs.js:213
 msgid "Please choose a profile to activate."
 msgstr "Välj en profil att aktivera."
 
-#: js/prefs.js:969
+#: js/prefs.js:218
 msgid "Creating profile..."
 msgstr "Skapar profil..."
 
-#: js/prefs.js:1016
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Detta tar bort alla tidigare skapade flödes-URLer. Vill du fortsätta?"
+#: js/prefs.js:262
+msgid "Reset to defaults?"
+msgstr "Återställ till standardvärden?"
 
-#: js/prefs.js:1017
-#: plugins/share/share_prefs.js:3
-msgid "Clearing URLs..."
-msgstr "Rensar URLer..."
+#: js/prefs.js:270
+msgid "Clear stored data for this plugin?"
+msgstr "Radera lagrad data för detta tillägg?"
 
-#: js/prefs.js:1020
-msgid "Generated URLs cleared."
-msgstr "Genererade URLer rensade."
+#: js/viewfeed.js:35
+msgid "Please enter new score for selected articles:"
+msgstr "Ange ny poäng för markerade artiklar:"
 
-#: js/prefs.js:1053
+#: js/viewfeed.js:63
+#: js/viewfeed.js:1022
+#: js/viewfeed.js:1040
+#: js/viewfeed.js:1058
+#: js/viewfeed.js:1178
+#: js/viewfeed.js:1218
+#: plugins/mailto/init.js:7
+#: plugins/mail/mail.js:7
+#: js/viewfeed.js:768
+#: js/viewfeed.js:806
+#: js/viewfeed.js:827
 #, fuzzy
-msgid "Rename category to:"
-msgstr "Ta bort kategori"
-
-#: js/prefs.js:1074
-msgid "Label Editor"
-msgstr "Etikettseditor"
-
-#: js/tt-rss.js:111
-msgid "Mark all articles as read?"
-msgstr "Flagga alla artiklar som lästa?"
-
-#: js/tt-rss.js:115
-msgid "Marking all feeds as read..."
-msgstr "Markerar alla flöden som lästa..."
+msgid "No articles selected."
+msgstr "Ingen artikel vald."
 
-#: js/tt-rss.js:351
-msgid "Please enable mail plugin first."
-msgstr "Aktivera e-post-tillägget först."
+#: js/viewfeed.js:69
+msgid "Please enter new score for this article:"
+msgstr "Ange ny poäng för denna artikel:"
 
-#: js/tt-rss.js:477
-msgid "Please enable embed_original plugin first."
-msgstr "Vänligen aktivera tillägget embed_original först."
+#: js/viewfeed.js:111
+msgid "Article URL:"
+msgstr "URL för artikel:"
 
-#: js/tt-rss.js:490
-#: js/tt-rss.js:653
-msgid "Widescreen is not available in combined mode."
+#: js/viewfeed.js:185
+msgid "Could not display article (invalid object received - see error console for details)"
 msgstr ""
 
-#: 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
-#: plugins/mail/mail.js:7
-msgid "No articles are selected."
-msgstr "Inga artiklar valda."
+#: js/viewfeed.js:209
+msgid "Edit article Tags"
+msgstr "Redigera artikeltaggar"
 
-#: js/viewfeed.js:659
+#: js/viewfeed.js:213
+msgid "Saving article tags..."
+msgstr "Sparar artikeltaggar..."
+
+#: js/viewfeed.js:1066
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Radera %d vald artikel i %s?"
 msgstr[1] "Radera %d valda artiklar i %s?"
 
-#: js/viewfeed.js:661
+#: js/viewfeed.js:1068
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Radera %d vald artikel?"
 msgstr[1] "Radera %d valda artiklar?"
 
-#: js/viewfeed.js:694
+#: js/viewfeed.js:1187
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Arkivera %d vald artikel i %s?"
 msgstr[1] "Arkivera %d valda artiklar i %s?"
 
-#: js/viewfeed.js:697
+#: js/viewfeed.js:1190
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Flytta tillbaka %d arkiverad artikel?"
 msgstr[1] "Flytta tillbaka %d arkiverade artiklar?"
 
-#: js/viewfeed.js:698
+#: js/viewfeed.js:1191
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Vänligen notera att icke stjärnmärkta artiklar kanske rensas vid nästa flödesuppdatering."
 
-#: js/viewfeed.js:733
+#: js/viewfeed.js:1224
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Markera %d vald artikel i %s som läst?"
 msgstr[1] "Markera %d valda artiklar i %s som läst?"
 
-#: js/viewfeed.js:753
-msgid "Edit article Tags"
-msgstr "Redigera artikeltaggar"
-
-#: js/viewfeed.js:757
-msgid "Saving article tags..."
-msgstr "Sparar artikeltaggar..."
-
-#: js/viewfeed.js:1015
+#: js/viewfeed.js:1273
 msgid "No article is selected."
 msgstr "Ingen artikel vald."
 
-#: js/viewfeed.js:1050
+#: js/viewfeed.js:1308
 msgid "No articles found to mark"
 msgstr "Hittade inga artiklar att flagga"
 
-#: js/viewfeed.js:1052
+#: js/viewfeed.js:1310
 #, perl-format
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Markera %d artikel som läst?"
 msgstr[1] "Markera %d artiklar som lästa?"
 
-#: js/viewfeed.js:1312
+#: js/viewfeed.js:1381
 msgid "Open original article"
 msgstr "Öppna orginalartikeln"
 
-#: js/viewfeed.js:1319
+#: js/viewfeed.js:1388
 msgid "Display article URL"
 msgstr "Visa artikel-URL"
 
-#: js/viewfeed.js:1426
+#: js/viewfeed.js:1495
 msgid "Assign label"
 msgstr "Ange etikett"
 
-#: js/viewfeed.js:1431
+#: js/viewfeed.js:1500
 msgid "Remove label"
 msgstr "Ta bort etikett"
 
-#: js/viewfeed.js:1463
+#: js/viewfeed.js:1531
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Välj artikel under pekare"
 
-#: js/viewfeed.js:1473
+#: js/viewfeed.js:1541
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Markera som läst"
 
-#: js/viewfeed.js:1485
+#: js/viewfeed.js:1553
 msgid "Mark feed as read"
 msgstr "Flagga kanal som läst"
 
-#: js/viewfeed.js:1538
-msgid "Please enter new score for selected articles:"
-msgstr "Ange ny poäng för markerade artiklar:"
-
-#: js/viewfeed.js:1571
-msgid "Please enter new score for this article:"
-msgstr "Ange ny poäng för denna artikel:"
-
-#: js/viewfeed.js:1591
-msgid "Article URL:"
-msgstr "URL för artikel:"
-
 #: plugins/embed_original/init.js:6
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "Din webbläsare stöder inte sandboxade iframes"
@@ -3330,6 +3224,11 @@ msgstr "Importera data"
 msgid "Please choose the file first."
 msgstr "Välj fil först."
 
+#: plugins/import_export/import_export.js:115
+#: js/prefs.js:438
+msgid "Importing, please wait..."
+msgstr "Importerar, vänligen vänta..."
+
 #: plugins/share/share_prefs.js:2
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Detta tar bort alla tidigare delade artikel-URLer. Fortsätt?"
@@ -3375,111 +3274,233 @@ msgstr "Dina personliga data sparas."
 msgid "Saving article note..."
 msgstr "Sparar artikelnotering..."
 
-#: js/feedlist.js:168
+#: js/PrefFilterTree.js:114
+msgid "Combine selected filters?"
+msgstr "Slå ihop markerade filter?"
+
+#: js/PrefFilterTree.js:115
+msgid "Joining filters..."
+msgstr "Slår ihop filter..."
+
+#: js/PrefFilterTree.js:131
+msgid "Please select only one filter."
+msgstr "Markera endast ett filter."
+
+#: js/PrefFilterTree.js:151
+msgid "Edit Filter"
+msgstr "Redigera filter"
+
+#: js/PrefFilterTree.js:190
+msgid "Remove filter?"
+msgstr "Radera filter?"
+
+#: js/PrefFilterTree.js:195
+msgid "Removing filter..."
+msgstr "Tar bort filter..."
+
+#: js/PrefLabelTree.js:66
+msgid "Label Editor"
+msgstr "Etikettseditor"
+
+#: js/PrefLabelTree.js:124
+msgid "Reset selected labels to default colors?"
+msgstr "Återställ valda etiketter till standardfärger?"
+
+#: js/PrefLabelTree.js:137
+#: js/PrefLabelTree.js:157
 #, fuzzy
-msgid "Your password is at default value"
-msgstr "Byt lösenord."
+msgid "No labels selected."
+msgstr "Inga etiketter valda."
+
+#: js/PrefLabelTree.js:144
+msgid "Remove selected labels?"
+msgstr "Radera markerade etiketter?"
+
+#: js/PrefLabelTree.js:145
+msgid "Removing selected labels..."
+msgstr "Tar bort valda etiketter..."
+
+#: js/feedlist.js:389
+msgid "Mark all articles as read?"
+msgstr "Flagga alla artiklar som lästa?"
 
-#: js/feedlist.js:413
+#: js/feedlist.js:393
+msgid "Marking all feeds as read..."
+msgstr "Markerar alla flöden som lästa..."
+
+#: js/feedlist.js:432
+#, fuzzy
+msgid "Mark %w in %s older than 1 day as read?"
+msgstr "Markera alla artiklar i %s äldre än 1 dag som lästa?"
+
+#: js/feedlist.js:435
+#, fuzzy
+msgid "Mark %w in %s older than 1 week as read?"
+msgstr "Markera alla artiklar i %s äldre än 1 vecka som lästa?"
+
+#: js/feedlist.js:438
+#, fuzzy
+msgid "Mark %w in %s older than 2 weeks as read?"
+msgstr "Markera alla artiklar i %s äldre än 2 veckor som lästa?"
+
+#: js/feedlist.js:441
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "Märk alla artiklar i %s som lästa?"
+
+#: js/feedlist.js:444
+#, fuzzy
+msgid "search results"
+msgstr "Sökresultat: %s"
+
+#: js/feedlist.js:444
+#, fuzzy
+msgid "all articles"
+msgstr "Alla artiklar"
+
+#: js/feedlist.js:486
 msgid "Mark all articles in %s as read?"
 msgstr "Märk alla artiklar i %s som lästa?"
 
-#: js/functions.js:764
+#: js/functions.js:1241
 msgid "Edit rule"
 msgstr "Redigera regel"
 
-#: js/functions.js:786
+#: js/functions.js:1263
 msgid "Edit action"
 msgstr "Redigera åtgärd"
 
-#: js/functions.js:825
+#: js/functions.js:1302
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:855
+#: js/functions.js:1332
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artiklar som matchar detta filter: "
 
-#: js/functions.js:907
+#: js/functions.js:1385
 msgid "Create Filter"
 msgstr "Skapa filter"
 
-#: js/functions.js:1016
-#: js/tt-rss.js:631
-msgid "Unsubscribe from %s?"
-msgstr "Säg upp prenumeration på %s?"
-
-#: js/functions.js:1019
-msgid "Removing feed..."
-msgstr "Tar bort flöde..."
-
-#: js/functions.js:1410
-msgid "Help"
-msgstr "Hjälp"
-
-#: js/prefs.js:44
-msgid "Please enter login:"
+#: js/prefs.js:298
+#, fuzzy
+msgid "Please enter username:"
 msgstr "Ange inloggning:"
 
-#: js/prefs.js:51
-msgid "Can't create user: no login specified."
-msgstr "Kan inte skapa användare, ingen inloggning angiven."
-
-#: js/prefs.js:55
+#: js/prefs.js:301
 msgid "Adding user..."
 msgstr "Lägger till användare..."
 
-#: js/prefs.js:74
+#: js/prefs.js:319
 msgid "User Editor"
 msgstr "Användareditor"
 
-#: js/prefs.js:104
-msgid "Edit Filter"
-msgstr "Redigera filter"
+#: js/prefs.js:340
+#: js/prefs.js:379
+#: js/prefs.js:386
+#, fuzzy
+msgid "No users selected."
+msgstr "Ingen användare vald."
 
-#: js/prefs.js:1175
-msgid "Subscribing to feeds..."
-msgstr "Prenumererar på flöden..."
+#: js/prefs.js:345
+#: js/prefs.js:391
+#, fuzzy
+msgid "Please select one user."
+msgstr "Markera endast en användare."
 
-#: js/prefs.js:1191
-msgid "Clear stored data for this plugin?"
-msgstr "Radera lagrad data för detta tillägg?"
+#: js/prefs.js:349
+msgid "Reset password of selected user?"
+msgstr "Återställ lösenordet för markerad användare?"
 
-#: js/prefs.js:1203
-msgid "Clear all messages in the error log?"
-msgstr ""
+#: js/prefs.js:350
+msgid "Resetting password for selected user..."
+msgstr "Återställer lösenord för vald användare..."
 
-#: js/tt-rss.js:620
-msgid "You can't unsubscribe from the category."
-msgstr "Du kan inte säga upp prenumeration på kategorin."
+#: js/prefs.js:365
+msgid "Remove selected users? Neither default admin nor your account will be removed."
+msgstr "Radera markerade användare? Varken admin eller ditt konto kan raderas."
+
+#: js/prefs.js:366
+msgid "Removing selected users..."
+msgstr "Tar bort valda användare..."
+
+#: js/prefs.js:416
+msgid "OPML Import"
+msgstr "OPML-import"
+
+#: js/prefs.js:435
+msgid "Please choose an OPML file first."
+msgstr "Välj en OPML-fil först."
+
+#: js/prefs.js:447
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Byt nuvarande OPML-adress med en ny?"
+
+#: js/tt-rss.js:314
+msgid "Please enable mail plugin first."
+msgstr "Aktivera e-post-tillägget först."
+
+#: js/tt-rss.js:437
+msgid "Please enable embed_original plugin first."
+msgstr "Vänligen aktivera tillägget embed_original först."
 
-#: js/tt-rss.js:625
+#: js/tt-rss.js:450
+#: js/tt-rss.js:541
+msgid "Widescreen is not available in combined mode."
+msgstr ""
+
+#: js/tt-rss.js:510
 msgid "Please select some feed first."
 msgstr "Välj några flöden först."
 
-#: js/viewfeed.js:89
-#: js/viewfeed.js:135
-#: js/viewfeed.js:152
+#: js/tt-rss.js:515
+msgid "You can't unsubscribe from the category."
+msgstr "Du kan inte säga upp prenumeration på kategorin."
+
+#: js/viewfeed.js:658
+#: js/viewfeed.js:706
+#: js/viewfeed.js:723
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klicka för att redigera flöde"
 
-#: js/viewfeed.js:93
+#: js/viewfeed.js:662
 msgid "Cancel search"
 msgstr "Avbryt sökning"
 
-#: js/viewfeed.js:149
+#: js/viewfeed.js:720
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Hittade inga artiklar att visa."
 
-#: js/viewfeed.js:405
+#: js/viewfeed.js:985
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikel vald"
 msgstr[1] "%d artiklar valda"
 
+#~ msgid "View as RSS feed"
+#~ msgstr "Visa RSS-flöde"
+
+#~ msgid "View as RSS"
+#~ msgstr "Visa som RSS"
+
+#~ msgid "Error Log"
+#~ msgstr "Fellogg"
+
+#~ msgid "You can view this feed as RSS using the following URL:"
+#~ msgstr "Du kan se detta flöde som RSS på följande URL:"
+
+#~ msgid "No feeds are selected."
+#~ msgstr "Inget flöde valt."
+
+#~ msgid "No articles are selected."
+#~ msgstr "Inga artiklar valda."
+
+#~ msgid "Can't create user: no login specified."
+#~ msgstr "Kan inte skapa användare, ingen inloggning angiven."
+
 #~ msgid "Rescore feed"
 #~ msgstr "Beräkna flödets poäng på nytt"
 
@@ -3720,9 +3741,6 @@ msgstr[1] "%d artiklar valda"
 #~ msgid "Limit search to:"
 #~ msgstr "Begränsa sökning till:"
 
-#~ msgid "This feed"
-#~ msgstr "Detta flöde"
-
 #~ msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
 #~ msgstr "Komplexa uttryck kanske inte ger några testresultat på grund av problem med databasens regexpimplementation"