update translations

2 files changed, 561 insertions, 550 deletions

diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index dd2a78130..103708d49 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 2cba3a3ae..4fd912d6d 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: 2012-11-22 16:05+0400\n"
+"POT-Creation-Date: 2012-12-24 13:34+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -80,27 +80,15 @@ msgstr "Daglig"
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:97 index.php:180 classes/pref/prefs.php:462
-msgid "Default"
-msgstr "Standard"
-
-#: backend.php:98
-msgid "Magpie"
-msgstr "Magpie"
-
-#: backend.php:99
-msgid "SimplePie"
-msgstr "SimplePie"
-
-#: backend.php:108 classes/pref/users.php:139
+#: backend.php:97 classes/pref/users.php:139
 msgid "User"
 msgstr "Bruker"
 
-#: backend.php:109
+#: backend.php:98
 msgid "Power User"
 msgstr "Superbruker"
 
-#: backend.php:110
+#: backend.php:99
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -128,10 +116,10 @@ msgstr ", funnet: "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:629 classes/handler/public.php:717
+#: classes/handler/public.php:637 classes/handler/public.php:725
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
@@ -161,19 +149,19 @@ msgstr "Utfører oppdateringer..."
 msgid "Updating to version %d..."
 msgstr "Oppdaterer til versjon %d..."
 
-#: db-updater.php:140
+#: db-updater.php:142
 msgid "Checking version... "
 msgstr "Sjekker utgave..."
 
-#: db-updater.php:146
+#: db-updater.php:148
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:148
+#: db-updater.php:150
 msgid "ERROR!"
 msgstr "Feil!"
 
-#: db-updater.php:156
+#: db-updater.php:158
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -182,57 +170,21 @@ msgstr ""
 "Ferdig. <b>%d</b> utførte oppdatering(er)i følge skjema\n"
 "\t\t\tversjon <b>%d</b>."
 
-#: db-updater.php:166
+#: db-updater.php:168
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:168
+#: db-updater.php:170
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:170
+#: db-updater.php:172
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:59
-#, fuzzy
-msgid ""
-"Your browser doesn't support Javascript, which is required\n"
-"\t\t\tfor this application to function properly. Please check your\n"
-"\t\t\tbrowser settings."
-msgstr ""
-"Din nettleser støtter ikke Javaskript som er nødvendig\n"
-"\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
-"\t\tnettlesers instillinger."
-
-#: digest.php:65 index.php:104 index.php:146 index.php:230 prefs.php:68
-#: classes/backend.php:6 classes/pref/labels.php:296
-#: classes/pref/filters.php:602 classes/pref/feeds.php:1349
-#: js/viewfeed.js:1169
-msgid "Loading, please wait..."
-msgstr "laster, vennligst vent"
-
-#: digest.php:71
-#, fuzzy
-msgid "Back to feeds"
-msgstr "Trykk for å endre"
-
-#: digest.php:76 index.php:114
-msgid "Hello,"
-msgstr "Hei, "
-
-#: digest.php:79 index.php:124 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244
-msgid "Logout"
-msgstr "Logg ut"
-
-#: digest.php:82
-msgid "Regular version"
-msgstr ""
-
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
@@ -305,186 +257,201 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:108 index.php:150 index.php:236 prefs.php:86
+#: classes/backend.php:6 classes/pref/labels.php:296
+#: classes/pref/filters.php:602 classes/pref/feeds.php:1342
+#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169
+msgid "Loading, please wait..."
+msgstr "laster, vennligst vent"
+
+#: index.php:118 plugins/digest/digest_body.php:56
+msgid "Hello,"
+msgstr "Hei, "
+
+#: index.php:120 prefs.php:29 prefs.php:108 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: index.php:120
+#: index.php:124
 msgid "Comments?"
 msgstr "Kommentarer?"
 
-#: index.php:130
+#: index.php:128 mobile/mobile-functions.php:69
+#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:59
+msgid "Logout"
+msgstr "Logg ut"
+
+#: index.php:134
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: index.php:153
+#: index.php:157
 msgid "News"
 msgstr ""
 
-#: index.php:162
+#: index.php:166
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: index.php:165
+#: index.php:169
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: index.php:168
+#: index.php:172
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: index.php:169
+#: index.php:173
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:170 classes/feeds.php:106
+#: index.php:174 classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritter"
 
-#: index.php:171 classes/feeds.php:107
+#: index.php:175 classes/feeds.php:107
 msgid "Published"
 msgstr "Publisert"
 
-#: index.php:172 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:176 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr "Ulest"
 
-#: index.php:173
+#: index.php:177
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: index.php:174
+#: index.php:178
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: index.php:177
+#: index.php:181
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: index.php:181
+#: index.php:184 classes/pref/prefs.php:462
+msgid "Default"
+msgstr "Standard"
+
+#: index.php:185
 msgid "Date"
 msgstr "Dato"
 
-#: index.php:182 include/localized_schema.php:3
+#: index.php:186 include/localized_schema.php:3
 msgid "Title"
 msgstr "Tittel"
 
-#: index.php:183
+#: index.php:187
 msgid "Score"
 msgstr "Poeng"
 
-#: index.php:188 classes/pref/feeds.php:540 classes/pref/feeds.php:785
+#: index.php:192 classes/pref/feeds.php:539 classes/pref/feeds.php:786
 msgid "Update"
 msgstr "Oppdater"
 
-#: index.php:192 index.php:207 include/localized_schema.php:10
-#: classes/feeds.php:111 classes/feeds.php:127 js/digest.js:625
-#: js/FeedTree.js:128 js/FeedTree.js:156
+#: index.php:196 index.php:211 include/localized_schema.php:10
+#: classes/feeds.php:111 classes/feeds.php:127 js/FeedTree.js:128
+#: js/FeedTree.js:156
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: index.php:198 classes/feeds.php:101
+#: index.php:202 classes/feeds.php:101
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: index.php:200
+#: index.php:204
 msgid "Search..."
 msgstr "Søk..."
 
