rebase translations

author: Andrew Dolgov <[email protected]> 2018-12-01 12:59:18 +0300
committer: Andrew Dolgov <[email protected]> 2018-12-01 12:59:18 +0300
commit: 78780c9c08cde4b7e7ee44efa29fa5c19a918040 (patch)
tree: 1198c44f4521fe1e8718e2d6a4e1a1029c56c3e5 /locale/nb_NO
parent: 45a4b416ba438f19fabe6335de635d8eaf50aff6 (diff)
2 files changed, 1495 insertions, 1492 deletions
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 942eaa705..e4df633d6 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 1c7b8a7e2..006cfe014 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\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"
@@ -94,8 +94,8 @@ msgid "Weekly"
 msgstr "Ukentlig"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Bruker"
 
@@ -172,33 +172,33 @@ msgstr "Brukeren ble  ikke funnet"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
@@ -216,13 +216,13 @@ msgid "All Articles"
 msgstr "Alle artikler"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritter"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publisert"
@@ -263,11 +263,11 @@ msgid "Title"
 msgstr "Tittel"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marker som lest"
 
@@ -305,7 +305,7 @@ msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
@@ -314,58 +314,46 @@ msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Sett poeng på nytt for nyhetskanalene"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Lag merkelapp..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Lag filter..."
-
-#: index.php:257
+#: index.php:254
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Logg ut"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -380,8 +368,8 @@ msgstr "Forlat innstillinger"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
@@ -391,8 +379,8 @@ msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Merkelapper"
 
@@ -404,80 +392,80 @@ msgstr "Brukere"
 msgid "System"
 msgstr ""
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Lag ny konto"
 
-#: register.php:192
+#: register.php:191
 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:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "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:222
 msgid "Desired login:"
 msgstr "Ønsket brukernavn:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Sjekk tilgjengeligheten"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-post:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Hvor mye er to pluss to:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Send registreringen"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Beklager, brukernavn er allerede tatt."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrering feilet"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Kontoen ble opprettet med suksess."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: update.php:66
+#: update.php:67
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
@@ -491,10 +479,10 @@ msgstr "Alle Nyhetsstrømmer"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -509,319 +497,319 @@ msgstr[1] "Favorittartikler"
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 #, fuzzy
 msgid "Open next feed"
 msgstr "Generert nyhetsstrøm"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 #, fuzzy
 msgid "Open next article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 #, fuzzy
 msgid "Open previous article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 #, fuzzy
 msgid "Article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Sett som favoritt"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Sett som publisert"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Sett som ulest"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Endre stikkord"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 #, fuzzy
 msgid "Open in new window"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 #, fuzzy
 msgid "Scroll down"
 msgstr "Alt ferdig."
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Velg artikkelen under musepekeren"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 #, fuzzy
 msgid "Email article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 #, fuzzy
 msgid "Article selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 #, fuzzy
 msgid "Select all articles"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 #, fuzzy
 msgid "Select unread"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 #, fuzzy
 msgid "Select published"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 #, fuzzy
 msgid "Invert selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions.php:1222
+#: include/functions.php:1167
 #, fuzzy
-msgid "Toggle combined mode"
+msgid "Toggle auto expand in combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1223
+#: include/functions.php:1168
 #, fuzzy
-msgid "Toggle auto expand in combined mode"
+msgid "Toggle combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1224
+#: include/functions.php:1169
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ingen OPML-fil til å lastes opp."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Brukernavn:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Passord:"
 
@@ -836,9 +824,9 @@ msgid "Profile:"
 msgstr "Fil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
@@ -856,134 +844,62 @@ msgid "Remember me"
 msgstr ""
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Logg inn"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
 #, fuzzy
-msgid "Session failed to validate (password changed)"
+msgid "Session failed to validate (UA changed)."
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/sessions.php:69
+#: include/sessions.php:67
 #, fuzzy
-msgid "Session failed to validate (user not found)"
+msgid "Session failed to validate (password changed)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: classes/article.php:26
+#: include/sessions.php:74
 #, fuzzy
-msgid "Article not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Denne artikkelens stikkord (separert med kommaer):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Lagre"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "Ukjent type"
-
-#: classes/article.php:525
-#, fuzzy
-msgid "Attachments"
-msgstr "Vedlegg:"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentarer"
-msgstr[1] "Kommentarer"
+msgid "Session failed to validate (user not found)"
+msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "Kommentarer"
+#: classes/backend.php:31
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
 
-#: classes/article.php:689
-msgid " - "
-msgstr "-"
+#: classes/backend.php:36
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
 
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Rediger stikkordene for denne artikkelen"
+#: classes/backend.php:59
+msgid "Shift"
+msgstr ""
 
