rebase translations

2 files changed, 486 insertions, 482 deletions

diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 2b3680657..96ed2e5f6 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index bb073c256..eca3d2ac6 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-09 09:22+0400\n"
+"POT-Creation-Date: 2014-03-09 11:18+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -157,11 +157,11 @@ msgstr "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine.
 
 #: index.php:129
 #: index.php:146
-#: index.php:268
+#: index.php:269
 #: prefs.php:98
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
-#: classes/pref/filters.php:683
+#: classes/pref/filters.php:666
 #: classes/pref/feeds.php:1361
 #: js/feedlist.js:126
 #: js/feedlist.js:450
@@ -183,190 +183,190 @@ msgstr "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine.
 #: js/prefs.js:1794
 #: js/tt-rss.js:510
 #: js/tt-rss.js:527
-#: js/viewfeed.js:855
-#: js/viewfeed.js:1312
+#: js/viewfeed.js:859
+#: js/viewfeed.js:1316
 #: plugins/import_export/import_export.js:17
 #: plugins/updater/updater.js:17
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
-#: index.php:160
+#: index.php:164
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: index.php:163
+#: index.php:167
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: index.php:166
+#: index.php:170
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: index.php:167
+#: index.php:171
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:168
-#: include/functions.php:2082
-#: classes/feeds.php:101
+#: index.php:172
+#: include/functions2.php:92
+#: classes/feeds.php:102
 msgid "Starred"
 msgstr "Favoritter"
 
-#: index.php:169
-#: include/functions.php:2083
-#: classes/feeds.php:102
+#: index.php:173
+#: include/functions2.php:93
+#: classes/feeds.php:103
 msgid "Published"
 msgstr "Publisert"
 
-#: index.php:170
-#: classes/feeds.php:88
-#: classes/feeds.php:100
+#: index.php:174
+#: classes/feeds.php:89
+#: classes/feeds.php:101
 msgid "Unread"
 msgstr "Ulest"
 
-#: index.php:171
+#: index.php:175
 #, fuzzy
 msgid "Unread First"
 msgstr "Ulest"
 
-#: index.php:172
+#: index.php:176
 msgid "With Note"
 msgstr ""
 
-#: index.php:173
+#: index.php:177
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: index.php:176
+#: index.php:180
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: index.php:179
+#: index.php:183
 msgid "Default"
 msgstr "Standard"
 
-#: index.php:180
+#: index.php:184
 msgid "Newest first"
 msgstr ""
 
-#: index.php:181
+#: index.php:185
 msgid "Oldest first"
 msgstr ""
 
-#: index.php:182
+#: index.php:186
 msgid "Title"
 msgstr "Tittel"
 
-#: index.php:186
-#: index.php:234
-#: include/functions.php:2072
-#: classes/feeds.php:106
+#: index.php:190
+#: index.php:238
+#: include/functions2.php:82
+#: classes/feeds.php:107
 #: js/FeedTree.js:128
 #: js/FeedTree.js:156
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: index.php:189
+#: index.php:193
 msgid "Older than one day"
 msgstr ""
 
-#: index.php:192
+#: index.php:196
 msgid "Older than one week"
 msgstr ""
 
-#: index.php:195
+#: index.php:199
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:211
+#: index.php:215
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:219
+#: index.php:223
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: index.php:224
+#: index.php:228
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: index.php:226
+#: index.php:230
 #, fuzzy
 msgid "Preferences..."
 msgstr "Innstillinger"
 
-#: index.php:227
+#: index.php:231
 msgid "Search..."
 msgstr "Søk..."
 
-#: index.php:228
+#: index.php:232
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: index.php:229
-#: classes/handler/public.php:611
+#: index.php:233
+#: classes/handler/public.php:624
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: index.php:230
+#: index.php:234
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: index.php:231
+#: index.php:235
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: index.php:232
+#: index.php:236
 #: classes/pref/feeds.php:756
 #: classes/pref/feeds.php:1316
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:233
+#: index.php:237
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:235
+#: index.php:239
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:236
+#: index.php:240
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:237
-#: include/functions.php:2058
+#: index.php:241
+#: include/functions2.php:68
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: index.php:238
+#: index.php:242
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:239
+#: index.php:243
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: index.php:240
+#: index.php:244
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: index.php:241
+#: index.php:245
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: index.php:250
+#: index.php:254
 msgid "Logout"
 msgstr "Logg ut"
 
 #: prefs.php:33
 #: prefs.php:116
-#: include/functions.php:2085
+#: include/functions2.php:95
 #: classes/pref/prefs.php:440
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -387,13 +387,13 @@ msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
 #: prefs.php:122
-#: classes/pref/filters.php:158
+#: classes/pref/filters.php:154
 msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:125
-#: include/functions.php:1246
-#: include/functions.php:1907
+#: include/functions.php:1255
+#: include/functions.php:1915
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Merkelapper"
@@ -406,410 +406,378 @@ msgstr "Brukere"
 msgid "System"
 msgstr ""
 
-#: register.php:186
-#: include/login_form.php:238
+#: register.php:187
+#: include/login_form.php:245
 msgid "Create new account"
 msgstr "Lag ny konto"
 
-#: register.php:192
+#: register.php:193
 msgid "New user registrations are administratively disabled."
 msgstr "Registrering av nye brukere er administrativt avskrudd"
 