-#: index.php:201
+#: index.php:205
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: index.php:202 classes/handler/public.php:559
+#: index.php:206 classes/handler/public.php:567
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: index.php:203
+#: index.php:207
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: index.php:204
+#: index.php:208
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: index.php:205 classes/pref/feeds.php:710 classes/pref/feeds.php:1322
+#: index.php:209 classes/pref/feeds.php:712 classes/pref/feeds.php:1315
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:206
+#: index.php:210
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:208 help/main.php:56
+#: index.php:212 help/main.php:56
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:209
+#: index.php:213
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:210
+#: index.php:215
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:211
+#: index.php:217
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
-#: index.php:212
+#: index.php:218
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:213
+#: index.php:219
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: index.php:214
+#: index.php:220
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: index.php:215
+#: index.php:221
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:81
+#: prefs.php:99
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:82 help/prefs.php:14
+#: prefs.php:100 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:93 classes/pref/feeds.php:101 classes/pref/feeds.php:1227
-#: classes/pref/feeds.php:1290
+#: prefs.php:111 classes/pref/feeds.php:101 classes/pref/feeds.php:1220
+#: classes/pref/feeds.php:1283
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref/filters.php:110
+#: prefs.php:114 help/prefs.php:11 classes/pref/filters.php:110
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1193 include/functions.php:1842
+#: prefs.php:117 help/prefs.php:12 mobile/mobile-functions.php:205
+#: include/functions.php:1189 include/functions.php:1836
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: prefs.php:103 help/prefs.php:13
+#: prefs.php:121 help/prefs.php:13
 msgid "Users"
 msgstr "Brukere"
 
-#: prefs.php:108
-#, fuzzy
-msgid "Linked"
-msgstr "Lenke"
-
 #: register.php:186 include/login_form.php:212
 msgid "Create new account"
 msgstr "Lag ny konto"
@@ -543,7 +510,7 @@ msgstr "Kontoen ble opprettet med suksess."
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: update.php:33
+#: update.php:38
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
@@ -683,7 +650,7 @@ msgstr "Nyhetsstrømshandlinger"
 msgid "Refresh active feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1293
+#: help/main.php:57 help/prefs.php:22 classes/pref/feeds.php:1286
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
@@ -712,19 +679,19 @@ msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
 msgid "Go to..."
 msgstr "Gå til..."
 
-#: help/main.php:68 include/functions.php:1899
+#: help/main.php:68 include/functions.php:1893
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: help/main.php:69 include/functions.php:1897
+#: help/main.php:69 include/functions.php:1891
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: help/main.php:70 include/functions.php:1893
+#: help/main.php:70 include/functions.php:1887
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: help/main.php:71 include/functions.php:1895
+#: help/main.php:71 include/functions.php:1889
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
@@ -777,17 +744,17 @@ msgstr ""
 "avhenger av konfigureringen av Tiny Tiny RSS og ditt tilgangsnivå."
 
 #: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:491
+#: classes/handler/public.php:495
 msgid "Log in"
 msgstr "Logg inn"
 
 #: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:475
+#: classes/handler/public.php:479
 msgid "Login:"
 msgstr "Brukernavn:"
 
 #: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:478
+#: classes/handler/public.php:482
 msgid "Password:"
 msgstr "Passord:"
 
@@ -802,8 +769,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1191
-#: include/functions.php:1840
+#: mobile/mobile-functions.php:178 include/functions.php:1187
+#: include/functions.php:1834
 msgid "Special"
 msgstr "Snarveier"
 
@@ -846,150 +813,150 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Sort feeds by unread count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: include/functions.php:568
+#: include/functions.php:564
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:686
+#: include/functions.php:682
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/functions.php:1202 include/functions.php:1743
-#: include/functions.php:1828 include/functions.php:1850
-#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
+#: include/functions.php:1198 include/functions.php:1737
+#: include/functions.php:1822 include/functions.php:1844
+#: include/functions.php:2699 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
+#: include/functions.php:1686 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: include/functions.php:1901
+#: include/functions.php:1895
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: include/functions.php:1903
+#: include/functions.php:1897
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2352
+#: include/functions.php:2346
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Søkeresultat"
 
-#: include/functions.php:3073 js/viewfeed.js:1998
+#: include/functions.php:3067 js/viewfeed.js:1998
 #, fuzzy
 msgid "Click to play"
 msgstr "Trykk for å endre"
 
-#: include/functions.php:3074 js/viewfeed.js:1997
+#: include/functions.php:3068 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3206
+#: include/functions.php:3203
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
+#: include/functions.php:3232 include/functions.php:4028 classes/rpc.php:414
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: include/functions.php:3245 classes/feeds.php:669
+#: include/functions.php:3242 classes/feeds.php:680
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: include/functions.php:3255 classes/feeds.php:696
+#: include/functions.php:3252 classes/feeds.php:707
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:3271 classes/feeds.php:707
+#: include/functions.php:3263 classes/feeds.php:718
 #, fuzzy
 msgid "Close article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:3288 classes/feeds.php:609
+#: include/functions.php:3280 classes/feeds.php:616
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3293 classes/feeds.php:629 classes/pref/feeds.php:511
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:3316 classes/feeds.php:68
+#: include/functions.php:3308 classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
 
-#: include/functions.php:3335
+#: include/functions.php:3327
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: include/functions.php:3361 classes/dlg.php:30 classes/dlg.php:61
 #: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
 #: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
-#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
-#: classes/pref/users.php:106 classes/pref/filters.php:101
-#: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
-#: classes/pref/feeds.php:1712
+#: classes/dlg.php:623 classes/dlg.php:724 classes/pref/users.php:106
+#: classes/pref/filters.php:101 classes/pref/feeds.php:1638
+#: classes/pref/feeds.php:1709 plugins/share/share.php:61
+#: plugins/updater/updater.php:301
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: include/functions.php:4047
+#: include/functions.php:4053
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions.php:4514
+#: include/functions.php:4525
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: include/functions.php:4524 classes/feeds.php:755
+#: include/functions.php:4535 classes/feeds.php:766
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
-#: include/functions.php:4534 classes/feeds.php:765
+#: include/functions.php:4545 classes/feeds.php:776
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: include/functions.php:4678
+#: include/functions.php:4689
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions.php:4720
+#: include/functions.php:4731
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg:"
 