-#: classes/article.php:763
-#: classes/feeds.php:602
-#, fuzzy
-msgid "Originally from:"
-msgstr "Vis opprinnelig artikkelinnhold"
+#: classes/backend.php:62
+msgid "Ctrl"
+msgstr ""
 
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-#, fuzzy
-msgid "Feed URL"
-msgstr "Nyhetsstrøm"
+#: classes/backend.php:97
+msgid "Help topic not found."
+msgstr "Hjelp-emne kunne ikke bli funnet"
 
-#: classes/article.php:811
 #: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
 #: classes/dlg.php:33
 #: classes/dlg.php:56
 #: classes/dlg.php:89
 #: classes/dlg.php:154
 #: classes/dlg.php:181
 #: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
+#: classes/article.php:810
 #: plugins/af_psql_trgm/init.php:109
 #: plugins/import_export/init.php:446
 #: plugins/import_export/init.php:490
@@ -991,272 +907,358 @@ msgstr "Nyhetsstrøm"
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: classes/article.php:913
+#: classes/feeds.php:53
 #, fuzzy
-msgid "(edit note)"
-msgstr "Rediger notat"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML-verktøy"
+msgid "View as RSS feed"
+msgstr "Se nyhetsstrømmene"
 
-#: classes/opml.php:40
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
 #, fuzzy
-msgid "Importing OPML..."
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Returner til innstillinger"
+msgid "View as RSS"
+msgstr "Se stikkord"
 
-#: classes/opml.php:301
+#: classes/feeds.php:62
 #, fuzzy, php-format
-msgid "Adding feed: %s"
-msgstr "Legger til nyhetsstrøm..."
+msgid "Last updated: %s"
+msgstr "Siste oppdatering:"
 
-#: classes/opml.php:312
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "Lag filter"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Velg:"
 
-#: classes/opml.php:326
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Tildel stikkord"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Alle"
 
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Motsatt"
 
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ingen"
 
-#: classes/opml.php:377
-#, fuzzy
-msgid "Adding filter..."
-msgstr "Legger til nyhetsstrøm..."
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Marker utvalg:"
 
-#: classes/opml.php:512
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "Plasser i kategori..."
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Utvalg:"
 
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
+#: classes/feeds.php:116
+#, fuzzy
+msgid "Set score"
+msgstr "Poeng"
 
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
+#: classes/feeds.php:119
 #, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
+msgid "Archive"
+msgstr "Artikkeldato"
 
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
+#: classes/feeds.php:121
+#, fuzzy
+msgid "Move back"
+msgstr "Gå tilbake"
 
-#: classes/opml.php:585
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
 #, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
+msgid "Delete"
+msgstr "Standard"
 
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Feil under behandling av dokumentet"
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+#, fuzzy
+msgid "Forward by email"
+msgstr "Marker artikkel som favoritt"
 
-#: classes/backend.php:31
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Nyhetsstrøm:"
 
-#: classes/backend.php:36
-msgid "Keyboard Shortcuts"
-msgstr "Tastatursnarveier"
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/backend.php:59
-msgid "Shift"
-msgstr ""
+#: classes/feeds.php:255
+#, fuzzy
+msgid "Never"
+msgstr "Slett aldri"
 
-#: classes/backend.php:62
-msgid "Ctrl"
-msgstr ""
+#: classes/feeds.php:341
+#, fuzzy, php-format
+msgid "Imported at %s"
+msgstr "Importer"
 
-#: classes/backend.php:97
-msgid "Help topic not found."
-msgstr "Hjelp-emne kunne ikke bli funnet"
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Marker nyhetsstrøm som lest"
 
-#: classes/dlg.php:17
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
-msgstr ""
+#: classes/feeds.php:540
+#, fuzzy
+msgid "Collapse article"
+msgstr "Fjern artikler"
 
-#: classes/dlg.php:44
+#: classes/feeds.php:592
+#: classes/article.php:762
 #, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "Lenke til nyhetsstrøm for publiserte artikler"
+msgid "Originally from:"
+msgstr "Vis opprinnelig artikkelinnhold"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
 #, fuzzy
-msgid "Generate new URL"
-msgstr "Generert nyhetsstrøm"
+msgid "Feed URL"
+msgstr "Nyhetsstrøm"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr "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/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Rediger stikkordene for denne artikkelen"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Siste oppdatering:"
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentarer"
+msgstr[1] "Kommentarer"
 
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "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/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "Kommentarer"
 
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Innstillinger"
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Ingen markerte artikler som kan vises"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
+#: classes/feeds.php:696
 #, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
+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 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-menyen ovenfor) eller bruke et filter."
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Tittel:"
+#: classes/feeds.php:698
+msgid "No articles found to display."
+msgstr "Ingen artikler funnet som kan vises"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "Nettadresse:"
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Oppdateringsfeil"
 
-#: classes/handler/public.php:399
-#, fuzzy
-msgid "Content:"
-msgstr "Innhold"
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: classes/handler/public.php:401
-#, fuzzy
-msgid "Labels:"
-msgstr "Merkelapper"
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Ingen valgt nyhetsstrøm"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+#, fuzzy
+msgid "Feed or site URL"
+msgstr "Nyhetsstrøm"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr ""
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Plasser i kategori..."
 