-#: 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:681
-#: classes/handler/public.php:772
-#: classes/handler/public.php:858
-#: classes/handler/public.php:937
-#: classes/handler/public.php:951
-#: classes/handler/public.php:958
-#: classes/handler/public.php:983
+#: register.php:197
+#: register.php:242
+#: register.php:255
+#: register.php:270
+#: register.php:289
+#: register.php:337
+#: register.php:347
+#: register.php:359
+#: classes/handler/public.php:694
+#: classes/handler/public.php:765
+#: classes/handler/public.php:863
+#: classes/handler/public.php:942
+#: classes/handler/public.php:956
+#: classes/handler/public.php:963
+#: classes/handler/public.php:988
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: register.php:217
+#: register.php:218
 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 "Ditt midlertidige passord vil bli sendt til den oppgitte e-posten. Kontoer, som ikke blir logget inn på, blir slettet automatisk 24 timer etter at passordet ble sendt."
 
-#: register.php:223
+#: register.php:224
 msgid "Desired login:"
 msgstr "Ønsket brukernavn:"
 
-#: register.php:226
+#: register.php:227
 msgid "Check availability"
 msgstr "Sjekk tilgjengeligheten"
 
-#: register.php:228
-#: classes/handler/public.php:816
+#: register.php:229
+#: classes/handler/public.php:781
 msgid "Email:"
 msgstr "E-post:"
 
-#: register.php:231
-#: classes/handler/public.php:821
+#: register.php:232
+#: classes/handler/public.php:786
 msgid "How much is two plus two:"
 msgstr "Hvor mye er to pluss to:"
 
-#: register.php:234
+#: register.php:235
 msgid "Submit registration"
 msgstr "Send registreringen"
 
-#: register.php:252
+#: register.php:253
 msgid "Your registration information is incomplete."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: register.php:267
+#: register.php:268
 msgid "Sorry, this username is already taken."
 msgstr "Beklager, brukernavn er allerede tatt."
 
-#: register.php:286
+#: register.php:287
 msgid "Registration failed."
 msgstr "Registrering feilet"
 
-#: register.php:333
+#: register.php:334
 msgid "Account created successfully."
 msgstr "Kontoen ble opprettet med suksess."
 
-#: register.php:355
+#: register.php:356
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: update.php:55
+#: update.php:62
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
 #: include/digest.php:109
-#: include/functions.php:1255
-#: include/functions.php:1808
-#: include/functions.php:1893
-#: include/functions.php:1915
+#: include/functions.php:1264
+#: include/functions.php:1816
+#: include/functions.php:1901
+#: include/functions.php:1923
 #: classes/opml.php:421
 #: classes/pref/feeds.php:225
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: include/feedbrowser.php:83
+#: include/feedbrowser.php:82
 #, fuzzy, php-format
 msgid "%d archived article"
 msgid_plural "%d archived articles"
 msgstr[0] "Favorittartikler"
 msgstr[1] "Favorittartikler"
 
-#: include/feedbrowser.php:107
+#: include/feedbrowser.php:106
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:1244
-#: include/functions.php:1905
-msgid "Special"
-msgstr "Snarveier"
-
-#: include/functions.php:1756
-#: classes/feeds.php:1120
-#: classes/pref/filters.php:429
-msgid "All feeds"
-msgstr "Alle Nyhetsstrømmer"
-
-#: include/functions.php:1960
-msgid "Starred articles"
-msgstr "Favorittartikler"
-
-#: include/functions.php:1962
-msgid "Published articles"
-msgstr "Publiserte artikler"
-
-#: include/functions.php:1964
-msgid "Fresh articles"
-msgstr "Ferske artikler"
-
-#: include/functions.php:1966
-#: include/functions.php:2080
-msgid "All articles"
-msgstr "Alle artikler"
-
-#: include/functions.php:1968
-#, fuzzy
-msgid "Archived articles"
-msgstr "Lagrede artikler"
-
-#: include/functions.php:1970
-msgid "Recently read"
-msgstr ""
-
-#: include/functions.php:2032
+#: include/functions2.php:42
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: include/functions.php:2033
+#: include/functions2.php:43
 #, fuzzy
 msgid "Open next feed"
 msgstr "Generert nyhetsstrøm"
 
-#: include/functions.php:2034
+#: include/functions2.php:44
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:2035
+#: include/functions2.php:45
 #, fuzzy
 msgid "Open next article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:2036
+#: include/functions2.php:46
 #, fuzzy
 msgid "Open previous article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:2037
+#: include/functions2.php:47
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:2038
+#: include/functions2.php:48
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:2039
+#: include/functions2.php:49
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:2040
+#: include/functions2.php:50
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:2041
+#: include/functions2.php:51
 msgid "Show search dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:2042
+#: include/functions2.php:52
 #, fuzzy
 msgid "Article"
 msgstr "Alle artikler"
 
-#: include/functions.php:2043
-#: js/viewfeed.js:1975
+#: include/functions2.php:53
+#: js/viewfeed.js:1979
 msgid "Toggle starred"
 msgstr "Sett som favoritt"
 
-#: include/functions.php:2044
-#: js/viewfeed.js:1986
+#: include/functions2.php:54
+#: js/viewfeed.js:1990
 msgid "Toggle published"
 msgstr "Sett som publisert"
 
-#: include/functions.php:2045
-#: js/viewfeed.js:1964
+#: include/functions2.php:55
+#: js/viewfeed.js:1968
 msgid "Toggle unread"
 msgstr "Sett som ulest"
 
-#: include/functions.php:2046
+#: include/functions2.php:56
 msgid "Edit tags"
 msgstr "Endre stikkord"
 
-#: include/functions.php:2047
+#: include/functions2.php:57
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: include/functions.php:2048
+#: include/functions2.php:58
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publiser artiklen"
 
-#: include/functions.php:2049
+#: include/functions2.php:59
 #, fuzzy
 msgid "Open in new window"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:2050