-#: include/functions.php:5180
+#: include/functions.php:5191
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:5204
+#: include/functions.php:5215
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:5250
+#: include/functions.php:5261
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
 
-#: include/functions.php:5255
+#: include/functions.php:5266
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5414
+#: include/functions.php:5425
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5420
+#: include/functions.php:5431
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1018,8 +985,7 @@ msgstr "Fjern artikler"
 msgid "Set starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:731
-#: js/viewfeed.js:501
+#: include/localized_schema.php:12 js/viewfeed.js:501
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
@@ -1237,7 +1203,7 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
-#: include/localized_schema.php:60 js/prefs.js:1865
+#: include/localized_schema.php:60 js/prefs.js:1856
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
@@ -1260,7 +1226,7 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr "Marker artikler som leste automatisk"
 
-#: include/login_form.php:185 classes/handler/public.php:481
+#: include/login_form.php:185 classes/handler/public.php:485
 msgid "Language:"
 msgstr "Språk:"
 
@@ -1284,96 +1250,96 @@ msgstr ""
 msgid "Article not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/handler/public.php:416 classes/pref/feeds.php:1487
+#: classes/handler/public.php:420 classes/pref/feeds.php:1480
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/handler/public.php:424
+#: classes/handler/public.php:428
 msgid "Title:"
 msgstr "Tittel:"
 
-#: classes/handler/public.php:426 classes/dlg.php:667
-#: classes/pref/instances.php:73 classes/pref/feeds.php:510
-#: classes/pref/feeds.php:761
+#: classes/handler/public.php:430 classes/dlg.php:667
+#: classes/pref/feeds.php:509 classes/pref/feeds.php:762
+#: plugins/instances/instances.php:100
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:432
 #, fuzzy
 msgid "Content:"
 msgstr "Innhold"
 
-#: classes/handler/public.php:430
+#: classes/handler/public.php:434
 #, fuzzy
 msgid "Labels:"
 msgstr "Merkelapper"
 
-#: classes/handler/public.php:449
+#: classes/handler/public.php:453
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:451
+#: classes/handler/public.php:455
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:452 classes/handler/public.php:494
+#: classes/handler/public.php:456 classes/handler/public.php:498
 #: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
 #: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
-#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
-#: classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:342 classes/pref/filters.php:717
-#: classes/pref/filters.php:786 classes/pref/filters.php:853
-#: classes/pref/instances.php:109 classes/pref/feeds.php:727
-#: classes/pref/feeds.php:886
+#: classes/dlg.php:774 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/pref/filters.php:342 classes/pref/filters.php:722
+#: classes/pref/filters.php:791 classes/pref/filters.php:858
+#: classes/pref/feeds.php:729 classes/pref/feeds.php:880
+#: plugins/mail/mail.php:126 plugins/note/note.php:49
+#: plugins/instances/instances.php:136
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: classes/handler/public.php:473
+#: classes/handler/public.php:477
 #, fuzzy
 msgid "Not logged in"
 msgstr "Sist innlogget"
 
-#: classes/handler/public.php:533
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/handler/public.php:565 classes/handler/public.php:662
+#: classes/handler/public.php:573 classes/handler/public.php:670
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:568 classes/handler/public.php:653
+#: classes/handler/public.php:576 classes/handler/public.php:661
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/handler/public.php:571 classes/handler/public.php:656
+#: classes/handler/public.php:579 classes/handler/public.php:664
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:574 classes/handler/public.php:659
+#: classes/handler/public.php:582 classes/handler/public.php:667
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: classes/handler/public.php:577 classes/handler/public.php:665
+#: classes/handler/public.php:585 classes/handler/public.php:673
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
 
-#: classes/handler/public.php:581 classes/handler/public.php:670
+#: classes/handler/public.php:589 classes/handler/public.php:678
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/handler/public.php:599 classes/handler/public.php:688
+#: classes/handler/public.php:607 classes/handler/public.php:696
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/handler/public.php:624 classes/handler/public.php:712
+#: classes/handler/public.php:632 classes/handler/public.php:720
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
@@ -1403,10 +1369,10 @@ msgstr ""
 
 #: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
-#: classes/pref/filters.php:571 classes/pref/filters.php:645
-#: classes/pref/filters.php:672 classes/pref/instances.php:145
-#: classes/pref/feeds.php:1281 classes/pref/feeds.php:1586
-#: classes/pref/feeds.php:1655
+#: classes/pref/filters.php:571 classes/pref/filters.php:650
+#: classes/pref/filters.php:677 classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1652
+#: plugins/instances/instances.php:172
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
@@ -1414,18 +1380,18 @@ msgstr "Velg:"
 #: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
-#: classes/pref/filters.php:648 classes/pref/filters.php:675
-#: classes/pref/instances.php:148 classes/pref/feeds.php:1284
-#: classes/pref/feeds.php:1589 classes/pref/feeds.php:1658
+#: classes/pref/filters.php:653 classes/pref/filters.php:680
+#: classes/pref/feeds.php:1277 classes/pref/feeds.php:1586
+#: classes/pref/feeds.php:1655 plugins/instances/instances.php:175
 msgid "All"
 msgstr "Alle"
 
 #: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
-#: classes/pref/filters.php:650 classes/pref/filters.php:677
-#: classes/pref/instances.php:150 classes/pref/feeds.php:1286
-#: classes/pref/feeds.php:1591 classes/pref/feeds.php:1660
+#: classes/pref/filters.php:655 classes/pref/filters.php:682
+#: classes/pref/feeds.php:1279 classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1657 plugins/instances/instances.php:177
 msgid "None"
 msgstr "Ingen"
 
@@ -1497,8 +1463,8 @@ msgstr ""
 msgid "Feed or site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
-#: classes/pref/feeds.php:774
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:531
+#: classes/pref/feeds.php:775
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
@@ -1507,18 +1473,18 @@ msgstr "Plasser i kategori..."
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
-#: classes/pref/feeds.php:817
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:561
+#: classes/pref/feeds.php:811
 msgid "Authentication"
 msgstr "Autentifisering"
 
 #: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
-#: classes/pref/feeds.php:578 classes/pref/feeds.php:821
+#: classes/pref/feeds.php:567 classes/pref/feeds.php:815
 msgid "Login"
 msgstr "Logg inn"
 
 #: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