-#: classes/handler/public.php:444
+#: classes/feeds.php:980
 #, fuzzy
-msgid "Not logged in"
-msgstr "Sist innlogget"
+msgid "Available feeds"
+msgstr "Alle Nyhetsstrømmer"
 
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Feil brukernavn og/eller passord"
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autentifisering"
 
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Abonnerer allerede på <b>%s</b>"
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Logg inn"
 
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Abonnerer på <b>%s</b>"
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
 
-#: classes/handler/public.php:563
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Abonnerer allerede på <b>%s</b>"
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/handler/public.php:566
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Ingen nyhetsstrømmer ble funnet."
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Abonner"
 
-#: classes/handler/public.php:569
+#: classes/feeds.php:1017
 #, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
+msgid "More feeds"
+msgstr "Flere nyhetsstrømmer"
 
-#: classes/handler/public.php:573
-#, 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/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: classes/handler/public.php:591
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Søk"
+
+#: classes/feeds.php:1046
 #, fuzzy
-msgid "Subscribe to selected feed"
-msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+msgid "Popular feeds"
+msgstr "Vis nyhetsstrømmer"
 
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Rediger abonnementsalternativer"
+#: classes/feeds.php:1047
+#, fuzzy
+msgid "Feed archive"
+msgstr "Nyhetsstrømshandlinger"
 
-#: classes/handler/public.php:656
+#: classes/feeds.php:1050
 #, fuzzy
-msgid "Password recovery"
-msgstr "Passord:"
+msgid "limit:"
+msgstr "Antall:"
 
-#: classes/handler/public.php:701
-msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Fjern"
+
+#: classes/feeds.php:1084
+msgid "Look for"
 msgstr ""
 
-#: classes/handler/public.php:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Nullstill passordet"
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
 
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
 msgstr ""
 
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
+#: classes/feeds.php:1106
 #, fuzzy
-msgid "Go back"
-msgstr "Gå tilbake"
+msgid "Search syntax"
+msgstr "Søk etter merkelapp"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: classes/feeds.php:1571
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Varsel om endring av passord"
+msgid "Archived articles"
+msgstr "Lagrede artikler"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:1573
+msgid "Recently read"
 msgstr ""
 
-#: classes/handler/public.php:824
-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:850
-msgid "Database Updater"
-msgstr "Databaseoppdaterer"
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Snarveier"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Utfør oppdateringene"
+#: classes/feeds.php:1951
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Søkeresultat"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1279,206 +1281,205 @@ msgstr "Forgrunn"
 msgid "Background:"
 msgstr "bakgrunn"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Lagre"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Alle"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ingen"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Fjern"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Fjern farger"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Filtre"
+msgid "Preview article"
+msgstr "Filtrer artikkel"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autentifisering"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+#, fuzzy
+msgid "(inverse)"
+msgstr "(Motsatt)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Tilgangsnivå:"
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Alternativer:"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Match"
 
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Brukerdetaljer"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Legg til"
 
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrert"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+#, fuzzy
+msgid "Apply actions"
+msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Sist innlogget"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Tillatt"
 
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Antall nyhetsstrømmer som abonneres på"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Match any rule"
+msgstr "Match på:"
 
-#: classes/pref/users.php:146
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
 #, fuzzy
-msgid "Stored articles"
-msgstr "Favorittartikler"
+msgid "Inverse matching"
+msgstr "Motsatt markering"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Nyhetsstrømmer som abonneres på"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
 
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Brukeren ble  ikke funnet"
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr ""
 
-#: classes/pref/users.php:246
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
+#: classes/pref/filters.php:807
+#: classes/pref/users.php:367
+msgid "Edit"
+msgstr "Rediger"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Kunne ikke lage brukeren <b>%s</b>"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+#, fuzzy
+msgid "Reset sort order"
+msgstr "Nullstill passordet"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Brukeren <b>%s</b> finnes allerede."
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Lag"
 
-#: classes/pref/users.php:285
-#, fuzzy, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
 msgstr ""
-"Byttet passord forbruker <b>%s</b>\n"
-"\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/users.php:287
-#, fuzzy, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
 msgstr ""
-"Byttet passord forbruker <b>%s</b>\n"
-"\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Varsel om endring av passord"
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "På felt:"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Søk"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+msgid "in"
+msgstr "i"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Lag bruker"
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Filtre"
 