-#: js/viewfeed.js:2005
+#: include/functions2.php:60
+#: js/viewfeed.js:2009
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:2051
-#: js/viewfeed.js:1999
+#: include/functions2.php:61
+#: js/viewfeed.js:2003
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:2052
+#: include/functions2.php:62
 #, fuzzy
 msgid "Scroll down"
 msgstr "Alt ferdig."
 
-#: include/functions.php:2053
+#: include/functions2.php:63
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:2054
+#: include/functions2.php:64
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Velg artikkelen under musepekeren"
 
-#: include/functions.php:2055
+#: include/functions2.php:65
 #, fuzzy
 msgid "Email article"
 msgstr "Alle artikler"
 
-#: include/functions.php:2056
+#: include/functions2.php:66
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:2057
+#: include/functions2.php:67
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:2059
+#: include/functions2.php:69
 #: plugins/embed_original/init.php:31
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:2060
+#: include/functions2.php:70
 #, fuzzy
 msgid "Article selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:2061
+#: include/functions2.php:71
 #, fuzzy
 msgid "Select all articles"
 msgstr "Fjern artikler"
 
-#: include/functions.php:2062
+#: include/functions2.php:72
 #, fuzzy
 msgid "Select unread"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:2063
+#: include/functions2.php:73
 #, fuzzy
 msgid "Select starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/functions.php:2064
+#: include/functions2.php:74
 #, fuzzy
 msgid "Select published"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:2065
+#: include/functions2.php:75
 #, fuzzy
 msgid "Invert selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:2066
+#: include/functions2.php:76
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Fjern artikler"
 
-#: include/functions.php:2067
+#: include/functions2.php:77
 #: classes/pref/feeds.php:549
 #: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:2068
+#: include/functions2.php:78
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: include/functions.php:2069
+#: include/functions2.php:79
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: include/functions.php:2070
+#: include/functions2.php:80
 #: classes/pref/feeds.php:1308
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: include/functions.php:2071
+#: include/functions2.php:81
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: include/functions.php:2073
+#: include/functions2.php:83
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions.php:2074
+#: include/functions2.php:84
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:2075
+#: include/functions2.php:85
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions.php:2076
+#: include/functions2.php:86
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions.php:2077
+#: include/functions2.php:87
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:2078
+#: include/functions2.php:88
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:2079
+#: include/functions2.php:89
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions.php:2081
+#: include/functions2.php:90
+#: include/functions.php:1974
+msgid "All articles"
+msgstr "Alle artikler"
+
+#: include/functions2.php:91
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions.php:2084
+#: include/functions2.php:94
 #: js/tt-rss.js:460
 #: js/tt-rss.js:649
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions.php:2086
+#: include/functions2.php:96
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions.php:2087
+#: include/functions2.php:97
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions.php:2088
-#: classes/pref/filters.php:657
+#: include/functions2.php:98
+#: classes/pref/filters.php:640
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions.php:2089
+#: include/functions2.php:99
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions.php:2090
+#: include/functions2.php:100
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:2635
+#: include/functions2.php:645
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Søkeresultat"
 
-#: include/functions.php:3242
+#: include/functions2.php:1249
 #: classes/feeds.php:706
 #, fuzzy
 msgid "comment"
@@ -817,54 +785,54 @@ msgid_plural "comments"
 msgstr[0] "Kommentarer"
 msgstr[1] "Kommentarer"
 
-#: include/functions.php:3246
+#: include/functions2.php:1253
 #: classes/feeds.php:710
 msgid "comments"
 msgstr "Kommentarer"
 
-#: include/functions.php:3284
+#: include/functions2.php:1294
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3317
-#: include/functions.php:3565
-#: classes/article.php:281
+#: include/functions2.php:1327
+#: include/functions2.php:1575
+#: classes/article.php:280
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: include/functions.php:3327
+#: include/functions2.php:1337
 #: classes/feeds.php:692
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: include/functions.php:3359
+#: include/functions2.php:1369
 #: classes/feeds.php:644
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:3372
+#: include/functions2.php:1382
 #: classes/feeds.php:657
 #: classes/pref/feeds.php:568
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:3406
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:190
-#: classes/dlg.php:217
-#: classes/dlg.php:250
-#: classes/dlg.php:262
+#: include/functions2.php:1416
+#: classes/dlg.php:36
+#: classes/dlg.php:59
+#: classes/dlg.php:92
+#: classes/dlg.php:158
+#: classes/dlg.php:189
+#: classes/dlg.php:216
+#: classes/dlg.php:249
+#: classes/dlg.php:261
 #: classes/backend.php:105
 #: classes/pref/users.php:95
-#: classes/pref/filters.php:149
-#: classes/pref/prefs.php:1100
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1675
+#: classes/pref/filters.php:145
+#: classes/pref/prefs.php:1101
+#: classes/pref/feeds.php:1605
+#: classes/pref/feeds.php:1671
 #: plugins/import_export/init.php:407
 #: plugins/import_export/init.php:452
 #: plugins/googlereaderimport/init.php:194
@@ -873,68 +841,100 @@ msgstr "Nyhetsstrøm"
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: include/functions.php:3602
+#: include/functions2.php:1612
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions.php:3838
+#: include/functions2.php:1849
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions.php:3898
+#: include/functions2.php:1909
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg:"
 
-#: include/functions.php:4382
+#: include/functions2.php:2393
 #, php-format
 msgid "LibXML error %s at line %d (column %d): %s"
 msgstr ""
 