-#: classes/pref/feeds.php:584 classes/pref/feeds.php:827
+#: classes/pref/feeds.php:573 classes/pref/feeds.php:821
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
@@ -1537,7 +1503,7 @@ msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
 #: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
-#: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
+#: classes/pref/filters.php:567 classes/pref/feeds.php:1270 js/tt-rss.js:234
 msgid "Search"
 msgstr "Søk"
 
@@ -1558,7 +1524,7 @@ msgstr "Antall:"
 
 #: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
-#: classes/pref/instances.php:155 classes/pref/feeds.php:700
+#: classes/pref/feeds.php:702 plugins/instances/instances.php:182
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1578,10 +1544,10 @@ msgstr "Denne nyhetsstrømmen"
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
-#: classes/pref/users.php:192 classes/pref/labels.php:79
-#: classes/pref/filters.php:339 classes/pref/instances.php:106
-#: classes/pref/feeds.php:726 classes/pref/feeds.php:883
+#: classes/dlg.php:455 classes/dlg.php:650 classes/pref/users.php:192
+#: classes/pref/labels.php:79 classes/pref/filters.php:339
+#: classes/pref/feeds.php:728 classes/pref/feeds.php:877
+#: plugins/note/note.php:47 plugins/instances/instances.php:133
 msgid "Save"
 msgstr "Lagre"
 
@@ -1625,7 +1591,7 @@ msgstr "Se stikkord"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:606 classes/pref/prefs.php:641
+#: classes/dlg.php:606 plugins/updater/updater.php:276
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
@@ -1653,31 +1619,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:661 classes/pref/instances.php:65
+#: classes/dlg.php:661 plugins/instances/instances.php:92
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:670 classes/pref/instances.php:76
-#: classes/pref/instances.php:173
+#: classes/dlg.php:670 plugins/instances/instances.php:103
+#: plugins/instances/instances.php:200
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:680 classes/pref/instances.php:87
+#: classes/dlg.php:680 plugins/instances/instances.php:114
 #, fuzzy
 msgid "Access key:"
 msgstr "Tilgangsnivå:"
 
-#: classes/dlg.php:683 classes/pref/instances.php:90
-#: classes/pref/instances.php:174
+#: classes/dlg.php:683 plugins/instances/instances.php:117
+#: plugins/instances/instances.php:201
 #, fuzzy
 msgid "Access key"
 msgstr "Tilgangsnivå"
 
-#: classes/dlg.php:687 classes/pref/instances.php:94
+#: classes/dlg.php:687 plugins/instances/instances.php:121
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:695 classes/pref/instances.php:102
+#: classes/dlg.php:695 plugins/instances/instances.php:129
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generert nyhetsstrøm"
@@ -1744,13 +1710,13 @@ msgid "Move back"
 msgstr "Gå tilbake"
 
 #: classes/feeds.php:118 classes/pref/filters.php:235
-#: classes/pref/filters.php:282 classes/pref/filters.php:657
-#: classes/pref/filters.php:684
+#: classes/pref/filters.php:282 classes/pref/filters.php:662
+#: classes/pref/filters.php:689
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: classes/feeds.php:122 classes/button/mail.php:7
+#: classes/feeds.php:122 plugins/mail/mail.php:22
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marker artikkel som favoritt"
@@ -1759,27 +1725,27 @@ msgstr "Marker artikkel som favoritt"
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: classes/feeds.php:186 classes/feeds.php:833
+#: classes/feeds.php:190 classes/feeds.php:844
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/feeds.php:427 classes/feeds.php:509
+#: classes/feeds.php:434 classes/feeds.php:516
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: classes/feeds.php:728
+#: classes/feeds.php:739
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: classes/feeds.php:731
+#: classes/feeds.php:742
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: classes/feeds.php:734
+#: classes/feeds.php:745
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: classes/feeds.php:738
+#: classes/feeds.php:749
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1787,57 +1753,10 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: classes/feeds.php:740
+#: classes/feeds.php:751
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: classes/button/note.php:7 js/note_button.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Endre Stikkord"
-
-#: classes/button/share.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Marker artikkel som favoritt"
-
-#: classes/button/share.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/button/tweet.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Tittel"
-
-#: classes/button/mail.php:52 classes/button/mail.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: classes/button/mail.php:52
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Alle artikler"
-
-#: classes/button/mail.php:73
-msgid "From:"
-msgstr ""
-
-#: classes/button/mail.php:82
-#, fuzzy
-msgid "To:"
-msgstr "Topp"
-
-#: classes/button/mail.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "Velg:"
-
-#: classes/button/mail.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Skift e-post"
-
 #: classes/backend.php:26
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
@@ -1898,7 +1817,7 @@ msgstr "Feil: Kan ikke laste opp OPMLfil"
 msgid "Error while parsing document."
 msgstr "Feil under behandling av dokumentet"
 
-#: classes/pref/users.php:6 classes/pref/instances.php:19
+#: classes/pref/users.php:6 plugins/instances/instances.php:42
 msgid "Your access level is insufficient to open this tab."
 msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
@@ -1938,8 +1857,8 @@ msgstr "Tilgangsnivå:"
 msgid "Change password to"
 msgstr "Endre passordet til"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:592
-#: classes/pref/feeds.php:833
+#: classes/pref/users.php:177 classes/pref/feeds.php:581
+#: classes/pref/feeds.php:827
 msgid "Options"
 msgstr "Alternativer:"
 
@@ -1981,7 +1900,7 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
 #: classes/pref/users.php:392 classes/pref/filters.php:586
-#: classes/pref/instances.php:154
+#: plugins/instances/instances.php:181
 msgid "Edit"
 msgstr "Rediger"
 
@@ -1997,7 +1916,7 @@ msgstr "Tilgangsnivå"
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: classes/pref/users.php:461 classes/pref/instances.php:195
+#: classes/pref/users.php:461 plugins/instances/instances.php:222
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
@@ -2047,31 +1966,31 @@ msgstr "Ingen filtre ble funnet."
 msgid "No recent articles matching this filter have been found."
 msgstr "Ingen filtre ble funnet."
 