-#: classes/pref/users.php:368
-#: classes/pref/filters.php:807
-msgid "Edit"
-msgstr "Rediger"
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "Lagre"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Logg inn"
+#: classes/pref/filters.php:1019
+#: js/functions.js:764
+#, fuzzy
+msgid "Add rule"
+msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Tilgangsnivå"
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "Utfør handlingen"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Siste innlogging"
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Trykk for å endre"
+#: classes/pref/filters.php:1112
+#, fuzzy
+msgid "Save action"
+msgstr "Panelhandlinger"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Ingen brukere er valgt"
+#: classes/pref/filters.php:1112
+#: js/functions.js:786
+#, fuzzy
+msgid "Add action"
+msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Ingen matchende brukere ble funnet"
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "Ingen bildetekst"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match på:"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Nyhetsstrømshandlinger"
+msgstr[1] "Nyhetsstrømshandlinger"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1525,419 +1526,341 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Rediger nyhetsstrømmen"
 msgstr[1] "Rediger nyhetsstrømmen"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Generelt"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Plasser i kategori..."
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "Nettadresse:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Side:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Språk:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Oppdater"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-#, fuzzy
-msgid "Password"
-msgstr "Passord:"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Denne nyhetsstrømmen krever autentifisering"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Alternativer:"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Ikke vis bilder i artiklene"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Lag filter..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Nullstill passordet"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 #, fuzzy
 msgid "Add category"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 #, fuzzy
 msgid "Remove selected"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
 #: classes/pref/feeds.php:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-#, fuzzy
-msgid "View as RSS"
-msgstr "Se stikkord"
-
-#: classes/pref/feeds.php:1328
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 #, fuzzy
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonner"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Filtrer artikkel"
+msgid "Edit user"
+msgstr "Filtre"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Motsatt)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Tilgangsnivå:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Brukerdetaljer"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Match"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrert"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Legg til"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Sist innlogget"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-#, fuzzy
-msgid "Delete"
-msgstr "Standard"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Antall nyhetsstrømmer som abonneres på"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "Apply actions"
-msgstr "Nyhetsstrømshandlinger"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Tillatt"
+msgid "Stored articles"
+msgstr "Favorittartikler"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-#, fuzzy
-msgid "Match any rule"
-msgstr "Match på:"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Nyhetsstrømmer som abonneres på"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Motsatt markering"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Brukeren ble  ikke funnet"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
+#: classes/pref/users.php:246
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr ""
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Kunne ikke lage brukeren <b>%s</b>"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Lag"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Brukeren <b>%s</b> finnes allerede."
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
+#: classes/pref/users.php:285
+#, fuzzy, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
+"Byttet passord forbruker <b>%s</b>\n"
+"\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/filters.php:993
-msgid "Inverse regular expression matching"
+#: classes/pref/users.php:287
+#, fuzzy, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
+"Byttet passord forbruker <b>%s</b>\n"
+"\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/filters.php:995
-msgid "on field"
-msgstr "På felt:"
-
-#: classes/pref/filters.php:1001
-#: js/PrefFilterTree.js:43
-msgid "in"
-msgstr "i"
-
-#: classes/pref/filters.php:1014
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Filtre"
-
-#: classes/pref/filters.php:1019
-#, fuzzy
-msgid "Save rule"
-msgstr "Lagre"
-
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-#, fuzzy
-msgid "Add rule"
-msgstr "Legger til kategori for nyhetsstrømmer"
-
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Utfør handlingen"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Varsel om endring av passord"
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Lag bruker"
 
-#: classes/pref/filters.php:1112
-#, fuzzy
-msgid "Save action"
-msgstr "Panelhandlinger"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Nullstill passordet"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-#, fuzzy
-msgid "Add action"
-msgstr "Nyhetsstrømshandlinger"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Tilgangsnivå"
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "Ingen bildetekst"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Siste innlogging"
 
-#: classes/pref/filters.php:1141
-#, 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/users.php:426
+msgid "Click to edit"
+msgstr "Trykk for å endre"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match på:"
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Ingen brukere er valgt"
 
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Nyhetsstrømshandlinger"
-msgstr[1] "Nyhetsstrømshandlinger"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Ingen matchende brukere ble funnet"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2125,7 +2048,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
@@ -2391,275 +2314,318 @@ msgstr "Fjerne valgte filtre?"
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/feeds.php:53
-#, fuzzy
-msgid "View as RSS feed"
-msgstr "Se nyhetsstrømmene"
+#: classes/dlg.php:17
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+msgstr ""
 
-#: classes/feeds.php:62
-#, fuzzy, php-format
-msgid "Last updated: %s"
-msgstr "Siste oppdatering:"
+#: classes/dlg.php:44
+#, fuzzy
+msgid "Your Public OPML URL is:"
+msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
 #, fuzzy
-msgid "Select..."
-msgstr "Velg:"
+msgid "Generate new URL"
+msgstr "Generert nyhetsstrøm"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Motsatt"
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "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/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Marker utvalg:"
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Siste oppdatering:"
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Utvalg:"
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "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/feeds.php:116
-#, fuzzy
-msgid "Set score"
-msgstr "Poeng"
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
 
-#: classes/feeds.php:119
-#, fuzzy
-msgid "Archive"
-msgstr "Artikkeldato"
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
 