-#: include/login_form.php:183
-#: classes/handler/public.php:520
-#: classes/handler/public.php:811
+#: include/functions.php:1253
+#: include/functions.php:1913
+msgid "Special"
+msgstr "Snarveier"
+
+#: include/functions.php:1764
+#: classes/feeds.php:1116
+#: classes/pref/filters.php:412
+msgid "All feeds"
+msgstr "Alle Nyhetsstrømmer"
+
+#: include/functions.php:1968
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: include/functions.php:1970
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: include/functions.php:1972
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: include/functions.php:1976
+#, fuzzy
+msgid "Archived articles"
+msgstr "Lagrede artikler"
+
+#: include/functions.php:1978
+msgid "Recently read"
+msgstr ""
+
+#: include/login_form.php:190
+#: classes/handler/public.php:521
+#: classes/handler/public.php:776
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: include/login_form.php:193
-#: classes/handler/public.php:523
+#: include/login_form.php:200
+#: classes/handler/public.php:524
 msgid "Password:"
 msgstr "Passord:"
 
-#: include/login_form.php:199
+#: include/login_form.php:206
 #, fuzzy
 msgid "I forgot my password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: include/login_form.php:205
+#: include/login_form.php:212
 #, fuzzy
 msgid "Profile:"
 msgstr "Fil:"
 
-#: include/login_form.php:209
+#: include/login_form.php:216
 #: classes/handler/public.php:263
 #: classes/rpc.php:63
-#: classes/pref/prefs.php:1038
+#: classes/pref/prefs.php:1039
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
 
-#: include/login_form.php:217
+#: include/login_form.php:224
 msgid "Use less traffic"
 msgstr ""
 
-#: include/login_form.php:221
+#: include/login_form.php:228
 msgid "Does not display images in articles, reduces automatic refreshes."
 msgstr ""
 
-#: include/login_form.php:229
+#: include/login_form.php:236
 msgid "Remember me"
 msgstr ""
 
-#: include/login_form.php:235
-#: classes/handler/public.php:528
+#: include/login_form.php:242
+#: classes/handler/public.php:529
 msgid "Log in"
 msgstr "Logg inn"
 
@@ -967,15 +967,15 @@ msgstr "Sesjonen kunne ikke valideres (feil IP)"
 msgid "Article not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/article.php:179
+#: classes/article.php:178
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: classes/article.php:204
+#: classes/article.php:203
 #: classes/pref/users.php:168
 #: classes/pref/labels.php:79
-#: classes/pref/filters.php:407
-#: classes/pref/prefs.php:984
+#: classes/pref/filters.php:390
+#: classes/pref/prefs.php:985
 #: classes/pref/feeds.php:772
 #: classes/pref/feeds.php:899
 #: plugins/nsfw/init.php:85
@@ -984,22 +984,22 @@ msgstr "Denne artikkelens stikkord (separert med kommaer):"
 msgid "Save"
 msgstr "Lagre"
 
-#: classes/article.php:206
-#: classes/handler/public.php:497
-#: classes/handler/public.php:531
-#: classes/feeds.php:1047
-#: classes/feeds.php:1099
-#: classes/feeds.php:1159
+#: classes/article.php:205
+#: classes/handler/public.php:498
+#: classes/handler/public.php:532
+#: classes/feeds.php:1045
+#: classes/feeds.php:1095
+#: classes/feeds.php:1155
 #: classes/pref/users.php:170
 #: classes/pref/labels.php:81
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:806
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:954
-#: classes/pref/prefs.php:986
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:789
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:937
+#: classes/pref/prefs.php:987
 #: classes/pref/feeds.php:773
 #: classes/pref/feeds.php:902
-#: classes/pref/feeds.php:1815
+#: classes/pref/feeds.php:1811
 #: plugins/mail/init.php:129
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1007,134 +1007,131 @@ msgstr "Lagre"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: classes/handler/public.php:461
+#: classes/handler/public.php:462
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/handler/public.php:469
+#: classes/handler/public.php:470
 msgid "Title:"
 msgstr "Tittel:"
 
-#: classes/handler/public.php:471
+#: classes/handler/public.php:472
 #: classes/pref/feeds.php:566
 #: plugins/instances/init.php:212
 #: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: classes/handler/public.php:473
+#: classes/handler/public.php:474
 #, fuzzy
 msgid "Content:"
 msgstr "Innhold"
 
-#: classes/handler/public.php:475
+#: classes/handler/public.php:476
 #, fuzzy
 msgid "Labels:"
 msgstr "Merkelapper"
 
-#: classes/handler/public.php:494
+#: classes/handler/public.php:495
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:496
+#: classes/handler/public.php:497
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:518
+#: classes/handler/public.php:519
 #, fuzzy
 msgid "Not logged in"
 msgstr "Sist innlogget"
 
-#: classes/handler/public.php:577
+#: classes/handler/public.php:578
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/handler/public.php:617
-#: classes/handler/public.php:715
+#: classes/handler/public.php:630
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:620
-#: classes/handler/public.php:706
+#: classes/handler/public.php:633
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/handler/public.php:623
-#: classes/handler/public.php:709
+#: classes/handler/public.php:636
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:626
-#: classes/handler/public.php:712
+#: classes/handler/public.php:639
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: classes/handler/public.php:629
-#: classes/handler/public.php:718
+#: classes/handler/public.php:642
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
 
-#: classes/handler/public.php:633
-#: classes/handler/public.php:725
+#: classes/handler/public.php:646
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:651
-#: classes/handler/public.php:743
+#: classes/handler/public.php:664
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/handler/public.php:676
-#: classes/handler/public.php:767
+#: classes/handler/public.php:689
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: classes/handler/public.php:798
+#: classes/handler/public.php:726
 #, fuzzy
 msgid "Password recovery"
 msgstr "Passord:"
 