-#: classes/pref/filters.php:218 classes/pref/filters.php:640
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:218 classes/pref/filters.php:645
+#: classes/pref/filters.php:760
 msgid "Match"
 msgstr "Match"
 
 #: classes/pref/filters.php:232 classes/pref/filters.php:279
-#: classes/pref/filters.php:654 classes/pref/filters.php:681
+#: classes/pref/filters.php:659 classes/pref/filters.php:686
 msgid "Add"
 msgstr "Legg til"
 
-#: classes/pref/filters.php:265 classes/pref/filters.php:667
+#: classes/pref/filters.php:265 classes/pref/filters.php:672
 #, fuzzy
 msgid "Apply actions"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/filters.php:315 classes/pref/filters.php:696
+#: classes/pref/filters.php:315 classes/pref/filters.php:701
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: classes/pref/filters.php:324 classes/pref/filters.php:699
+#: classes/pref/filters.php:324 classes/pref/filters.php:704
 #, fuzzy
 msgid "Match any rule"
 msgstr "Match på:"
 
-#: classes/pref/filters.php:336 classes/pref/filters.php:711
+#: classes/pref/filters.php:336 classes/pref/filters.php:716
 msgid "Test"
 msgstr "Test"
 
@@ -2084,74 +2003,50 @@ msgstr ""
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1336
+#: classes/pref/filters.php:593 classes/pref/feeds.php:1329
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: classes/pref/filters.php:714
+#: classes/pref/filters.php:719
 msgid "Create"
 msgstr "Lag"
 
-#: classes/pref/filters.php:764
+#: classes/pref/filters.php:769
 msgid "on field"
 msgstr "På felt:"
 
-#: classes/pref/filters.php:770 js/digest.js:239 js/PrefFilterTree.js:29
+#: classes/pref/filters.php:775 js/PrefFilterTree.js:29
 msgid "in"
 msgstr "i"
 
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:788
 #, fuzzy
 msgid "Save rule"
 msgstr "Lagre"
 
-#: classes/pref/filters.php:783 js/functions.js:1067
+#: classes/pref/filters.php:788 js/functions.js:1067
 #, fuzzy
 msgid "Add rule"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/filters.php:806
+#: classes/pref/filters.php:811
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: classes/pref/filters.php:832
+#: classes/pref/filters.php:837
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: classes/pref/filters.php:850
+#: classes/pref/filters.php:855
 #, fuzzy
 msgid "Save action"
 msgstr "Panelhandlinger"
 
-#: classes/pref/filters.php:850 js/functions.js:1093
+#: classes/pref/filters.php:855 js/functions.js:1093
 #, fuzzy
 msgid "Add action"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/instances.php:153
-#, fuzzy
-msgid "Link instance"
-msgstr "Endre stikkord"
-
-#: classes/pref/instances.php:165
-msgid ""
-"You can connect other instances of Tiny Tiny RSS to this one to share "
-"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
-
-#: classes/pref/instances.php:175
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref/instances.php:176
-msgid "Status"
-msgstr ""
-
-#: classes/pref/instances.php:177
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Flere nyhetsstrømmer"
-
 #: classes/pref/prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "Gammelt passord kan ikke være blankt."
@@ -2314,33 +2209,7 @@ msgstr "Tilbake til standard"
 msgid "Show additional preferences"
 msgstr "Forlat innstillinger"
 
-#: classes/pref/prefs.php:632 classes/pref/prefs.php:644 js/prefs.js:2220
-#, fuzzy
-msgid "Update Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: classes/pref/prefs.php:647
-#, fuzzy
-msgid "Your Tiny Tiny RSS installation is up to date."
-msgstr "Tiny Tiny RSS-databasen er oppdatert"
-
-#: classes/pref/prefs.php:659
-msgid ""
-"Do not close this dialog until updating is finished. Backup your tt-rss "
-"directory before continuing."
-msgstr ""
-
-#: classes/pref/prefs.php:662
-#, fuzzy
-msgid "Ready to update."
-msgstr "Siste oppdatering:"
-
-#: classes/pref/prefs.php:667
-#, fuzzy
-msgid "Start update"
-msgstr "Siste oppdatering:"
-
-#: classes/pref/prefs.php:728 classes/pref/prefs.php:746
+#: classes/pref/prefs.php:679 classes/pref/prefs.php:697
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Feil brukernavn og/eller passord"
@@ -2356,181 +2225,182 @@ msgstr "Marker for å tillate felt"
 msgid "(%d feeds)"
 msgstr "Rediger nyhetsstrømmen"
 
-#: classes/pref/feeds.php:493 classes/pref/feeds.php:746
+#: classes/pref/feeds.php:492 classes/pref/feeds.php:747
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: classes/pref/feeds.php:499
+#: classes/pref/feeds.php:498
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: classes/pref/feeds.php:555 classes/pref/feeds.php:797
-msgid "using"
-msgstr "bruker"
-
-#: classes/pref/feeds.php:565 classes/pref/feeds.php:808
+#: classes/pref/feeds.php:554 classes/pref/feeds.php:802
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref/feeds.php:588
+#: classes/pref/feeds.php:577
 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:604 classes/pref/feeds.php:837
+#: classes/pref/feeds.php:593 classes/pref/feeds.php:831
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:842
+#: classes/pref/feeds.php:604 classes/pref/feeds.php:836
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: classes/pref/feeds.php:627 classes/pref/feeds.php:848
+#: classes/pref/feeds.php:616 classes/pref/feeds.php:842
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:640 classes/pref/feeds.php:854
+#: classes/pref/feeds.php:629 classes/pref/feeds.php:848
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:654 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:643 classes/pref/feeds.php:856
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: classes/pref/feeds.php:666 classes/pref/feeds.php:868
+#: classes/pref/feeds.php:656
+#, fuzzy
+msgid "Cache content locally"
+msgstr "Mellomlagre bilder lokalt på serveren"
+
+#: classes/pref/feeds.php:668 classes/pref/feeds.php:862
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref/feeds.php:678 classes/pref/feeds.php:874
+#: classes/pref/feeds.php:680 classes/pref/feeds.php:868
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref/feeds.php:684
+#: classes/pref/feeds.php:686
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref/feeds.php:698
+#: classes/pref/feeds.php:700
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:719
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:726
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:740
+#: classes/pref/feeds.php:741
 msgid "Enable the options you wish to apply using checkboxes on the right:"
 msgstr ""
 