-#: classes/feeds.php:121
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Move back"
-msgstr "Gå tilbake"
+msgid "Open Preferences"
+msgstr "Innstillinger"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML-verktøy"
+
+#: classes/opml.php:40
 #, fuzzy
-msgid "Forward by email"
-msgstr "Marker artikkel som favoritt"
+msgid "Importing OPML..."
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Nyhetsstrøm:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Returner til innstillinger"
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
+#: classes/opml.php:301
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Legger til nyhetsstrøm..."
 
-#: classes/feeds.php:255
-#, fuzzy
-msgid "Never"
-msgstr "Slett aldri"
+#: classes/opml.php:312
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Lag filter"
 
-#: classes/feeds.php:342
+#: classes/opml.php:326
 #, fuzzy, php-format
-msgid "Imported at %s"
-msgstr "Importer"
+msgid "Adding label %s"
+msgstr "Tildel stikkord"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-#, fuzzy
-msgid "mark feed as read"
-msgstr "Marker nyhetsstrøm som lest"
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
 
-#: classes/feeds.php:542
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:377
 #, fuzzy
-msgid "Collapse article"
-msgstr "Fjern artikler"
+msgid "Adding filter..."
+msgstr "Legger til nyhetsstrøm..."
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Ingen uleste artikler funnet som kunne vises"
+#: classes/opml.php:512
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Plasser i kategori..."
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Ingen oppdaterte artikler funnet som kunne vises"
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Ingen markerte artikler som kan vises"
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: classes/feeds.php:713
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
+
+#: classes/opml.php:585
 #, fuzzy
-msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
-msgstr "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-menyen ovenfor) eller bruke et filter."
+msgid "Error: unable to find moved OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
-msgstr "Ingen artikler funnet som kan vises"
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Feil under behandling av dokumentet"
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Oppdateringsfeil"
+#: classes/article.php:26
+#, fuzzy
+msgid "Article not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Ingen valgt nyhetsstrøm"
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "Ingen stikkord"
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-#, fuzzy
-msgid "Feed or site URL"
-msgstr "Nyhetsstrøm"
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "Ukjent type"
 
-#: classes/feeds.php:997
+#: classes/article.php:524
 #, fuzzy
-msgid "Available feeds"
-msgstr "Alle Nyhetsstrømmer"
+msgid "Attachments"
+msgstr "Vedlegg:"
 
-#: classes/feeds.php:1034
-#, fuzzy
-msgid "More feeds"
-msgstr "Flere nyhetsstrømmer"
+#: classes/article.php:688
+msgid " - "
+msgstr "-"
 
-#: classes/feeds.php:1063
+#: classes/article.php:912
 #, fuzzy
-msgid "Popular feeds"
-msgstr "Vis nyhetsstrømmer"
+msgid "(edit note)"
+msgstr "Rediger notat"
 
-#: classes/feeds.php:1064
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
 #, fuzzy
-msgid "Feed archive"
-msgstr "Nyhetsstrømshandlinger"
+msgid "Share with Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/feeds.php:1067
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Tittel:"
+
+#: classes/handler/public.php:419
 #, fuzzy
-msgid "limit:"
-msgstr "Antall:"
+msgid "Content:"
+msgstr "Innhold"
 
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr ""
+#: classes/handler/public.php:421
+#, fuzzy
+msgid "Labels:"
+msgstr "Merkelapper"
 
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
+#: classes/handler/public.php:442
+msgid "Share"
 msgstr ""
 
-#: classes/feeds.php:1123
+#: classes/handler/public.php:464
 #, fuzzy
-msgid "Search syntax"
-msgstr "Søk etter merkelapp"
+msgid "Not logged in"
+msgstr "Sist innlogget"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Favorittartikler"
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Feil brukernavn og/eller passord"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publiserte artikler"
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Ferske artikler"
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/feeds.php:1585
-#, fuzzy
-msgid "Archived articles"
-msgstr "Lagrede artikler"
+#: classes/handler/public.php:587
+#, fuzzy, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr ""
+#: classes/handler/public.php:590
+#, fuzzy, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Snarveier"
+#: classes/handler/public.php:593
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
 
-#: classes/feeds.php:1965
+#: classes/handler/public.php:597
 #, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Søkeresultat"
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: classes/handler/public.php:615
+#, fuzzy
+msgid "Subscribe to selected feed"
+msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Rediger abonnementsalternativer"
+
+#: classes/handler/public.php:680
+#, fuzzy
+msgid "Password recovery"
+msgstr "Passord:"
+
+#: classes/handler/public.php:725
+msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
 #, fuzzy
-msgid "Configuration saved."
-msgstr "Konfigurasjonen er lagret."
+msgid "Go back"
+msgstr "Gå tilbake"
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
+#: classes/handler/public.php:799
 #, fuzzy