-#: classes/handler/public.php:804
-msgid "You will need to provide valid account name and email. New password will be sent on your email address."
+#: classes/handler/public.php:769
+msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:826
+#: classes/handler/public.php:791
 #: classes/pref/users.php:352
 msgid "Reset password"
 msgstr "Nullstill passordet"
 
-#: classes/handler/public.php:836
+#: classes/handler/public.php:801
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:840
-#: classes/handler/public.php:866
+#: classes/handler/public.php:805
+#: classes/handler/public.php:871
 #, fuzzy
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: classes/handler/public.php:862
+#: classes/handler/public.php:842
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Varsel om endring av passord"
+
+#: classes/handler/public.php:867
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:884
+#: classes/handler/public.php:889
 msgid "Your access level is insufficient to run this script."
 msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
 
-#: classes/handler/public.php:910
+#: classes/handler/public.php:915
 msgid "Database Updater"
 msgstr "Databaseoppdaterer"
 
-#: classes/handler/public.php:975
+#: classes/handler/public.php:980
 msgid "Perform updates"
 msgstr "Utfør oppdateringene"
 
@@ -1142,202 +1139,198 @@ msgstr "Utfør oppdateringene"
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:48
+#: classes/dlg.php:47
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: classes/dlg.php:57
-#: classes/dlg.php:214
+#: classes/dlg.php:56
+#: classes/dlg.php:213
 #: plugins/share/init.php:120
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
-#: classes/dlg.php:71
+#: classes/dlg.php:70
 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 "Oppdateringsprosessen er åpnet for i konfigurasjonsfilen, men prosessen blir ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst start prosessen eller konakt administratoren."
 
-#: classes/dlg.php:75
-#: classes/dlg.php:84
+#: classes/dlg.php:74
+#: classes/dlg.php:83
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: classes/dlg.php:80
+#: classes/dlg.php:79
 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 "TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdatere nyhetsstrømmene. Dette kan indikere et krasj eller at noe henger. Vennligst sjekk oppdateringsprosessen eller kontakt vedkommende som innehar nyhetsstrømmen."
 
-#: classes/dlg.php:166
+#: classes/dlg.php:165
 msgid "Match:"
 msgstr "Matcher:"
 
-#: classes/dlg.php:168
+#: classes/dlg.php:167
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:171
+#: classes/dlg.php:170
 #, fuzzy
 msgid "All tags."
 msgstr "Ingen stikkord"
 
-#: classes/dlg.php:173
+#: classes/dlg.php:172
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:186
+#: classes/dlg.php:185
 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/dlg.php:205
+#: classes/dlg.php:204
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:233
+#: classes/dlg.php:232
 #: plugins/updater/init.php:333
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: classes/dlg.php:241
+#: classes/dlg.php:240
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:245
+#: classes/dlg.php:244
 #: plugins/updater/init.php:337
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:247
+#: classes/dlg.php:246
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:255
+#: classes/dlg.php:254
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/feeds.php:58
-#, fuzzy, php-format
-msgid "Last updated: %s"
-msgstr "Siste oppdatering:"
-
-#: classes/feeds.php:78
+#: classes/feeds.php:51
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Se nyhetsstrømmene"
 
-#: classes/feeds.php:79
-#: classes/feeds.php:131
+#: classes/feeds.php:52
+#: classes/feeds.php:132
 #: classes/pref/feeds.php:1467
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
-#: classes/feeds.php:86
-msgid "Select:"
-msgstr "Velg:"
+#: classes/feeds.php:60
+#, fuzzy, php-format
+msgid "Last updated: %s"
+msgstr "Siste oppdatering:"
 
-#: classes/feeds.php:87
+#: classes/feeds.php:88
 #: classes/pref/users.php:337
 #: classes/pref/labels.php:275
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:651
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/prefs.php:998
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:315
+#: classes/pref/filters.php:634
+#: classes/pref/filters.php:722
+#: classes/pref/filters.php:749
+#: classes/pref/prefs.php:999
 #: classes/pref/feeds.php:1299
 #: classes/pref/feeds.php:1556
-#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1620
 #: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alle"
 
-#: classes/feeds.php:89
+#: classes/feeds.php:90
 msgid "Invert"
 msgstr "Motsatt"
 
-#: classes/feeds.php:90
+#: classes/feeds.php:91
 #: classes/pref/users.php:339
 #: classes/pref/labels.php:277
-#: classes/pref/filters.php:286
-#: classes/pref/filters.php:334
-#: classes/pref/filters.php:653
-#: classes/pref/filters.php:741
-#: classes/pref/filters.php:768
-#: classes/pref/prefs.php:1000
+#: classes/pref/filters.php:269
+#: classes/pref/filters.php:317
+#: classes/pref/filters.php:636
+#: classes/pref/filters.php:724
+#: classes/pref/filters.php:751
+#: classes/pref/prefs.php:1001
 #: classes/pref/feeds.php:1301
 #: classes/pref/feeds.php:1558
-#: classes/pref/feeds.php:1624
+#: classes/pref/feeds.php:1622
 #: plugins/instances/init.php:289
 msgid "None"
 msgstr "Ingen"
 
-#: classes/feeds.php:96
+#: classes/feeds.php:97
 #, fuzzy
 msgid "More..."
 msgstr "Laster hjelp..."
 