-#: classes/pref/feeds.php:1130 classes/pref/feeds.php:1183
+#: classes/pref/feeds.php:1123 classes/pref/feeds.php:1176
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: classes/pref/feeds.php:1238
+#: classes/pref/feeds.php:1231
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1251
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref/feeds.php:1295
+#: classes/pref/feeds.php:1288
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref/feeds.php:1297 classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1290 classes/pref/feeds.php:1304
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: classes/pref/feeds.php:1299 js/prefs.js:2186
+#: classes/pref/feeds.php:1292 js/prefs.js:2021
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1297
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref/feeds.php:1307
+#: classes/pref/feeds.php:1300
 #, fuzzy
 msgid "Add category"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1309
+#: classes/pref/feeds.php:1302
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Rediger kategorier"
 
-#: classes/pref/feeds.php:1313
+#: classes/pref/feeds.php:1306
 #, fuzzy
 msgid "Remove selected"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1320
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1324
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: classes/pref/feeds.php:1335
+#: classes/pref/feeds.php:1328
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref/feeds.php:1386
+#: classes/pref/feeds.php:1379
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1381
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1383
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1385
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1398
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref/feeds.php:1409
+#: classes/pref/feeds.php:1402
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1411
+#: classes/pref/feeds.php:1404
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1408
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1419
+#: classes/pref/feeds.php:1412
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -2539,42 +2409,42 @@ 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:1421
+#: classes/pref/feeds.php:1414
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1424
+#: classes/pref/feeds.php:1417
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1427
+#: classes/pref/feeds.php:1420
 #, fuzzy
 msgid "Article archive"
 msgstr "Artikkeldato"
 
-#: classes/pref/feeds.php:1429
+#: classes/pref/feeds.php:1422
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1425
 #, fuzzy
 msgid "Export my data"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1440
 msgid "Import"
 msgstr "Importer"
 
-#: classes/pref/feeds.php:1454
+#: classes/pref/feeds.php:1447
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: classes/pref/feeds.php:1456
+#: classes/pref/feeds.php:1449
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2582,45 +2452,45 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: classes/pref/feeds.php:1463
+#: classes/pref/feeds.php:1456
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: classes/pref/feeds.php:1471
+#: classes/pref/feeds.php:1464
 msgid "Bookmarklets"
 msgstr ""
 
-#: classes/pref/feeds.php:1473
+#: classes/pref/feeds.php:1466
 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 ""
 
-#: classes/pref/feeds.php:1477
+#: classes/pref/feeds.php:1470
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/pref/feeds.php:1481
+#: classes/pref/feeds.php:1474
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/pref/feeds.php:1483
+#: classes/pref/feeds.php:1476
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: classes/pref/feeds.php:1491
+#: classes/pref/feeds.php:1484
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1493
+#: classes/pref/feeds.php:1486
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1495
+#: classes/pref/feeds.php:1488
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2628,100 +2498,212 @@ 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:1501
+#: classes/pref/feeds.php:1494
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref/feeds.php:1504
+#: classes/pref/feeds.php:1497
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1506
+#: classes/pref/feeds.php:1499
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: classes/pref/feeds.php:1508
+#: classes/pref/feeds.php:1501
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1511
+#: classes/pref/feeds.php:1504
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Uleste artikler"
 
-#: classes/pref/feeds.php:1582
+#: classes/pref/feeds.php:1579
 #, 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:1619 classes/pref/feeds.php:1688
+#: classes/pref/feeds.php:1616 classes/pref/feeds.php:1685
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1637 classes/pref/feeds.php:1708
+#: classes/pref/feeds.php:1634 classes/pref/feeds.php:1705
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1648
+#: classes/pref/feeds.php:1645
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: js/digest.js:23 js/feedlist.js:490 js/feedlist.js:505
-msgid "Mark all articles in %s as read?"
-msgstr "Marker alle artikler i %s som leste?"
+#: plugins/pocket/pocket.php:24
+msgid "Pocket"
+msgstr ""
 
-#: js/digest.js:69
+#: plugins/digest/digest_body.php:39
 #, fuzzy
-msgid "Mark %d displayed articles as read?"
-msgstr "Marker %d artikkel/artikler som leste?"
+msgid ""
+"Your browser doesn't support Javascript, which is required\n"
+"\t\t\tfor this application to function properly. Please check your\n"
+"\t\t\tbrowser settings."
+msgstr ""
+"Din nettleser støtter ikke Javaskript som er nødvendig\n"
+"\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
+"\t\tnettlesers instillinger."
 
-#: js/digest.js:255 js/digest.js:691 js/viewfeed.js:456
-msgid "Unstar article"
-msgstr "Fjern favorittmerkingen fra artiklen"
+#: plugins/digest/digest_body.php:51
+#, fuzzy
+msgid "Back to feeds"
+msgstr "Trykk for å endre"
 