-msgid "Edit article note"
-msgstr "Endre Stikkord"
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Varsel om endring av passord"
 
-#: plugins/vf_shared/init.php:17
-#: plugins/vf_shared/init.php:73
-#, fuzzy
-msgid "Shared articles"
-msgstr "Favorittartikler"
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr ""
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Passord har blitt endret."
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Databaseoppdaterer"
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Gammelt passord er feil"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Utfør oppdateringene"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/af_readability/init.php:41
+#: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
-msgid "Inline content"
-msgstr "Rullevisning av artkkelens innhold"
+msgid "Enable proxy for all remote images."
+msgstr "Tillat ikoner i nyhetsstrømslisten"
 
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
+msgstr "Konfigurasjonen er lagret."
+
+#: plugins/vf_shared/init.php:17
+#: plugins/vf_shared/init.php:73
+#, fuzzy
+msgid "Shared articles"
+msgstr "Favorittartikler"
+
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Sjekk tilgjengeligheten"
+#: plugins/bookmarklets/init.php:26
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Returner til Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:118
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Inline article content"
-msgstr "Rullevisning av artkkelens innhold"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2673,11 +2639,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigurasjonen er lagret."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2717,26 +2693,91 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Tillat ikoner i nyhetsstrømslisten"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Rullevisning av artkkelens innhold"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Sjekk tilgjengeligheten"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Rullevisning av artkkelens innhold"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr ""
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Alle artikler"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
+
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "Marker artikkel som favoritt"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+#, fuzzy
+msgid "Close this dialog"
+msgstr "Lukk dette vinduet"
+
+#: plugins/nsfw/init.php:30
+#: plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
+msgstr ""
+
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
+msgstr ""
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
+#: plugins/nsfw/init.php:100
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Konfigurasjonen er lagret."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr ""
@@ -2807,6 +2848,38 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "Ingen OPML-fil til å lastes opp."
 
+#: plugins/share/init.php:41
+msgid "You can disable all articles shared by unique URLs here."
+msgstr ""
+
+#: plugins/share/init.php:44
+#, fuzzy
+msgid "Unshare all articles"
+msgstr "Uleste artikler"
+
+#: plugins/share/init.php:78
+#, fuzzy
+msgid "Share by URL"
+msgstr "Marker artikkel som favoritt"
+
+#: plugins/share/init.php:100
+msgid "You can share this article by the following unique URL:"
+msgstr ""
+
+#: plugins/share/init.php:122
+#, fuzzy
+msgid "Unshare article"
+msgstr "Fjern favorittmerkingen fra artiklen"
+
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Skjul nyhetskanalsslisten"
+
+#: plugins/close_button/init.php:25
+#, fuzzy
+msgid "Close article"
+msgstr "Fjern artikler"
+
 #: plugins/mail/init.php:29
 msgid "Mail addresses saved."
 msgstr ""
@@ -2819,19 +2892,6 @@ msgstr ""
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Alle artikler"
-
 #: plugins/mail/init.php:146
 #, fuzzy
 msgid "To:"
@@ -2847,570 +2907,621 @@ msgstr "Velg:"
 msgid "Send e-mail"
 msgstr "Skift e-post"
 
-#: plugins/close_button/init.php:25
-#, fuzzy
-msgid "Close article"
-msgstr "Fjern artikler"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr ""
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr ""
-
-#: plugins/bookmarklets/init.php:26
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Skjul nyhetskanalsslisten"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Tillat ikoner i nyhetsstrømslisten"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Mellomlagre bilder lokalt på serveren"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Marker artikkel som favoritt"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-#, fuzzy
-msgid "Close this dialog"
-msgstr "Lukk dette vinduet"
-
-#: plugins/share/init.php:41
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: plugins/share/init.php:44
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
 #, fuzzy
-msgid "Unshare all articles"
-msgstr "Uleste artikler"
+msgid "Edit article note"
+msgstr "Endre Stikkord"
 
-#: plugins/share/init.php:78
+#: plugins/auth_internal/init.php:67
 #, fuzzy
-msgid "Share by URL"
-msgstr "Marker artikkel som favoritt"
+msgid "Please enter your one time password:"
+msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: plugins/share/init.php:100
-msgid "You can share this article by the following unique URL:"
-msgstr ""
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Passord har blitt endret."
 
-#: plugins/share/init.php:122
-#, fuzzy
-msgid "Unshare article"
-msgstr "Fjern favorittmerkingen fra artiklen"
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Gammelt passord er feil"
 
-#: js/FeedTree.js:75
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 #, fuzzy
 msgid "Edit category"
 msgstr "Rediger kategorier"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 #, fuzzy
 msgid "Remove category"
 msgstr "Lag kategori"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 #, fuzzy
 msgid "Inverse"
 msgstr "(Motsatt)"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Søkeresultat"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Alle artikler"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "Trykk for å endre"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+#, fuzzy