-#: classes/feeds.php:98
+#: classes/feeds.php:99
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
-#: classes/feeds.php:104
+#: classes/feeds.php:105
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: classes/feeds.php:107
+#: classes/feeds.php:108
 #, fuzzy
 msgid "Set score"
 msgstr "Poeng"
 
-#: classes/feeds.php:110
+#: classes/feeds.php:111
 #, fuzzy
 msgid "Archive"
 msgstr "Artikkeldato"
 
-#: classes/feeds.php:112
+#: classes/feeds.php:113
 #, fuzzy
 msgid "Move back"
 msgstr "Gå tilbake"
 
-#: classes/feeds.php:113
-#: classes/pref/filters.php:293
-#: classes/pref/filters.php:341
-#: classes/pref/filters.php:748
-#: classes/pref/filters.php:775
+#: classes/feeds.php:114
+#: classes/pref/filters.php:276
+#: classes/pref/filters.php:324
+#: classes/pref/filters.php:731
+#: classes/pref/filters.php:758
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: classes/feeds.php:118
-#: classes/feeds.php:123
+#: classes/feeds.php:119
+#: classes/feeds.php:124
 #: plugins/mailto/init.php:25
 #: plugins/mail/init.php:26
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marker artikkel som favoritt"
 
-#: classes/feeds.php:127
+#: classes/feeds.php:128
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: classes/feeds.php:200
-#: classes/feeds.php:843
+#: classes/feeds.php:201
+#: classes/feeds.php:841
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/feeds.php:257
+#: classes/feeds.php:258
 #, fuzzy
 msgid "Never"
 msgstr "Slett aldri"
 
-#: classes/feeds.php:374
+#: classes/feeds.php:373
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "Importer"
 
-#: classes/feeds.php:433
+#: classes/feeds.php:432
 #: classes/feeds.php:527
 #, fuzzy
 msgid "mark feed as read"
@@ -1370,124 +1363,124 @@ msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
 #: classes/feeds.php:771
-#: classes/feeds.php:938
+#: classes/feeds.php:936
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
 #: classes/feeds.php:781
-#: classes/feeds.php:948
+#: classes/feeds.php:946
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: classes/feeds.php:928
+#: classes/feeds.php:926
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: classes/feeds.php:985
-#: classes/feeds.php:993
+#: classes/feeds.php:983
+#: classes/feeds.php:991
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/feeds.php:999
+#: classes/feeds.php:997
 #: classes/pref/feeds.php:589
 #: classes/pref/feeds.php:800
-#: classes/pref/feeds.php:1779
+#: classes/pref/feeds.php:1775
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
-#: classes/feeds.php:1007
+#: classes/feeds.php:1005
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/feeds.php:1019
+#: classes/feeds.php:1017
 #: classes/pref/users.php:133
 #: classes/pref/feeds.php:619
 #: classes/pref/feeds.php:836
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: classes/feeds.php:1023
+#: classes/feeds.php:1021
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:625
 #: classes/pref/feeds.php:840
-#: classes/pref/feeds.php:1793
+#: classes/pref/feeds.php:1789
 msgid "Login"
 msgstr "Logg inn"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1024
 #: classes/pref/prefs.php:260
 #: classes/pref/feeds.php:638
 #: classes/pref/feeds.php:846
-#: classes/pref/feeds.php:1796
+#: classes/pref/feeds.php:1792
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 
-#: classes/feeds.php:1036
+#: classes/feeds.php:1034
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1097
-#: classes/pref/feeds.php:1814
+#: classes/feeds.php:1039
+#: classes/feeds.php:1093
+#: classes/pref/feeds.php:1810
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: classes/feeds.php:1044
+#: classes/feeds.php:1042
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: classes/feeds.php:1067
-#: classes/feeds.php:1158
+#: classes/feeds.php:1065
+#: classes/feeds.php:1154
 #: classes/pref/users.php:324
-#: classes/pref/filters.php:644
+#: classes/pref/filters.php:627
 #: classes/pref/feeds.php:1292
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Søk"
 
-#: classes/feeds.php:1071
+#: classes/feeds.php:1069
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/feeds.php:1072
+#: classes/feeds.php:1070
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/feeds.php:1075
+#: classes/feeds.php:1073
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/feeds.php:1098
+#: classes/feeds.php:1094
 #: classes/pref/users.php:350
 #: classes/pref/labels.php:284
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:670
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:653
 #: classes/pref/feeds.php:743
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Fjern"
 
-#: classes/feeds.php:1109
+#: classes/feeds.php:1105
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1117
+#: classes/feeds.php:1113
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: classes/feeds.php:1133
+#: classes/feeds.php:1129
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: classes/feeds.php:1154
+#: classes/feeds.php:1150
 #, fuzzy
 msgid "Search syntax"
 msgstr "Søk etter merkelapp"
@@ -1663,15 +1656,15 @@ msgstr "[tt-rss] Varsel om endring av passord"
 
 #: classes/pref/users.php:334
 #: classes/pref/labels.php:272
-#: classes/pref/filters.php:281
-#: classes/pref/filters.php:329
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:736
-#: classes/pref/filters.php:763
-#: classes/pref/prefs.php:995
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:312
+#: classes/pref/filters.php:631
+#: classes/pref/filters.php:719
+#: classes/pref/filters.php:746
+#: classes/pref/prefs.php:996
 #: classes/pref/feeds.php:1296
 #: classes/pref/feeds.php:1553
-#: classes/pref/feeds.php:1619
+#: classes/pref/feeds.php:1617
 #: plugins/instances/init.php:284
 #, fuzzy
 msgid "Select"
@@ -1687,7 +1680,7 @@ msgid "Details"
 msgstr "Daglig"
 
 #: classes/pref/users.php:348