-#: js/digest.js:257 js/digest.js:695 js/viewfeed.js:461
-msgid "Star article"
+#: plugins/digest/digest_body.php:62
+msgid "Regular version"
+msgstr ""
+
+#: plugins/pinterest/pinterest.php:23
+msgid "Pinterest"
+msgstr ""
+
+#: plugins/mail/mail.php:66 plugins/mail/mail.php:72
+msgid "[Forwarded]"
+msgstr ""
+
+#: plugins/mail/mail.php:66
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Alle artikler"
+
+#: plugins/mail/mail.php:87
+msgid "From:"
+msgstr ""
+
+#: plugins/mail/mail.php:96
+#, fuzzy
+msgid "To:"
+msgstr "Topp"
+
+#: plugins/mail/mail.php:109
+#, fuzzy
+msgid "Subject:"
+msgstr "Velg:"
+
+#: plugins/mail/mail.php:125
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Skift e-post"
+
+#: plugins/note/note.php:22
+#, fuzzy
+msgid "Edit article note"
+msgstr "Endre Stikkord"
+
+#: plugins/example/example.php:29
+#, fuzzy
+msgid "Example Pane"
+msgstr "Eksempler"
+
+#: plugins/example/example.php:53
+msgid "Sample value"
+msgstr ""
+
+#: plugins/example/example.php:59
+#, fuzzy
+msgid "Set value"
+msgstr "Sett som favorittartikkel"
+
+#: plugins/identica/identica.php:23
+#, fuzzy
+msgid "Share on identi.ca"
+msgstr "Tittel"
+
+#: plugins/instances/instances.php:29
+#, fuzzy
+msgid "Linked"
+msgstr "Lenke"
+
+#: plugins/instances/instances.php:180
+#, fuzzy
+msgid "Link instance"
+msgstr "Endre stikkord"
+
+#: plugins/instances/instances.php:192
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: plugins/instances/instances.php:202
+msgid "Last connected"
+msgstr ""
+
+#: plugins/instances/instances.php:203
+msgid "Status"
+msgstr ""
+
+#: plugins/instances/instances.php:204
+#, fuzzy
+msgid "Stored feeds"
+msgstr "Flere nyhetsstrømmer"
+
+#: plugins/share/share.php:21
+#, fuzzy
+msgid "Share by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: js/digest.js:260 js/digest.js:726 js/viewfeed.js:496
-msgid "Unpublish article"
-msgstr "Fjern publiseringen av artikkelen."
+#: plugins/share/share.php:43
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: js/digest.js:287
+#: plugins/flattr/flattr.php:37
 #, fuzzy
-msgid "Error: unable to load article."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
+msgid "Flattr article"
+msgstr "Marker artikkel som favoritt"
 
-#: js/digest.js:445
+#: plugins/googleplus/googleplus.php:23
 #, fuzzy
-msgid "Click to expand article."
-msgstr "Trykk for å utvide artikkel"
+msgid "Share on Google+"
+msgstr "Tittel"
 
-#: js/digest.js:518
+#: plugins/updater/updater.php:267 plugins/updater/updater.php:279
 #, fuzzy
-msgid "%d more..."
-msgstr "Laster hjelp..."
+msgid "Update Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
 
-#: js/digest.js:525
+#: plugins/updater/updater.php:282
 #, fuzzy
-msgid "No unread feeds."
-msgstr "Skjul/vis leste nyhetsstrømmer"
+msgid "Your Tiny Tiny RSS installation is up to date."
+msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: js/digest.js:627
+#: plugins/updater/updater.php:291
+msgid ""
+"Do not close this dialog until updating is finished. Backup your tt-rss "
+"directory before continuing."
+msgstr ""
+
+#: plugins/updater/updater.php:294
 #, fuzzy
-msgid "Load more..."
-msgstr "Laster hjelp..."
+msgid "Ready to update."
+msgstr "Siste oppdatering:"
+
+#: plugins/updater/updater.php:299
+#, fuzzy
+msgid "Start update"
+msgstr "Siste oppdatering:"
 
 #: js/feedlist.js:283
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
+#: js/feedlist.js:490 js/feedlist.js:505
+msgid "Mark all articles in %s as read?"
+msgstr "Marker alle artikler i %s som leste?"
+
 #: js/functions.js:91
 msgid ""
 "Are you sure to report this exception to tt-rss.org? The report will include "
@@ -2820,7 +2802,7 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:893
+#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
@@ -2834,9 +2816,9 @@ msgstr "Rediger nyhetsstrømmen"
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:417 js/prefs.js:447
-#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
-#: js/prefs.js:1480
+#: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438
+#: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326
+#: js/prefs.js:1471
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
@@ -2851,22 +2833,11 @@ msgstr ""
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
-#: js/functions.js:1790 js/prefs.js:1317
+#: js/functions.js:1790 js/prefs.js:1308
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/mail_button.js:7 js/viewfeed.js:676 js/viewfeed.js:704
-#: js/viewfeed.js:731 js/viewfeed.js:793 js/viewfeed.js:825 js/viewfeed.js:962
-#: js/viewfeed.js:1005 js/viewfeed.js:1055 js/viewfeed.js:2181
-msgid "No articles are selected."
-msgstr "Ingen artikler er valgt."
-
-#: js/mail_button.js:21
-#, fuzzy
-msgid "Forward article by email"
-msgstr "Marker artikkel som favoritt"
-
 #: js/PrefFeedTree.js:47
 #, fuzzy
 msgid "Edit category"
@@ -2882,254 +2853,218 @@ msgstr "Lag kategori"
 msgid "Inverse"
 msgstr "(Motsatt)"
 
-#: js/prefs.js:64
+#: js/prefs.js:55
 msgid "Please enter login:"
 msgstr "Vennligst skriv inn brukernavn:"
 
-#: js/prefs.js:71
+#: js/prefs.js:62
 msgid "Can't create user: no login specified."
 msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
-#: js/prefs.js:137
+#: js/prefs.js:128
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Filtre"
 
-#: js/prefs.js:184
+#: js/prefs.js:175
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Fjerne %s filteret?"
 
-#: js/prefs.js:299
+#: js/prefs.js:290
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/prefs.js:315 js/prefs.js:1521
+#: js/prefs.js:306 js/prefs.js:1512
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: js/prefs.js:329
+#: js/prefs.js:320
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587
+#: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: js/prefs.js:364
+#: js/prefs.js:355
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636
+#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: js/prefs.js:398
+#: js/prefs.js:389
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: js/prefs.js:432
+#: js/prefs.js:423
 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 
-#: js/prefs.js:438
+#: js/prefs.js:429
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 
-#: js/prefs.js:460
+#: js/prefs.js:451
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
 
-#: js/prefs.js:498
+#: js/prefs.js:489
 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 
-#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592
+#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: js/prefs.js:557
+#: js/prefs.js:548
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
-#: js/prefs.js:622
+#: js/prefs.js:613
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: js/prefs.js:640
+#: js/prefs.js:631
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:704
+#: js/prefs.js:695
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 
-#: js/prefs.js:728
+#: js/prefs.js:719
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
-#: js/prefs.js:820
+#: js/prefs.js:811
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 
-#: js/prefs.js:847
+#: js/prefs.js:838
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:863
+#: js/prefs.js:854
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:1019
+#: js/prefs.js:1010
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: js/prefs.js:1224
+#: js/prefs.js:1215
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1251
+#: js/prefs.js:1242
 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 