+msgid "Upload complete."
+msgstr "Oppdaterte artikler"
+
+#: js/functions.js:508
+#, fuzzy
+msgid "Remove stored feed icon?"
+msgstr "Fjern lagrede data"
+
+#: js/functions.js:510
+#, fuzzy
+msgid "Removing feed icon..."
+msgstr "Fjerner nyhetsstrøm..."
+
+#: js/functions.js:515
+#, fuzzy
+msgid "Feed icon removed."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: js/functions.js:532
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Vennligst velg en nyhetsstrøm"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+#, fuzzy
+msgid "Uploading, please wait..."
+msgstr "laster, vennligst vent"
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Vennligst skriv inn merkelappstekst:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, fuzzy, perl-format
 msgid "Subscribed to %s"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Prøver å endre adressen..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 #, fuzzy
 msgid "Saving data..."
 msgstr "Lagrer Nyhetsstrøm"
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "Fjerner valgte filtre..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Vennligst skriv inn brukernavn:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Kan ikke legge til bruker: brukernavn mangler."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Legger til bruker.."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Brukeradministrering"
-
-#: js/prefs.js:131
-#, fuzzy
-msgid "Edit Filter"
-msgstr "Filtre"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Fjerne %s filteret?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Fjerner filter..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Fjerner merkede merkelapper..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Fjerner markerte brukere..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Fjerner valgte filtre..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Fjerner abonnementer på valgte nyhetsstrømmer..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Nullstiller passordet for utvalgte bruker..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 #, fuzzy
 msgid "Joining filters..."
 msgstr "Fjerner filter..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "laster, vennligst vent"
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: js/prefs.js:1468
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
+
+#: js/prefs.js:778
 #, fuzzy
-msgid "Subscribing to feeds..."
-msgstr "Abonnerer på nyhetsstrømmen..."
+msgid "Removing category..."
+msgstr "Lag kategori"
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Fjerne valgte kategorier?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Fjerner valgte kategorier..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Ingen kategorier er valgt."
+
+#: js/prefs.js:812
+#, fuzzy
+msgid "Category title:"
+msgstr "Kategoriredigerer"
+
+#: js/prefs.js:815
+#, fuzzy
+msgid "Creating category..."
+msgstr "Lag filter..."
+
+#: js/prefs.js:832
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Oppdateringsfeil"
+
+#: js/prefs.js:869
+#, fuzzy
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
+
+#: js/prefs.js:898
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "Sett merkelappsfargene til standard?"
+
+#: js/prefs.js:926
+#, fuzzy
+msgid "Settings Profiles"
+msgstr "Lag filter"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:936
+#, fuzzy
+msgid "Removing selected profiles..."
+msgstr "Fjerner valgte filtre..."
+
+#: js/prefs.js:948
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "Ingen artikkel er valgt."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "Fjerne valgte filtre?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+
+#: js/prefs.js:969
+#, fuzzy
+msgid "Creating profile..."
+msgstr "Lag filter"
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+#, fuzzy
+msgid "Clearing URLs..."
+msgstr "Rensker nyhetsstrøm..."
+
+#: js/prefs.js:1020
+#, fuzzy
+msgid "Generated URLs cleared."
+msgstr "Generert nyhetsstrøm"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Lag kategori"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Merkelappredigerer"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Endre poengene for artiklene i %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Endrer poengsummen for artiklene..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, fuzzy, perl-format
 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:927
+#: js/viewfeed.js:661
 #, fuzzy, perl-format
 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:964
+#: js/viewfeed.js:694
 #, fuzzy, perl-format
 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:967
+#: js/viewfeed.js:697
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Favorittartikler"
 msgstr[1] "Favorittartikler"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, fuzzy, perl-format
 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:1029
+#: js/viewfeed.js:753
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Lagrer artikkelens kategorier..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Ingen artikkel er valgt."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Ingen artikler funnet som kan markeres"
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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:1312
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 #, fuzzy
 msgid "Display article URL"
 msgstr "Vis stikkord"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Velg artikkelen under musepekeren"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marker som lest"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marker nyhetsstrøm som lest"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 #, fuzzy
 msgid "Article URL:"
 msgstr "Alle artikler"
 
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "Lagrer artikkelens kategorier..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Fjern artikler"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+#, fuzzy
+msgid "Forward article by email"
+msgstr "Marker artikkel som favoritt"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Trykk for å utvide artikkel"
+
 #: plugins/import_export/import_export.js:13
 #, fuzzy
 msgid "Export Data"
@@ -3433,294 +3544,186 @@ msgstr "Importer"
 msgid "Please choose the file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-#, fuzzy
-msgid "Forward article by email"
-msgstr "Marker artikkel som favoritt"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-#, fuzzy
-msgid "Your message has been sent."
-msgstr "Passord har blitt endret."
-
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:45
-msgid "Click to expand article"
-msgstr "Trykk for å utvide artikkel"
-
 #: plugins/share/share.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 #, fuzzy
 msgid "Trying to change URL..."
 msgstr "Prøver å endre e-posten..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 #, fuzzy
 msgid "Trying to unshare..."
 msgstr "Prøver å endre adressen..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