-#: classes/pref/filters.php:663
+#: classes/pref/filters.php:646
 #: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "Rediger"
@@ -1714,8 +1707,8 @@ msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
 #: classes/pref/labels.php:22
-#: classes/pref/filters.php:270
-#: classes/pref/filters.php:727
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:710
 msgid "Caption"
 msgstr "Overskrift"
 
@@ -1743,151 +1736,151 @@ msgstr "Laget merkelappen <b>%s</b>"
 msgid "Clear colors"
 msgstr "Fjern farger"
 
-#: classes/pref/filters.php:94
+#: classes/pref/filters.php:93
 #, fuzzy
 msgid "Articles matching this filter:"
 msgstr "Ingen filtre ble funnet."
 
-#: classes/pref/filters.php:135
+#: classes/pref/filters.php:131
 #, fuzzy
 msgid "No recent articles matching this filter have been found."
 msgstr "Ingen filtre ble funnet."
 
-#: classes/pref/filters.php:139
+#: classes/pref/filters.php:135
 msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
 msgstr ""
 
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:846
+#: classes/pref/filters.php:259
+#: classes/pref/filters.php:714
+#: classes/pref/filters.php:829
 msgid "Match"
 msgstr "Match"
 
-#: classes/pref/filters.php:290
-#: classes/pref/filters.php:338
-#: classes/pref/filters.php:745
-#: classes/pref/filters.php:772
+#: classes/pref/filters.php:273
+#: classes/pref/filters.php:321
+#: classes/pref/filters.php:728
+#: classes/pref/filters.php:755
 msgid "Add"
 msgstr "Legg til"
 
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:307
+#: classes/pref/filters.php:741
 #, fuzzy
 msgid "Apply actions"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/filters.php:374
-#: classes/pref/filters.php:787
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:770
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:790
+#: classes/pref/filters.php:366
+#: classes/pref/filters.php:773
 #, fuzzy
 msgid "Match any rule"
 msgstr "Match på:"
 
-#: classes/pref/filters.php:392
-#: classes/pref/filters.php:793
+#: classes/pref/filters.php:375
+#: classes/pref/filters.php:776
 #, fuzzy
 msgid "Inverse matching"
 msgstr "Motsatt markering"
 
-#: classes/pref/filters.php:404
-#: classes/pref/filters.php:800
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:783
 msgid "Test"
 msgstr "Test"
 
-#: classes/pref/filters.php:437
+#: classes/pref/filters.php:420
 #, fuzzy
 msgid "(inverse)"
 msgstr "(Motsatt)"
 
-#: classes/pref/filters.php:436
+#: classes/pref/filters.php:419
 #, php-format
 msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/filters.php:660
+#: classes/pref/filters.php:643
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:649
 #: classes/pref/feeds.php:1312
 #: classes/pref/feeds.php:1326
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: classes/pref/filters.php:674
+#: classes/pref/filters.php:657
 #: classes/pref/feeds.php:1348
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: classes/pref/filters.php:803
+#: classes/pref/filters.php:786
 msgid "Create"
 msgstr "Lag"
 
-#: classes/pref/filters.php:858
+#: classes/pref/filters.php:841
 msgid "Inverse regular expression matching"
 msgstr ""
 
-#: classes/pref/filters.php:860
+#: classes/pref/filters.php:843
 msgid "on field"
 msgstr "På felt:"
 
-#: classes/pref/filters.php:866
+#: classes/pref/filters.php:849
 #: js/PrefFilterTree.js:53
 msgid "in"
 msgstr "i"
 
-#: classes/pref/filters.php:879
+#: classes/pref/filters.php:862
 #, fuzzy
 msgid "Wiki: Filters"
 msgstr "Filtre"
 
-#: classes/pref/filters.php:884
+#: classes/pref/filters.php:867
 #, fuzzy
 msgid "Save rule"
 msgstr "Lagre"
 
-#: classes/pref/filters.php:884
+#: classes/pref/filters.php:867
 #: js/functions.js:1015
 #, fuzzy
 msgid "Add rule"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/filters.php:907
+#: classes/pref/filters.php:890
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: classes/pref/filters.php:933
+#: classes/pref/filters.php:916
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: classes/pref/filters.php:951
+#: classes/pref/filters.php:934
 #, fuzzy
 msgid "Save action"
 msgstr "Panelhandlinger"
 
-#: classes/pref/filters.php:951
+#: classes/pref/filters.php:934
 #: js/functions.js:1041
 #, fuzzy
 msgid "Add action"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:957
 msgid "[No caption]"
 msgstr "Ingen bildetekst"
 
-#: classes/pref/filters.php:976
+#: classes/pref/filters.php:959
 #, fuzzy, php-format
 msgid "%s (%d rule)"
 msgid_plural "%s (%d rules)"
 msgstr[0] "Legger til kategori for nyhetsstrømmer"
 msgstr[1] "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/filters.php:991
+#: classes/pref/filters.php:974
 #, fuzzy, php-format
 msgid "%s (+%d action)"
 msgid_plural "%s (+%d actions)"
@@ -2350,39 +2343,39 @@ msgstr ""
 msgid "Enable selected plugins"
 msgstr "Bruk nyhetsstrømsikoner"
 
-#: classes/pref/prefs.php:924
+#: classes/pref/prefs.php:925
 #, fuzzy
 msgid "Incorrect one time password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/prefs.php:927
-#: classes/pref/prefs.php:944
+#: classes/pref/prefs.php:928
+#: classes/pref/prefs.php:945
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/prefs.php:969
+#: classes/pref/prefs.php:970
 #, php-format
 msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/pref/prefs.php:1009