-#: js/prefs.js:1267
+#: js/prefs.js:1258
 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 
-#: js/prefs.js:1275
+#: js/prefs.js:1266
 #, fuzzy
 msgid "Category title:"
 msgstr "Kategoriredigerer"
 
-#: js/prefs.js:1306
+#: js/prefs.js:1297
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Oppdateringsfeil"
 
-#: js/prefs.js:1355
+#: js/prefs.js:1346
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
-#: js/prefs.js:1464
+#: js/prefs.js:1455
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: js/prefs.js:1487
+#: js/prefs.js:1478
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
-#: js/prefs.js:1507
+#: js/prefs.js:1498
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 
-#: js/prefs.js:1544
+#: js/prefs.js:1535
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1553
+#: js/prefs.js:1544
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1571
+#: js/prefs.js:1562
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/prefs.js:1579 js/prefs.js:1632
+#: js/prefs.js:1570 js/prefs.js:1623
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:1595 js/prefs.js:1648
+#: js/prefs.js:1586 js/prefs.js:1639
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:1656
+#: js/prefs.js:1647
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1675
+#: js/prefs.js:1666
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1773
+#: js/prefs.js:1764
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: js/prefs.js:1836
+#: js/prefs.js:1827
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1907
-#, fuzzy
-msgid "Link Instance"
-msgstr "Endre stikkord"
-
-#: js/prefs.js:1958
-#, fuzzy
-msgid "Edit Instance"
-msgstr "Endre stikkord"
-
-#: js/prefs.js:2007
-#, fuzzy
-msgid "Remove selected instances?"
-msgstr "Fjerne valgte filtre?"
-
-#: js/prefs.js:2024 js/prefs.js:2036
-#, fuzzy
-msgid "No instances are selected."
-msgstr "Ingen filtre er valgt"
-
-#: js/prefs.js:2041
-#, fuzzy
-msgid "Please select only one instance."
-msgstr "Vennligst velg kun et filter"
-
-#: js/prefs.js:2076
+#: js/prefs.js:1911
 #, fuzzy
 msgid "Export Data"
 msgstr "Eksporter OPML"
 
-#: js/prefs.js:2103
+#: js/prefs.js:1938
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2156
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Data Import"
 msgstr "Importer"
 
-#: js/prefs.js:2192
+#: js/prefs.js:2027
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på nyhetsstrømmen..."
 
-#: js/prefs.js:2268
-msgid ""
-"Live updating is considered experimental. Backup your tt-rss directory "
-"before continuing. Please type 'yes' to continue."
-msgstr ""
-
-#: js/share_button.js:10
-#, fuzzy
-msgid "Share article by URL"
-msgstr "Marker artikkel som favoritt"
-
 #: js/tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
@@ -3150,7 +3085,7 @@ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: js/tt-rss.js:1052
+#: js/tt-rss.js:1062
 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
@@ -3160,6 +3095,24 @@ msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 msgid "Cancel search"
 msgstr "Avbryt"
 
+#: js/viewfeed.js:456
+msgid "Unstar article"
+msgstr "Fjern favorittmerkingen fra artiklen"
+
+#: js/viewfeed.js:461
+msgid "Star article"
+msgstr "Marker artikkel som favoritt"
+
+#: js/viewfeed.js:496
+msgid "Unpublish article"
+msgstr "Fjern publiseringen av artikkelen."
+
+#: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793
+#: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005
+#: js/viewfeed.js:1055 js/viewfeed.js:2181
+msgid "No articles are selected."
+msgstr "Ingen artikler er valgt."
+
 #: js/viewfeed.js:942
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
@@ -3255,6 +3208,67 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
+#~ msgid "Magpie"
+#~ msgstr "Magpie"
+
+#~ msgid "SimplePie"
+#~ msgstr "SimplePie"
+
+#~ msgid "using"
+#~ msgstr "bruker"
+
+#, fuzzy
+#~ msgid "Mark %d displayed articles as read?"
+#~ msgstr "Marker %d artikkel/artikler som leste?"
+
+#, fuzzy
+#~ msgid "Error: unable to load article."
+#~ msgstr "Feil: Kan ikke laste opp OPMLfil"
+
+#, fuzzy
+#~ msgid "Click to expand article."
+#~ msgstr "Trykk for å utvide artikkel"
+
+#, fuzzy
+#~ msgid "%d more..."
+#~ msgstr "Laster hjelp..."
+
+#, fuzzy
+#~ msgid "No unread feeds."
+#~ msgstr "Skjul/vis leste nyhetsstrømmer"
+
+#, fuzzy
+#~ msgid "Load more..."
+#~ msgstr "Laster hjelp..."
+
+#, fuzzy
+#~ msgid "Forward article by email"
+#~ msgstr "Marker artikkel som favoritt"
+
+#, fuzzy
+#~ msgid "Link Instance"
+#~ msgstr "Endre stikkord"
+
+#, fuzzy
+#~ msgid "Edit Instance"
+#~ msgstr "Endre stikkord"
+
+#, fuzzy
+#~ msgid "Remove selected instances?"
+#~ msgstr "Fjerne valgte filtre?"
+
+#, fuzzy
+#~ msgid "No instances are selected."
+#~ msgstr "Ingen filtre er valgt"
+
+#, fuzzy
+#~ msgid "Please select only one instance."
+#~ msgstr "Vennligst velg kun et filter"
+
+#, fuzzy
+#~ msgid "Share article by URL"
+#~ msgstr "Marker artikkel som favoritt"
+
 #, fuzzy
 #~ msgid "match on"
 #~ msgstr "Match på:"
@@ -4389,9 +4403,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ "funksjonaliteten bllir regnet som avansert og forutsetter noe kjennskap "
 #~ "til SQL."
 
-#~ msgid "Examples"
-#~ msgstr "Eksempler"
-
 #~ msgid "Match all unread articles:"
 #~ msgstr "Match alle uleste artikler:"