+#: plugins/mail/mail.js:32
 #, fuzzy
-msgid "Clearing URLs..."
-msgstr "Rensker nyhetsstrøm..."
+msgid "Your message has been sent."
+msgstr "Passord har blitt endret."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr ""
+#: plugins/note/note.js:15
+#, fuzzy
+msgid "Saving article note..."
+msgstr "Lagrer artikkelens kategorier..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/functions.js:494
-#, fuzzy
-msgid "Upload complete."
-msgstr "Oppdaterte artikler"
-
-#: js/functions.js:511
-#, fuzzy
-msgid "Remove stored feed icon?"
-msgstr "Fjern lagrede data"
-
-#: js/functions.js:516
-#, fuzzy
-msgid "Removing feed icon..."
-msgstr "Fjerner nyhetsstrøm..."
-
-#: js/functions.js:521
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: js/functions.js:537
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "Vennligst velg en nyhetsstrøm"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-#, fuzzy
-msgid "Uploading, please wait..."
-msgstr "laster, vennligst vent"
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Vennligst skriv inn merkelappstekst:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Kan ikke skape merkelapp, mangler overskrift."
-
-#: js/functions.js:797
+#: js/functions.js:764
 #, fuzzy
 msgid "Edit rule"
 msgstr "Filtre"
 
-#: js/functions.js:819
+#: js/functions.js:786
 #, fuzzy
 msgid "Edit action"
 msgstr "Nyhetsstrømshandlinger"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Ingen filtre ble funnet."
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Fjerner nyhetsstrøm..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Hjelp"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
-
-#: js/prefs.js:979
-#, fuzzy
-msgid "Removing category..."
-msgstr "Lag kategori"
-
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Fjerne valgte kategorier?"
-
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Fjerner valgte kategorier..."
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Ingen kategorier er valgt."
-
-#: js/prefs.js:1020
-#, fuzzy
-msgid "Category title:"
-msgstr "Kategoriredigerer"
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Vennligst skriv inn brukernavn:"
 
-#: js/prefs.js:1024
-#, fuzzy
-msgid "Creating category..."
-msgstr "Lag filter..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
-#: js/prefs.js:1047
-#, fuzzy
-msgid "Feeds without recent updates"
-msgstr "Oppdateringsfeil"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Legger til bruker.."
 
-#: js/prefs.js:1091
-#, fuzzy
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Brukeradministrering"
 
-#: js/prefs.js:1129
+#: js/prefs.js:104
 #, fuzzy
-msgid "Reset selected labels to default colors?"
-msgstr "Sett merkelappsfargene til standard?"
+msgid "Edit Filter"
+msgstr "Filtre"
 
-#: js/prefs.js:1161
+#: js/prefs.js:1175
 #, fuzzy
-msgid "Settings Profiles"
-msgstr "Lag filter"
+msgid "Subscribing to feeds..."
+msgstr "Abonnerer på nyhetsstrømmen..."
 
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1173
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "Fjerner valgte filtre..."
-
-#: js/prefs.js:1189
-#, fuzzy
-msgid "No profiles are selected."
-msgstr "Ingen artikkel er valgt."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-#, fuzzy
-msgid "Activate selected profile?"
-msgstr "Fjerne valgte filtre?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-#, fuzzy
-msgid "Please choose a profile to activate."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-
-#: js/prefs.js:1219
-#, fuzzy
-msgid "Creating profile..."
-msgstr "Lag filter"
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1284
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "Generert nyhetsstrøm"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Merkelappredigerer"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Trykk for å endre"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 #, fuzzy
 msgid "Cancel search"
 msgstr "Avbryt"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, 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:1284
-msgid "No article is selected."
-msgstr "Ingen artikkel er valgt."
+#~ msgid "Rescore feed"
+#~ msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Ingen artikler funnet som kan markeres"
+#~ msgid "Create label..."
+#~ msgstr "Lag merkelapp..."
 
-#: js/viewfeed.js:1321
-#, 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?"
+#~ msgid "Create filter..."
+#~ msgstr "Lag filter..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Endre poengene for artiklene i %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Endrer poengsummen for artiklene..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Kan ikke skape merkelapp, mangler overskrift."
 
 #, fuzzy
 #~ msgid "Firefox integration"
author	Andrew Dolgov <[email protected]>	2018-12-01 12:59:18 +0300
committer	Andrew Dolgov <[email protected]>	2018-12-01 12:59:18 +0300
commit	78780c9c08cde4b7e7ee44efa29fa5c19a918040 (patch)
tree	1198c44f4521fe1e8718e2d6a4e1a1029c56c3e5 /locale/nb_NO
parent	45a4b416ba438f19fabe6335de635d8eaf50aff6 (diff)