+#: classes/pref/prefs.php:1010
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
-#: classes/pref/prefs.php:1032
-#: classes/pref/prefs.php:1060
+#: classes/pref/prefs.php:1033
+#: classes/pref/prefs.php:1061
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: classes/pref/prefs.php:1094
+#: classes/pref/prefs.php:1095
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/prefs.php:1096
+#: classes/pref/prefs.php:1097
 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
@@ -2609,27 +2602,27 @@ msgstr ""
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: classes/pref/feeds.php:1585
-#: classes/pref/feeds.php:1651
+#: classes/pref/feeds.php:1583
+#: classes/pref/feeds.php:1647
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1671
+#: classes/pref/feeds.php:1601
+#: classes/pref/feeds.php:1667
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1776
+#: classes/pref/feeds.php:1772
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1785
+#: classes/pref/feeds.php:1781
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1807
+#: classes/pref/feeds.php:1803
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
@@ -2865,6 +2858,14 @@ msgstr ""
 msgid "Import my Starred items"
 msgstr ""
 
+#: plugins/af_comics/init.php:39
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:41
+msgid "The following comics are currently supported:"
+msgstr ""
+
 #: plugins/vf_shared/init.php:16
 #: plugins/vf_shared/init.php:54
 #, fuzzy
@@ -3586,155 +3587,155 @@ msgstr "Endrer poengsummen for artiklene..."
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: js/viewfeed.js:109
+#: js/viewfeed.js:113
 #, fuzzy
 msgid "Cancel search"
 msgstr "Avbryt"
 
-#: js/viewfeed.js:472
+#: js/viewfeed.js:476
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
-#: js/viewfeed.js:476
+#: js/viewfeed.js:480
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
-#: js/viewfeed.js:530
+#: js/viewfeed.js:534
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
-#: js/viewfeed.js:534
+#: js/viewfeed.js:538
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
-#: js/viewfeed.js:686
+#: js/viewfeed.js:690
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "Ingen artikkel er valgt."
 msgstr[1] "Ingen artikkel er valgt."
 
-#: js/viewfeed.js:758
-#: js/viewfeed.js:786
-#: js/viewfeed.js:813
-#: js/viewfeed.js:878
-#: js/viewfeed.js:912
-#: js/viewfeed.js:1034
-#: js/viewfeed.js:1077
-#: js/viewfeed.js:1130
-#: js/viewfeed.js:2255
+#: js/viewfeed.js:762
+#: js/viewfeed.js:790
+#: js/viewfeed.js:817
+#: js/viewfeed.js:882
+#: js/viewfeed.js:916
+#: js/viewfeed.js:1038
+#: js/viewfeed.js:1081
+#: js/viewfeed.js:1134
+#: js/viewfeed.js:2259
 #: plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: js/viewfeed.js:1042
+#: js/viewfeed.js:1046
 #, fuzzy
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "Marker %d valgte artikler i %s som leste?"
 msgstr[1] "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1044
+#: js/viewfeed.js:1048
 #, fuzzy
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Fjerne merkede artikler fra merkelappen?"
 msgstr[1] "Fjerne merkede artikler fra merkelappen?"
 
-#: js/viewfeed.js:1086
+#: js/viewfeed.js:1090
 #, fuzzy
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "Marker %d valgte artikler i %s som leste?"
 msgstr[1] "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1089
+#: js/viewfeed.js:1093
 #, fuzzy
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Favorittartikler"
 msgstr[1] "Favorittartikler"
 
-#: js/viewfeed.js:1091
+#: js/viewfeed.js:1095
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1136
+#: js/viewfeed.js:1140
 #, fuzzy
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "Marker %d valgte artikler i %s som leste?"
 msgstr[1] "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1160
+#: js/viewfeed.js:1164
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
-#: js/viewfeed.js:1166
+#: js/viewfeed.js:1170
 msgid "Saving article tags..."
 msgstr "Lagrer artikkelens kategorier..."
 
-#: js/viewfeed.js:1405
+#: js/viewfeed.js:1409
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/viewfeed.js:1440
+#: js/viewfeed.js:1444
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
-#: js/viewfeed.js:1442
+#: js/viewfeed.js:1446
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "Marker %d artikkel/artikler som leste?"
 msgstr[1] "Marker %d artikkel/artikler som leste?"
 
-#: js/viewfeed.js:1950
+#: js/viewfeed.js:1954
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1956
+#: js/viewfeed.js:1960
 #, fuzzy
 msgid "Display article URL"
 msgstr "Vis stikkord"
 
-#: js/viewfeed.js:2056
+#: js/viewfeed.js:2060
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
-#: js/viewfeed.js:2061
+#: js/viewfeed.js:2065
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:2148
+#: js/viewfeed.js:2152
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Velg artikkelen under musepekeren"
 
-#: js/viewfeed.js:2157
+#: js/viewfeed.js:2161
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marker som lest"
 
-#: js/viewfeed.js:2169
+#: js/viewfeed.js:2173
 msgid "Mark feed as read"
 msgstr "Marker nyhetsstrøm som lest"
 
-#: js/viewfeed.js:2224
+#: js/viewfeed.js:2228
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:2266
+#: js/viewfeed.js:2270
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:2299
+#: js/viewfeed.js:2303
 #, fuzzy
 msgid "Article URL:"
 msgstr "Alle artikler"
@@ -3856,6 +3857,9 @@ msgstr "Prøver å endre adressen..."
 msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Select:"
+#~ msgstr "Velg:"
+
 #~ msgid "mark as read"
 #~ msgstr "marker som lest"