add script to extract preference translations from the schema; update translations

author: Andrew Dolgov <[email protected]> 2010-11-29 13:08:31 +0300
committer: Andrew Dolgov <[email protected]> 2010-11-29 13:08:31 +0300
commit: 2cd992574a5ce73a3d99d52c70184e442226f38b (patch)
tree: 4a36dbbcd2eb2873ed678d6cc237692d21d8956c /locale/nb_NO
parent: 30b6ee8c08a5c5d0201be95864706ab529298a70 (diff)
2 files changed, 1075 insertions, 889 deletions
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index c31a11387..aeaa04a38 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 3a4d0e65b..3e6b7a3c3 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: 2010-11-17 16:11+0300\n"
+"POT-Creation-Date: 2010-11-29 13:07+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"
@@ -79,7 +79,7 @@ msgstr "Daglig"
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:132 tt-rss.php:153 modules/pref-prefs.php:349
+#: backend.php:132 tt-rss.php:143 modules/pref-prefs.php:347
 msgid "Default"
 msgstr "Standard"
 
@@ -91,19 +91,39 @@ msgstr "Magpie"
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:143 modules/pref-users.php:131
+#: backend.php:135
+msgid "Twitter OAuth"
+msgstr ""
+
+#: backend.php:144 modules/pref-users.php:131
 msgid "User"
 msgstr "Bruker"
 
-#: backend.php:144
+#: backend.php:145
 msgid "Power User"
 msgstr "Superbruker"
 
-#: backend.php:145
+#: backend.php:146
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:529 login_form.php:142 modules/backend-rpc.php:62
+#: backend.php:192 prefs.php:103 modules/pref-feeds.php:41
+#: modules/pref-feeds.php:1131 modules/pref-feeds.php:1168
+msgid "Feeds"
+msgstr "Nyhetsstrømmer"
+
+#: backend.php:219
+#, fuzzy
+msgid "Article not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: backend.php:530 digest.php:61 prefs.php:64 tt-rss.php:58 tt-rss.php:110
+#: tt-rss.php:192 modules/pref-feeds.php:1217 modules/pref-filters.php:424
+#: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1621
+msgid "Loading, please wait..."
+msgstr "laster, vennligst vent"
+
+#: backend.php:543 login_form.php:142 modules/backend-rpc.php:62
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -135,7 +155,8 @@ msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
 #: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
 #: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 modules/pref-feeds.php:785
+#: register.php:338 register.php:350 twitter.php:106 twitter.php:118
+#: modules/pref-feeds.php:949
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
@@ -186,7 +207,7 @@ msgstr ""
 "Ferdig. <b>%d</b> utførte oppdatering(er)i følge skjema\n"
 "\t\t\tversjon <b>%d</b>."
 
-#: digest.php:56
+#: digest.php:55
 #, fuzzy
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -197,45 +218,26 @@ msgstr ""
 "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
 "\t\tnettlesers instillinger."
 
-#: digest.php:62 prefs.php:68 tt-rss.php:64 tt-rss.php:122 tt-rss.php:205
-#: digest.js:129 viewfeed.js:1639
-msgid "Loading, please wait..."
-msgstr "laster, vennligst vent"
-
-#: digest.php:70
-#, fuzzy
-msgid "Fatal Exception"
-msgstr "Alvorlig feil"
-
-#: digest.php:72 functions.php:4747 modules/help.php:21
-#: modules/popup-dialog.php:55 modules/popup-dialog.php:157
-#: modules/popup-dialog.php:184 modules/popup-dialog.php:233
-#: modules/popup-dialog.php:590 modules/popup-dialog.php:649
-#: modules/popup-dialog.php:795 modules/pref-feeds.php:948
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: digest.php:82 prefs.php:95 tt-rss.php:95
+#: digest.php:70 prefs.php:85 tt-rss.php:83
 msgid "Hello,"
 msgstr "Hei, "
 
-#: digest.php:86 prefs.php:100 tt-rss.php:105 mobile/functions.php:59
+#: digest.php:74 prefs.php:90 tt-rss.php:93 mobile/functions.php:59
 #: mobile/functions.php:232
 msgid "Logout"
 msgstr "Logg ut"
 
-#: digest.php:112
+#: digest.php:100
 #, fuzzy
 msgid "feeds"
 msgstr "Nyhetsstrømmer"
 
-#: digest.php:118
+#: digest.php:106
 #, fuzzy
 msgid "headlines"
 msgstr "Siste artikler:"
 
-#: digest.php:140
+#: digest.php:128
 msgid "You are viewing the digest page. Click to open full version."
 msgstr ""
 
@@ -314,179 +316,188 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: functions.php:1900
+#: functions.php:1922
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: functions.php:1970
+#: functions.php:1987
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:421
+#: functions.php:2953 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:2979 functions.php:3022 functions.php:4322 functions.php:4331
-#: modules/pref-feeds.php:1140
+#: functions.php:2985 functions.php:3028 functions.php:4290 functions.php:4299
+#: modules/pref-feeds.php:83
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:3001
-#, fuzzy
-msgid "Add category..."
-msgstr "Legger til kategori for nyhetsstrømmer"
-
-#: functions.php:3012 functions.php:3631 mobile/functions.php:168
+#: functions.php:3018 functions.php:3639 mobile/functions.php:168
 msgid "Special"
 msgstr "Snarveier"
 
-#: functions.php:3014 functions.php:3633 prefs.php:119 help/4.php:12
-#: mobile/functions.php:195
+#: functions.php:3020 functions.php:3641 prefs.php:109
+#: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
+#: viewfeed.js:2290
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: functions.php:3059 help/3.php:61
+#: functions.php:3066 help/3.php:61
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:3061 help/3.php:62
+#: functions.php:3068 help/3.php:62
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:3063 help/3.php:60
+#: functions.php:3070 help/3.php:60
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: functions.php:3065 help/3.php:59
+#: functions.php:3072 help/3.php:59
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: functions.php:3067
+#: functions.php:3074
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
-#: modules/pref-labels.php:212 modules/pref-users.php:428
+#: functions.php:4059
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
-#: modules/pref-labels.php:213 modules/pref-users.php:429
+#: functions.php:4060 modules/pref-feeds.php:1162 modules/pref-filters.php:399
+#: modules/pref-labels.php:272 modules/pref-users.php:382
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:4095 tt-rss.php:146
+#: functions.php:4061 functions.php:4073 tt-rss.php:135
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:4096
+#: functions.php:4062
 msgid "Invert"
 msgstr "Motsatt"
 
-#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
-#: modules/pref-labels.php:214 modules/pref-users.php:430
+#: functions.php:4063 modules/pref-feeds.php:1164 modules/pref-filters.php:401
+#: modules/pref-labels.php:274 modules/pref-users.php:384
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:4103 tt-rss.php:169
+#: functions.php:4069 tt-rss.php:161
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: functions.php:4107 help/3.php:18
-msgid "Toggle unread"
-msgstr "Sett som ulest"
+#: functions.php:4071
+msgid "Selection toggle:"
+msgstr "Marker utvalg:"
 
-#: functions.php:4108 help/3.php:16
-msgid "Toggle starred"
-msgstr "Sett som favoritt"
+#: functions.php:4074 tt-rss.php:133
+msgid "Starred"
+msgstr "Favoritter"
 
-#: functions.php:4109 help/3.php:17
-msgid "Toggle published"
-msgstr "Sett som publisert"
+#: functions.php:4075 tt-rss.php:134
+msgid "Published"
+msgstr "Publisert"
+
+#: functions.php:4077
+msgid "Selection:"
+msgstr "Utvalg:"
 
-#: functions.php:4116 localized_schema.php:16 tt-rss.php:163 tt-rss.php:178
-#: digest.js:362 digest.js:432 digest.js:586
+#: functions.php:4079 localized_schema.php:10 tt-rss.php:155 tt-rss.php:170
+#: digest.js:362 digest.js:433 digest.js:589
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: functions.php:4119
+#: functions.php:4082
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4121
+#: functions.php:4084
 #, fuzzy
 msgid "Move back"
 msgstr "Gå tilbake"
 
-#: functions.php:4122
+#: functions.php:4085
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: functions.php:4126 functions.php:4670 functions.php:5272
+#: functions.php:4089 functions.php:4631 functions.php:5248
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4138 modules/popup-dialog.php:772
+#: functions.php:4095 PrefFilterTree.js:29
+msgid "Feed:"
+msgstr "Nyhetsstrøm:"
+
+#: functions.php:4097 modules/popup-dialog.php:737
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
-#: functions.php:4148 functions.php:4715
+#: functions.php:4107 functions.php:4683
 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
 
-#: functions.php:4198
+#: functions.php:4153
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Se nyhetsstrømmene"
 
-#: functions.php:4494
-msgid "audio/mpeg"
-msgstr "Lyd/mpeg"
-
-#: functions.php:4625
+#: functions.php:4583
 msgid " - "
 msgstr "-"
 
-#: functions.php:4651 functions.php:5257
+#: functions.php:4612 functions.php:5226
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: functions.php:4657 functions.php:5266
+#: functions.php:4618 functions.php:5235
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: functions.php:4664 functions.php:5280
+#: functions.php:4625 functions.php:5242
 msgid "Publish article with a note"
 msgstr "Publiser artikelen med notat"
 
-#: functions.php:4676
+#: functions.php:4638 functions.php:5255 digest.js:432
+msgid "Share on Twitter"
+msgstr ""
+
+#: functions.php:4644
 #, fuzzy
 msgid "Close this panel"
 msgstr "Lukk dette vinduet"
 
-#: functions.php:4693 functions.php:5188
+#: functions.php:4661 functions.php:5157
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4706 functions.php:5201
+#: functions.php:4674 functions.php:5170 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:289
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: functions.php:4804
+#: functions.php:4715 modules/help.php:21 modules/popup-dialog.php:53
+#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
+#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
+#: modules/popup-dialog.php:790 modules/pref-feeds.php:1122
+#: modules/pref-users.php:99
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: functions.php:4768
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: functions.php:4873
+#: functions.php:4837
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -494,28 +505,28 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:5028 functions.php:5107
+#: functions.php:4992 functions.php:5073
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: functions.php:5285
+#: functions.php:5261
 #, fuzzy
 msgid "Dismiss article"
 msgstr "Publiser artiklen"
 
-#: functions.php:5304
+#: functions.php:5280
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5307
+#: functions.php:5283
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: functions.php:5310
+#: functions.php:5286
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5314
+#: functions.php:5290
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -523,112 +534,99 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: functions.php:5316
+#: functions.php:5292
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: functions.php:5331 functions.php:6640
+#: functions.php:5307 functions.php:6620
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5341 functions.php:6650 modules/pref-feeds.php:971
+#: functions.php:5317 functions.php:6630
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: functions.php:6147 tt-rss.php:185
+#: functions.php:6123 tt-rss.php:175
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: functions.php:6161
+#: functions.php:6137
 #, fuzzy
 msgid "Remove:"
 msgstr "Fjern"
 
-#: functions.php:6165
+#: functions.php:6141
 #, fuzzy
 msgid "Assign:"
 msgstr "Tildel stikkord:"
 
-#: functions.php:6213
+#: functions.php:6189
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: functions.php:6242
+#: functions.php:6218
 msgid "edit note"
 msgstr "Rediger notat"
 
-#: functions.php:6630
+#: functions.php:6610
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: functions.php:6795
-#, fuzzy
-msgid "Add label..."
-msgstr "Legger til kategori for nyhetsstrømmer"
-
-#: functions.php:6817
+#: functions.php:6798
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:6857
+#: functions.php:6838
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:6859
+#: functions.php:6840
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: localized_schema.php:9 tt-rss.php:155 modules/popup-dialog.php:393
-#: modules/pref-feeds.php:1117 modules/pref-feeds.php:1168
+#: localized_schema.php:3 tt-rss.php:145 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "Tittel"
 
-#: localized_schema.php:10
+#: localized_schema.php:4
 msgid "Title or Content"
 msgstr "Tittel eller innhold"
 
-#: localized_schema.php:11
+#: localized_schema.php:5
 msgid "Link"
 msgstr "Lenke"
 
-#: localized_schema.php:12 modules/popup-dialog.php:394
+#: localized_schema.php:6 modules/popup-dialog.php:379
 msgid "Content"
 msgstr "Innhold"
 
-#: localized_schema.php:13
+#: localized_schema.php:7
 msgid "Article Date"
 msgstr "Artikkeldato"
 
-#: localized_schema.php:15
+#: localized_schema.php:9
+#, fuzzy
 msgid "Filter article"
-msgstr "Filtrer artikkel"
+msgstr "Fjern artikler"
 
-#: localized_schema.php:17
+#: localized_schema.php:11
 msgid "Set starred"
 msgstr "Sett som favorittartikkel"
 
-#: localized_schema.php:18 digest.js:409 digest.js:687 viewfeed.js:487
+#: localized_schema.php:12 digest.js:409 digest.js:691 viewfeed.js:480
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
-#: localized_schema.php:19
+#: localized_schema.php:13
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 
-#: localized_schema.php:20
+#: localized_schema.php:14
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
-#: localized_schema.php:24
-msgid "General"
-msgstr "Generelt"
-
-#: localized_schema.php:26
-msgid "Allow duplicate posts"
-msgstr "Tillatt duplikate artikler"
-
-#: localized_schema.php:27
+#: localized_schema.php:16
 msgid ""
 "This option is useful when you are reading several planet-type aggregators "
 "with partially colliding userbase. When disabled, it forces same posts from "
@@ -639,53 +637,7 @@ msgstr ""
 "avskrudd kan samme post fra flere forskjellige nyhetsstrømmer vises på en "
 "gang."
 
-#: localized_schema.php:28
-msgid "Default interval between feed updates (in minutes)"
-msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
-
-#: localized_schema.php:29
-msgid "Enable e-mail digest"
-msgstr "Tillatt e-postsammendrag"
-
-#: localized_schema.php:30
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Dette valget muliggjør utsendingen av daglige sammendrag over nye (og "
-"uleste) tittler til din e-postadresse"
-
-#: localized_schema.php:31
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
-
-#: localized_schema.php:32
-msgid "Update post on checksum change"
-msgstr "Oppdaterer artikkel etter checksumbytte"
-
-#: localized_schema.php:33
-msgid "Mark articles in e-mail digest as read"
-msgstr "Marker artikler i e--postsammendrag som leste"
-
-#: localized_schema.php:34
-msgid "Enable offline reading"
-msgstr "Tillatt lesning uten internett-tilgang"
-
-#: localized_schema.php:35
-msgid "Synchronize new articles for offline reading using Google Gears."
-msgstr ""
-"Synkroniser nye artikler for å kunne bytte modus til å kunne lese uten "
-"internett-tilgang med Google Gears."
-
-#: localized_schema.php:37
-msgid "Interface"
-msgstr "Grensesnitt"
-
-#: localized_schema.php:39
-msgid "Combined feed display"
-msgstr "Kombinert nyhetsstrømsvisning"
-
-#: localized_schema.php:40
+#: localized_schema.php:17
 msgid ""
 "Display expanded list of feed articles, instead of separate displays for "
 "headlines and article content"
@@ -693,35 +645,23 @@ msgstr ""
 "Viser en utvidet liste over nyhetsstrømsartikler isteden for en separat "
 "visning av titler og artikler."
 
-#: localized_schema.php:41
-msgid "Default article limit"
-msgstr "Standard artikkelbegrensning"
-
-#: localized_schema.php:42
+#: localized_schema.php:18
 msgid ""
-"Default limit for articles to display, any custom number you like (0 - "
-"disables)."
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
 msgstr ""
-"Standard begrensning for artikler som skal vises, valgfritt antall (0 - "
-"fjerner funksjonen)."
-
-#: localized_schema.php:43
-msgid "Enable feed categories"
-msgstr "Tillatt kategorisering av nyhetsstrømmer"
-
-#: localized_schema.php:44
-msgid "Enable search toolbar"
-msgstr "Vis søkelinjen"
-
-#: localized_schema.php:45
-msgid "Hide feeds with no unread messages"
-msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
+"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetsstrøm med "
+"uleste artikler."
 
-#: localized_schema.php:46
-msgid "Mark articles as read automatically"
-msgstr "Marker artikler som leste automatisk"
+#: localized_schema.php:19
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Dette valget muliggjør utsendingen av daglige sammendrag over nye (og "
+"uleste) tittler til din e-postadresse"
 
-#: localized_schema.php:47
+#: localized_schema.php:20
 msgid ""
 "This option enables marking articles as read automatically in combined mode "
 "(except for Fresh articles feed) while you scroll article list."
@@ -730,65 +670,19 @@ msgstr ""
 "kombinert modus, mens du blar i artikkellisten (med unntak for ferske "
 "artikler nyhetsstrømmen)."
 
-#: localized_schema.php:48
-msgid "On catchup show next feed"
-msgstr "Ved oppdatering vis neste nyhetsstrøm"
-
-#: localized_schema.php:49
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetsstrøm med "
-"uleste artikler."
-
-#: localized_schema.php:50
-msgid "Open article links in new browser window"
-msgstr "Åpne artikkel-lenker i nytt nettleservindu"
-
-#: localized_schema.php:51
-msgid "Reverse headline order (oldest first)"
-msgstr "Motsatt titteloversikt (eldste først)"
-
-#: localized_schema.php:52
-msgid "Show content preview in headlines list"
-msgstr "Vis innholdsforhåndsvisning i titteloversikten"
-
-#: localized_schema.php:53
-msgid "Sort feeds by unread articles count"
-msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
-
-#: localized_schema.php:54
-msgid "User stylesheet URL"
-msgstr "URL til brukerbestemt utseendemal (CSS)"
-
-#: localized_schema.php:55
-msgid "Link to user stylesheet to override default style, disabled if empty."
-msgstr ""
-"Lenke til brukerbestemt utseendemal for å overstyre standarden, avskrudd "
-"hvis tomt felt."
-
-#: localized_schema.php:56
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Maksimal alder på ferske artikler (i timer)"
-
-#: localized_schema.php:57
-msgid "Hide feedlist"
-msgstr "Skjul nyhetskanalslisten"
+#: localized_schema.php:21
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
 
-#: localized_schema.php:58
+#: localized_schema.php:22
 msgid ""
-"This option hides feedlist and allows it to be toggled on the fly, useful "
-"for small screens."
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
 msgstr ""
-"Dette valget skjuler kanallisten og tillater at den vises etter ønske, "
-"brukbart for små skjermer."
-
-#: localized_schema.php:59
-msgid "Group headlines in virtual feeds"
-msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
+"Når stikkord blir automatisk funnet i artikler skal følgende stikkord ikke "
+"bli oppdaget (komma-separert liste)"
 
-#: localized_schema.php:60
+#: localized_schema.php:23
 msgid ""
 "When this option is enabled, headlines in Special feeds and Labels are "
 "grouped by feeds"
@@ -796,115 +690,151 @@ msgstr ""
 "Med dette valget haket av så vil overskriftene i spesielle nyhetskanaler og "
 "merkelapper grupperes etter nyhetskanalene"
 
-#: localized_schema.php:62
-msgid "Advanced"
-msgstr "Avansert"
-
-#: localized_schema.php:64
-msgid "Blacklisted tags"
-msgstr "Svartelistede stikkord"
+#: localized_schema.php:24
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
 
-#: localized_schema.php:65
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
+#: localized_schema.php:25
+msgid "Customize CSS stylesheet to your liking"
 msgstr ""
-"Når stikkord blir automatisk funnet i artikler skal følgende stikkord ikke "
-"bli oppdaget (komma-separert liste)"
 
-#: localized_schema.php:66
-msgid "Confirm marking feed as read"
-msgstr "Bekreft markeringen av nyhetsstrøm som lest"
+#: localized_schema.php:26
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
 
-#: localized_schema.php:67
-msgid "Enable feed icons"
-msgstr "Bruk nyhetsstrømsikoner"
+#: localized_schema.php:27
+msgid "Update post on checksum change"
+msgstr "Oppdaterer artikkel etter checksumbytte"
 
-#: localized_schema.php:68
-msgid "Enable labels"
-msgstr "Tillat merkelapper"
+#: localized_schema.php:28
+#, fuzzy
+msgid "Default interval between feed updates"
+msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
 
-#: localized_schema.php:69
-msgid ""
-"Experimental support for virtual feeds based on user crafted SQL queries. "
-"This feature is highly experimental and at this point not user friendly. Use "
-"with caution."
-msgstr ""
-"Eksperimentel støtte for virtuelle nyhetsstrømmer basert på brukerlagde SQL-"
-"spørringer. Denne funksjonen er veldig eksperimentel og er på nåværende "
-"tidspunkt ikke brukervennlig. Benytt med varsomhet."
+#: localized_schema.php:29
+#, fuzzy
+msgid "Amount of articles to display at once"
+msgstr "Ingen artikler funnet som kan vises"
+
+#: localized_schema.php:30
+msgid "Allow duplicate posts"
+msgstr "Tillatt duplikate artikler"
+
+#: localized_schema.php:31
+msgid "Enable feed categories"
+msgstr "Tillatt kategorisering av nyhetsstrømmer"
 
-#: localized_schema.php:70
+#: localized_schema.php:32
+msgid "Show content preview in headlines list"
+msgstr "Vis innholdsforhåndsvisning i titteloversikten"
+
+#: localized_schema.php:33
+msgid "Short date format"
+msgstr "Kort datoformat"
+
+#: localized_schema.php:34
 msgid "Long date format"
 msgstr "Langt datoformat"
 
-#: localized_schema.php:71
+#: localized_schema.php:35
+msgid "Use more accessible date/time format for headlines"
+msgstr "Bruk mer brukervennlige dato/tidsformater for artiklene"
+
+#: localized_schema.php:36
+msgid "Combined feed display"
+msgstr "Kombinert nyhetsstrømsvisning"
+
+#: localized_schema.php:37
+msgid "Hide feeds with no unread messages"
+msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
+
+#: localized_schema.php:38
+msgid "On catchup show next feed"
+msgstr "Ved oppdatering vis neste nyhetsstrøm"
+
+#: localized_schema.php:39
+msgid "Sort feeds by unread articles count"
+msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+
+#: localized_schema.php:40
 msgid "Set articles as unread on update"
 msgstr "Sett artikler som uleste ved oppdatering"
 
-#: localized_schema.php:72
-msgid "Short date format"
-msgstr "Kort datoformat"
+#: localized_schema.php:41
+msgid "Reverse headline order (oldest first)"
+msgstr "Motsatt titteloversikt (eldste først)"
+
+#: localized_schema.php:42
+msgid "Enable e-mail digest"
+msgstr "Tillatt e-postsammendrag"
+
+#: localized_schema.php:43
+msgid "Confirm marking feed as read"
+msgstr "Bekreft markeringen av nyhetsstrøm som lest"
 
-#: localized_schema.php:73
-msgid "Show additional information in feedlist"
-msgstr "Vis tilleggsinformasjon i nyhetsstrømslisten"
+#: localized_schema.php:44
+msgid "Mark articles as read automatically"
+msgstr "Marker artikler som leste automatisk"
 
-#: localized_schema.php:74
+#: localized_schema.php:45
 msgid "Strip unsafe tags from articles"
 msgstr "Fjern utrygge html-koder fra artiklene"
 
-#: localized_schema.php:75
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
+#: localized_schema.php:46
+msgid "Blacklisted tags"
+msgstr "Svartelistede stikkord"
 
-#: localized_schema.php:76
-msgid "Use more accessible date/time format for headlines"
-msgstr "Bruk mer brukervennlige dato/tidsformater for artiklene"
+#: localized_schema.php:47
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Maksimal alder på ferske artikler (i timer)"
+
+#: localized_schema.php:48
+msgid "Mark articles in e-mail digest as read"
+msgstr "Marker artikler i e--postsammendrag som leste"
 
-#: localized_schema.php:77
+#: localized_schema.php:49
 msgid "Automatically expand articles in combined mode"
 msgstr "Utvid artikler automatisk i kombinert modus"
 
-#: localized_schema.php:78
+#: localized_schema.php:50
 msgid "Purge unread articles"
 msgstr "Slett uleste artikler"
 
-#: localized_schema.php:79
+#: localized_schema.php:51
 msgid "Show special feeds when hiding read feeds"
 msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 
-#: localized_schema.php:80
-msgid "Prefer more accurate feedlist counters to UI speed"
-msgstr ""
-"Foretrekk en mer treffsikker nyhetsstrømsliste i motsetning til hastighet på "
-"brukergrensesnittet."
-
-#: localized_schema.php:81
-msgid "Enable inline MP3 player"
-msgstr "Skru på den innebygde MP3-spilleren"
-
-#: localized_schema.php:82
-msgid ""
-"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
-msgstr ""
-"Bruk den flashbaserte XSPF spilleren for å spille MP3-formaterte podcaster."
+#: localized_schema.php:52
+msgid "Group headlines in virtual feeds"
+msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
 
-#: localized_schema.php:83
+#: localized_schema.php:53
 msgid "Do not show images in articles"
 msgstr "Ikke vis bilder i artiklene"
 
-#: localized_schema.php:84
+#: localized_schema.php:54
 msgid "Enable external API"
 msgstr ""
 
-#: login_form.php:120 modules/popup-dialog.php:283 modules/pref-feeds.php:168
-#: modules/pref-feeds.php:391 mobile/login_form.php:38
+#: localized_schema.php:55
+msgid "User timezone"
+msgstr ""
+
+#: localized_schema.php:56
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+
+#: localized_schema.php:57 prefs.js:1733
+#, fuzzy
+msgid "Customize stylesheet"
+msgstr "URL til brukerbestemt utseendemal (CSS)"
+
+#: login_form.php:120 mobile/login_form.php:38
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: login_form.php:124 modules/popup-dialog.php:285 modules/pref-feeds.php:173
-#: modules/pref-feeds.php:397 mobile/login_form.php:43
+#: login_form.php:124 mobile/login_form.php:43
 msgid "Password:"
 msgstr "Passord:"
 
@@ -941,7 +871,7 @@ msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
 
-#: opml.php:191 modules/popup-dialog.php:47
+#: opml.php:191 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "DOMXML-utvidelsen ble ikke funnet. Den er påkrevet for PHPversjoner under 5."
@@ -950,38 +880,24 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Returner til innstillinger"
 
-#: prefs.php:75 tt-rss.php:72
-msgid ""
-"Your browser doesn't support Javascript, which is required\n"
-"\t\tfor this application to function properly. Please check your\n"
-"\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."
-
-#: prefs.php:97 help/4.php:14
+#: prefs.php:87 help/4.php:14
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:98
+#: prefs.php:88
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:110 tt-rss.php:97 modules/pref-prefs.php:290 help/3.php:64
+#: prefs.php:100 tt-rss.php:85 modules/pref-prefs.php:267 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: prefs.php:113 modules/pref-feeds.php:959
-msgid "Feeds"
-msgstr "Nyhetsstrømmer"
-
-#: prefs.php:116 help/4.php:11
+#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:123 help/4.php:13
+#: prefs.php:113 help/4.php:13
 msgid "Users"
 msgstr "Brukere"
 
@@ -1039,130 +955,142 @@ msgstr "Kontoen ble opprettet med suksess."
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: tt-rss.php:101
+#: tt-rss.php:89
 msgid "Comments?"
 msgstr "Kommentarer?"
 
-#: tt-rss.php:111
+#: tt-rss.php:99
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: tt-rss.php:137
+#: tt-rss.php:125
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: tt-rss.php:140
+#: tt-rss.php:128
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: tt-rss.php:142
+#: tt-rss.php:131
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:143
+#: tt-rss.php:132
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:144
-msgid "Starred"
-msgstr "Favoritter"
-
-#: tt-rss.php:145
-msgid "Published"
-msgstr "Publisert"
-
-#: tt-rss.php:147
+#: tt-rss.php:136
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: tt-rss.php:148 modules/pref-feeds.php:1123 modules/pref-feeds.php:1176
+#: tt-rss.php:137
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: tt-rss.php:151
+#: tt-rss.php:140
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:476
+#: tt-rss.php:144 modules/pref-filters.php:147
 msgid "Date"
 msgstr "Dato"
 
-#: tt-rss.php:156
+#: tt-rss.php:146
 msgid "Score"
 msgstr "Poeng"
 
-#: tt-rss.php:160 modules/pref-feeds.php:127 modules/pref-feeds.php:356
+#: tt-rss.php:151 modules/pref-feeds.php:309 modules/pref-feeds.php:529
 msgid "Update"
 msgstr "Oppdater"
 
-#: tt-rss.php:170
+#: tt-rss.php:163
 msgid "Search..."
 msgstr "Søk..."
 
-#: tt-rss.php:171
+#: tt-rss.php:164
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: tt-rss.php:172
+#: tt-rss.php:165
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: tt-rss.php:173
+#: tt-rss.php:166
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: tt-rss.php:174
+#: tt-rss.php:167
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: tt-rss.php:175 modules/pref-feeds.php:294 modules/pref-feeds.php:1006
+#: tt-rss.php:168 modules/pref-feeds.php:473 modules/pref-feeds.php:1193
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: tt-rss.php:177
+#: tt-rss.php:169
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: tt-rss.php:179 help/3.php:46
+#: tt-rss.php:171 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: tt-rss.php:182
+#: tt-rss.php:172
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: tt-rss.php:184
+#: tt-rss.php:173
+msgid "Switch to digest..."
+msgstr ""
+
+#: tt-rss.php:174
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
-#: tt-rss.php:186
+#: tt-rss.php:176
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: tt-rss.php:187
+#: tt-rss.php:177
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: modules/backend-rpc.php:967
+#: twitter.php:93
+msgid "Register with Twitter"
+msgstr ""
+
+#: twitter.php:97
+msgid "Could not connect to Twitter. Refresh the page or try again later."
+msgstr ""
+
+#: twitter.php:101
+msgid "Congratulations! You have successfully registered with Twitter."
+msgstr ""
+
+#: twitter.php:113
+#, fuzzy
+msgid "Register"
+msgstr "Registrert"
+
+#: modules/backend-rpc.php:930
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: modules/backend-rpc.php:971
+#: modules/backend-rpc.php:934
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:979
+#: modules/backend-rpc.php:942
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "Passord har blitt endret."
 
-#: modules/backend-rpc.php:992
+#: modules/backend-rpc.php:955
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
@@ -1207,66 +1135,55 @@ msgstr "Feil: Kan ikke laste opp OPMLfil"
 msgid "Error: can't find body element."
 msgstr "Feil: Kan ikke finne hovedelement."
 
-#: modules/popup-dialog.php:9
-#, fuzzy
-msgid "OPML Import"
-msgstr "Importer"
-
-#: modules/popup-dialog.php:36
+#: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: modules/popup-dialog.php:42
+#: modules/popup-dialog.php:40
 #, fuzzy
 msgid "Importing using DOMDocument."
 msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
 
-#: modules/popup-dialog.php:71
-msgid "Settings Profiles"
-msgstr ""
-
-#: modules/popup-dialog.php:78
+#: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:131
+#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
-#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:316
-#: modules/pref-labels.php:169 modules/pref-users.php:387
-msgid "Remove"
-msgstr "Fjern"
+#: modules/popup-dialog.php:166
+#, fuzzy
+msgid "Remove selected profiles"
+msgstr "Fjerne valgte filtre?"
 
-#: modules/popup-dialog.php:153
+#: modules/popup-dialog.php:168
 #, fuzzy
-msgid "Activate"
-msgstr "Tilpasset"
+msgid "Activate profile"
+msgstr "Fjerne valgte filtre?"
 
-#: modules/popup-dialog.php:167
+#: modules/popup-dialog.php:179
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:172
+#: modules/popup-dialog.php:184
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: modules/popup-dialog.php:181 modules/popup-dialog.php:792
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
-#: modules/popup-dialog.php:194
+#: modules/popup-dialog.php:206
 msgid "Notice"
 msgstr "Notis"
 
-#: modules/popup-dialog.php:200
+#: modules/popup-dialog.php:212
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1276,19 +1193,11 @@ msgstr ""
 "ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst "
 "start prosessen eller konakt administratoren."
 
-#: modules/popup-dialog.php:204 modules/popup-dialog.php:224
+#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: modules/popup-dialog.php:212
-msgid ""
-"You are running the latest version of Tiny Tiny RSS. The fact that you are "
-"seeing this dialog is probably a bug."
-msgstr ""
-"Du kjører siste utgave av Tiny Tiny RSS. Det at du ser denne dialogboksen er "
-"mest sannsynlig en feil."
-
-#: modules/popup-dialog.php:220
+#: modules/popup-dialog.php:221
 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 "
@@ -1299,389 +1208,416 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
-#: modules/popup-dialog.php:243
-msgid "Subscribe to Feed"
-msgstr "Abonner på nyhetsstrøm"
-
-#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:408
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:270
+#: modules/pref-feeds.php:490
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: modules/popup-dialog.php:255 modules/pref-feeds.php:108
-#: modules/pref-feeds.php:334
-msgid "URL:"
-msgstr "Nettadresse:"
-
-#: modules/popup-dialog.php:264 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:346
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:301
+#: modules/pref-feeds.php:518
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
-#: modules/popup-dialog.php:272
+#: modules/popup-dialog.php:265
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: modules/popup-dialog.php:280 modules/pref-feeds.php:161
-#: modules/pref-feeds.php:388 modules/pref-prefs.php:246
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:347
+#: modules/pref-feeds.php:561 modules/pref-prefs.php:207
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: modules/popup-dialog.php:295
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:357
+#: modules/pref-feeds.php:565 modules/pref-users.php:438
+msgid "Login"
+msgstr "Logg inn"
+
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:365
+#: modules/pref-feeds.php:571
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
+
+#: modules/popup-dialog.php:294
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:359
+#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: modules/popup-dialog.php:302
+#: modules/popup-dialog.php:300
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: modules/popup-dialog.php:303 modules/popup-dialog.php:361
-#: modules/popup-dialog.php:441 modules/popup-dialog.php:558
-#: modules/popup-dialog.php:627 modules/popup-dialog.php:763
-#: modules/pref-feeds.php:297 modules/pref-feeds.php:453
-#: modules/pref-filters.php:161 modules/pref-users.php:186
+#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
+#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
+#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
+#: modules/popup-dialog.php:814 modules/pref-feeds.php:476
+#: modules/pref-feeds.php:619 modules/pref-filters.php:256
+#: modules/pref-labels.php:80 modules/pref-users.php:186
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: modules/popup-dialog.php:312
-msgid "Feed Browser"
-msgstr "Nyhetsstrømsredigerer"
-
-#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
-#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:306 modules/pref-labels.php:162
-#: modules/pref-users.php:370
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
+#: modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "Søk"
 
-#: modules/popup-dialog.php:335
+#: modules/popup-dialog.php:328
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: modules/popup-dialog.php:336
+#: modules/popup-dialog.php:329
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: modules/popup-dialog.php:339
+#: modules/popup-dialog.php:332
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: modules/popup-dialog.php:381
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:463
+#: modules/pref-filters.php:249 modules/pref-filters.php:411
+#: modules/pref-labels.php:281 modules/pref-users.php:395
+msgid "Remove"
+msgstr "Fjern"
+
+#: modules/popup-dialog.php:365
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:375
 #, fuzzy
 msgid "match on"
 msgstr "Match på:"
 
-#: modules/popup-dialog.php:395
+#: modules/popup-dialog.php:380
 msgid "Title or content"
 msgstr "Tittel eller innhold"
 
-#: modules/popup-dialog.php:404
+#: modules/popup-dialog.php:391
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: modules/popup-dialog.php:420
+#: modules/popup-dialog.php:407
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: modules/popup-dialog.php:454
-msgid "Create Filter"
-msgstr "Lag filter"
-
-#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:407
+#: modules/popup-dialog.php:448 modules/pref-filters.php:138
 msgid "Match"
 msgstr "Match"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:448
+#: modules/popup-dialog.php:455 modules/pref-filters.php:150
 msgid "before"
 msgstr "før"
 
-#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:449
+#: modules/popup-dialog.php:456 modules/pref-filters.php:151
 msgid "after"
 msgstr "etter"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:69
+#: modules/popup-dialog.php:470 modules/pref-filters.php:164
 msgid "Check it"
 msgstr "Sjekk det"
 
-#: modules/popup-dialog.php:496 modules/pref-filters.php:72
+#: modules/popup-dialog.php:473 modules/pref-filters.php:167
 msgid "on field"
 msgstr "På felt:"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:78 digest.js:389
+#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:389
 msgid "in"
 msgstr "i"
 
-#: modules/popup-dialog.php:507 modules/pref-filters.php:83
+#: modules/popup-dialog.php:485 modules/pref-filters.php:179
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: modules/popup-dialog.php:524 modules/pref-filters.php:103
+#: modules/popup-dialog.php:502 modules/pref-filters.php:199
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:184
-#: modules/pref-feeds.php:406 modules/pref-filters.php:122
+#: modules/popup-dialog.php:516 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:577 modules/pref-filters.php:219
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "Alternativer:"
 
-#: modules/popup-dialog.php:543 modules/pref-filters.php:134
+#: modules/popup-dialog.php:520 modules/pref-filters.php:231
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: modules/popup-dialog.php:546 modules/pref-filters.php:143
+#: modules/popup-dialog.php:523 modules/pref-filters.php:240
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
-#: modules/popup-dialog.php:556
+#: modules/popup-dialog.php:530
 msgid "Create"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:570
-msgid "Update Errors"
-msgstr "Oppdaterer feil"
+#: modules/popup-dialog.php:542
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Oppdateringsfeil"
 
-#: modules/popup-dialog.php:573
+#: modules/popup-dialog.php:545
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:599
-msgid "Edit Tags"
-msgstr "Endre Stikkord"
-
-#: modules/popup-dialog.php:604
+#: modules/popup-dialog.php:574
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: modules/popup-dialog.php:626 modules/pref-feeds.php:296
-#: modules/pref-feeds.php:451 modules/pref-filters.php:158
+#: modules/popup-dialog.php:599 modules/popup-dialog.php:812
+#: modules/pref-feeds.php:475 modules/pref-feeds.php:616
+#: modules/pref-filters.php:253 modules/pref-labels.php:78
 #: modules/pref-users.php:184
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/popup-dialog.php:635
+#: modules/popup-dialog.php:607
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 
-#: modules/popup-dialog.php:659
-msgid "Forward article by email"
-msgstr ""
-
-#: modules/popup-dialog.php:701 modules/popup-dialog.php:707
+#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:701
+#: modules/popup-dialog.php:669
 #, fuzzy
 msgid "Multiple articles"
 msgstr "Alle artikler"
 
-#: modules/popup-dialog.php:722
+#: modules/popup-dialog.php:690
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:732
+#: modules/popup-dialog.php:699
 #, fuzzy
 msgid "To:"
 msgstr "Topp"
 
-#: modules/popup-dialog.php:745
+#: modules/popup-dialog.php:712
 #, fuzzy
 msgid "Subject:"
 msgstr "Velg:"
 
-#: modules/popup-dialog.php:762
+#: modules/popup-dialog.php:728
 #, fuzzy
 msgid "Send e-mail"
 msgstr "Skift e-post"
 
-#: modules/popup-dialog.php:783
+#: modules/popup-dialog.php:748
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
+#: modules/popup-dialog.php:775
+#, fuzzy, php-format
+msgid "New version of Tiny Tiny RSS is available (%s)."
+msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
+
+#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#, fuzzy
+msgid "Details"
+msgstr "Daglig"
+
+#: modules/popup-dialog.php:787
+msgid "Download"
+msgstr ""
+
+#: modules/popup-dialog.php:799
+#, php-format
+msgid ""
+"You can override colors, fonts and layout of your currently selected theme "
+"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
+"\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr "Marker for å tillate felt"
 
-#: modules/pref-feeds.php:65
-msgid "Feed Editor"
-msgstr "Nyhetsstrømsredigerer"
+#: modules/pref-feeds.php:276
+#, fuzzy
+msgid "Feed Title"
+msgstr "Tittel"
+
+#: modules/pref-feeds.php:287 modules/pref-feeds.php:505
+msgid "URL:"
+msgstr "Nettadresse:"
 
-#: modules/pref-feeds.php:140 modules/pref-feeds.php:368
+#: modules/pref-feeds.php:324 modules/pref-feeds.php:541
 msgid "using"
 msgstr "bruker"
 
-#: modules/pref-feeds.php:151 modules/pref-feeds.php:379
+#: modules/pref-feeds.php:336 modules/pref-feeds.php:552
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: modules/pref-feeds.php:198 modules/pref-feeds.php:412
+#: modules/pref-feeds.php:369
+msgid ""
+"<b>Hint:</b> you need to fill in your login information if your feed "
+"requires authentication, except for Twitter feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:389 modules/pref-feeds.php:581
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: modules/pref-feeds.php:209 modules/pref-feeds.php:417
+#: modules/pref-feeds.php:400 modules/pref-feeds.php:586
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: modules/pref-feeds.php:221 modules/pref-feeds.php:423
+#: modules/pref-feeds.php:412 modules/pref-feeds.php:592
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: modules/pref-feeds.php:234 modules/pref-feeds.php:429
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:598
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:256 modules/pref-feeds.php:437
-msgid "Cache images locally"
+#: modules/pref-feeds.php:439
+#, fuzzy
+msgid "Cache images locally (SimplePie only)"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:268
+#: modules/pref-feeds.php:447
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: modules/pref-feeds.php:282
+#: modules/pref-feeds.php:461
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:311
-msgid "Multiple Feed Editor"
-msgstr "Nyhetsstrømsredigerer"
+#: modules/pref-feeds.php:606
+msgid "Cache images locally"
+msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:667 modules/pref-feeds.php:720
+#: modules/pref-feeds.php:831 modules/pref-feeds.php:884
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: modules/pref-feeds.php:751
+#: modules/pref-feeds.php:915
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:754
+#: modules/pref-feeds.php:918
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:757
+#: modules/pref-feeds.php:921
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:780
+#: modules/pref-feeds.php:944
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: modules/pref-feeds.php:859
-msgid "Category editor"
-msgstr "Kategoriredigerer"
-
-#: modules/pref-feeds.php:867
+#: modules/pref-feeds.php:1026
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
 
-#: modules/pref-feeds.php:885
+#: modules/pref-feeds.php:1042
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:1112
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:994 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1118
+#, fuzzy
+msgid "Remove selected categories"
+msgstr "Fjerne valgte kategorier?"
+
+#: modules/pref-feeds.php:1142
+#, fuzzy
+msgid "Feeds with errors"
+msgstr "Nyhetsstrømsredigerer"
+
+#: modules/pref-feeds.php:1159 modules/pref-filters.php:396
+#: modules/pref-labels.php:269 modules/pref-users.php:379
+#, fuzzy
+msgid "Select"
+msgstr "Velg:"
+
+#: modules/pref-feeds.php:1171 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1173
 #, fuzzy
-msgid "Edit feeds"
-msgstr "Rediger nyhetsstrømmen"
+msgid "Edit selected feeds"
+msgstr "Sletter den valgte nyhetsstrømmen..."
+
+#: modules/pref-feeds.php:1175 modules/pref-feeds.php:1185
+#, fuzzy
+msgid "Reset sort order"
+msgstr "Nullstill passordet"
 
-#: modules/pref-feeds.php:1002
+#: modules/pref-feeds.php:1180
+#, fuzzy
+msgid "Categories"
+msgstr "Kategori:"
+
+#: modules/pref-feeds.php:1183
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1198
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1202
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1206
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
+#: modules/pref-feeds.php:1207 modules/pref-filters.php:415
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: modules/pref-feeds.php:1105
-msgid "Show last article times"
-msgstr "Vis tidspunktene for siste artikkel"
-
-#: modules/pref-feeds.php:1120 modules/pref-feeds.php:1172
-msgid "Last&nbsp;Article"
-msgstr "Siste&nbsp;Artikkel"
-
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
-#: modules/pref-users.php:466
-msgid "Click to edit"
-msgstr "Trykk for å endre"
-
-#: modules/pref-feeds.php:1231
-#, fuzzy
-msgid "You don't have any subscribed feeds."
-msgstr "Du kan ikke fjerne abonnement fra kategorien."
-
-#: modules/pref-feeds.php:1233
-#, fuzzy
-msgid "No matching feeds found."
-msgstr "Ingen filtre ble funnet."
+#: modules/pref-feeds.php:1246
+msgid "<b>Hint:</b> you can drag feeds and categories around."
+msgstr ""
 
-#: modules/pref-feeds.php:1241
+#: modules/pref-feeds.php:1251
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1253
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1245
+#: modules/pref-feeds.php:1255
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1260
+#: modules/pref-feeds.php:1270
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1264
+#: modules/pref-feeds.php:1271
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1266
+#: modules/pref-feeds.php:1274
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1690,23 +1626,23 @@ 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."
 
-#: modules/pref-feeds.php:1268
+#: modules/pref-feeds.php:1276
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1271 modules/pref-feeds.php:1317
+#: modules/pref-feeds.php:1279 modules/pref-feeds.php:1325
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: modules/pref-feeds.php:1278
+#: modules/pref-feeds.php:1286
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1280
+#: modules/pref-feeds.php:1288
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1714,36 +1650,36 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1295
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: modules/pref-feeds.php:1295
+#: modules/pref-feeds.php:1303
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1297
+#: modules/pref-feeds.php:1305
 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 ""
 
-#: modules/pref-feeds.php:1301
+#: modules/pref-feeds.php:1309
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1305
+#: modules/pref-feeds.php:1313
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1309
+#: modules/pref-feeds.php:1317
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: modules/pref-feeds.php:1311
+#: modules/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."
@@ -1751,196 +1687,192 @@ 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."
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1328
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1427
+#: modules/pref-feeds.php:1334
+#, fuzzy
+msgid "Twitter"
+msgstr "Tittel"
+
+#: modules/pref-feeds.php:1343
+msgid ""
+"Before you can update your Twitter feeds, you must register this instance of "
+"Tiny Tiny RSS with Twitter.com."
+msgstr ""
+
+#: modules/pref-feeds.php:1345
+msgid ""
+"You have been successfully registered with Twitter.com and should be able to "
+"access your Twitter feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1349
+msgid "Register with Twitter.com"
+msgstr ""
+
+#: modules/pref-feeds.php:1355
+#, fuzzy
+msgid "Clear stored credentials"
+msgstr "Slett nyhetsstrømsdata"
+
+#: modules/pref-feeds.php:1465
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: modules/pref-feeds.php:1456
+#: modules/pref-feeds.php:1494
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: modules/pref-filters.php:12
-msgid "Filter Editor"
-msgstr "Filteradministrering"
-
-#: modules/pref-filters.php:262
+#: modules/pref-filters.php:358
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: modules/pref-filters.php:313 modules/pref-users.php:385
+#: modules/pref-filters.php:408 modules/pref-users.php:393
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-filters.php:409
-msgid "Field"
-msgstr "Felt"
-
-#: modules/pref-filters.php:410
-msgid "Params"
-msgstr "Parametre"
-
-#: modules/pref-filters.php:483
-msgid "(Disabled)"
-msgstr "(Avskrudd)"
+#: modules/pref-labels.php:21
+msgid "Caption"
+msgstr "Overskrift"
 
-#: modules/pref-filters.php:499
-msgid "(Inverse)"
-msgstr "(Motsatt)"
+#: modules/pref-labels.php:36
+#, fuzzy
+msgid "Colors"
+msgstr "Steng"
 
-#: modules/pref-filters.php:519
-msgid "No filters defined."
-msgstr "Ingen filtre er valgt"
+#: modules/pref-labels.php:41
+#, fuzzy
+msgid "Foreground:"
+msgstr "Forgrunn"
 
-#: modules/pref-filters.php:521
-msgid "No matching filters found."
-msgstr "Ingen filtre ble funnet."
+#: modules/pref-labels.php:41
+#, fuzzy
+msgid "Background:"
+msgstr "bakgrunn"
 
-#: modules/pref-labels.php:118
+#: modules/pref-labels.php:231
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
-#: modules/pref-labels.php:166 help/3.php:32 help/4.php:26
+#: modules/pref-labels.php:278 help/3.php:32 help/4.php:26
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: modules/pref-labels.php:172
+#: modules/pref-labels.php:284
 msgid "Clear colors"
 msgstr "Fjern farger"
 
-#: modules/pref-labels.php:246
-msgid "Click to change color"
-msgstr "Trykk for å endre farge"
-
-#: modules/pref-labels.php:269
-msgid "No labels defined."
-msgstr "Ingen merkelapper er valgt"
-
-#: modules/pref-labels.php:271
-msgid "No matching labels found."
-msgstr "Ingen passende merkelapper ble funnet."
-
-#: modules/pref-labels.php:332
-msgid "custom color:"
-msgstr "valgfri farge:"
-
-#: modules/pref-labels.php:333
-msgid "foreground"
-msgstr "Forgrunn"
-
-#: modules/pref-labels.php:334
-msgid "background"
-msgstr "bakgrunn"
-
-#: modules/pref-prefs.php:38
+#: modules/pref-prefs.php:31
 msgid "Old password cannot be blank."
 msgstr "Gammelt passord kan ikke være blankt."
 
-#: modules/pref-prefs.php:43
+#: modules/pref-prefs.php:36
 msgid "New password cannot be blank."
 msgstr "Nytt passord kan ikke vært blankt."
 
-#: modules/pref-prefs.php:48
+#: modules/pref-prefs.php:41
 msgid "Entered passwords do not match."
 msgstr "Innskrivne passord matcher ikke."
 
-#: modules/pref-prefs.php:75
+#: modules/pref-prefs.php:65
 msgid "Password has been changed."
 msgstr "Passord har blitt endret."
 
-#: modules/pref-prefs.php:77
+#: modules/pref-prefs.php:67
 msgid "Old password is incorrect."
 msgstr "Gammelt passord er feil"
 
-#: modules/pref-prefs.php:105
+#: modules/pref-prefs.php:95
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: modules/pref-prefs.php:121
+#: modules/pref-prefs.php:111
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: modules/pref-prefs.php:134
+#: modules/pref-prefs.php:124
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:174
-msgid ""
-"Your password is at default value, \n"
-"\t\t\t\t\t\tplease change it."
-msgstr ""
-"Passordet ditt er et standardpassord, \n"
-"\t\t\t\t\t\tVennligst bytt."
-
-#: modules/pref-prefs.php:199
+#: modules/pref-prefs.php:156
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: modules/pref-prefs.php:212
+#: modules/pref-prefs.php:183
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:219
+#: modules/pref-prefs.php:187
 msgid "E-mail"
 msgstr "E-post"
 
-#: modules/pref-prefs.php:230
+#: modules/pref-prefs.php:192
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:202
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: modules/pref-prefs.php:253
+#: modules/pref-prefs.php:214
+#, fuzzy
+msgid "Your password is at default value, please change it."
+msgstr ""
+"Passordet ditt er et standardpassord, \n"
+"\t\t\t\t\t\tVennligst bytt."
+
+#: modules/pref-prefs.php:242
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:245
 msgid "New password"
 msgstr "Nytt passord"
 
-#: modules/pref-prefs.php:268
+#: modules/pref-prefs.php:250
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: modules/pref-prefs.php:284
+#: modules/pref-prefs.php:260
 msgid "Change password"
 msgstr "Endre passord"
 
-#: modules/pref-prefs.php:343
+#: modules/pref-prefs.php:341
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: modules/pref-prefs.php:409 modules/pref-prefs.php:414
+#: modules/pref-prefs.php:399
+msgid "Customize"
+msgstr ""
+
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:411 modules/pref-prefs.php:414
+#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
 msgid "No"
 msgstr "Nei"
 
-#: modules/pref-prefs.php:435
+#: modules/pref-prefs.php:456
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: modules/pref-prefs.php:438
+#: modules/pref-prefs.php:459
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:441
+#: modules/pref-prefs.php:462
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
@@ -1956,7 +1888,7 @@ msgstr "Brukerdetaljer"
 msgid "User not found"
 msgstr "Brukeren ble  ikke funnet"
 
-#: modules/pref-users.php:53 modules/pref-users.php:437
+#: modules/pref-users.php:53 modules/pref-users.php:440
 msgid "Registered"
 msgstr "Registrert"
 
@@ -2026,36 +1958,31 @@ msgstr "Gir beskjed til <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
-#: modules/pref-users.php:379 help/4.php:27
+#: modules/pref-users.php:387 help/4.php:27
 msgid "Create user"
 msgstr "Lag bruker"
 
-#: modules/pref-users.php:383
-#, fuzzy
-msgid "Details"
-msgstr "Daglig"
-
-#: modules/pref-users.php:389
+#: modules/pref-users.php:397
 msgid "Reset password"
 msgstr "Nullstill passordet"
 
-#: modules/pref-users.php:435
-msgid "Login"
-msgstr "Logg inn"
-
-#: modules/pref-users.php:436
+#: modules/pref-users.php:439
 msgid "Access Level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-users.php:438
+#: modules/pref-users.php:441
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: modules/pref-users.php:486
+#: modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "Trykk for å endre"
+
+#: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "Ingen brukere er valgt"
 
-#: modules/pref-users.php:488
+#: modules/pref-users.php:491
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
@@ -2129,6 +2056,18 @@ msgstr "Vis søkevinduet"
 msgid "Active article actions"
 msgstr "Handlinger for aktive artikler"
 
+#: help/3.php:16
+msgid "Toggle starred"
+msgstr "Sett som favoritt"
+
+#: help/3.php:17
+msgid "Toggle published"
+msgstr "Sett som publisert"
+
+#: help/3.php:18
+msgid "Toggle unread"
+msgstr "Sett som ulest"
+
 #: help/3.php:19
 msgid "Edit tags"
 msgstr "Endre stikkord"
@@ -2180,14 +2119,15 @@ msgid "Feed actions"
 msgstr "Nyhetsstrømshandlinger"
 
 #: help/3.php:44
-msgid "Update active feed"
+#, fuzzy
+msgid "Refresh active feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
 #: help/3.php:45
 msgid "Update all feeds"
 msgstr "Oppdater alle nyhetsstrømmer"
 
-#: help/3.php:48
+#: help/3.php:48 FeedTree.js:122
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
@@ -2220,7 +2160,11 @@ msgstr "Gå til..."
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: help/3.php:70 help/4.php:41
+#: help/3.php:70
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/3.php:72 help/4.php:41
 msgid "Press any key to close this window."
 msgstr "Trykk på en knapp for å lukk dette vinduet"
 
@@ -2296,7 +2240,7 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Sort feeds by unread count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: digest.js:24 tt-rss.js:509 tt-rss.js:522
+#: digest.js:24 tt-rss.js:523 tt-rss.js:536
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
@@ -2310,15 +2254,15 @@ msgstr "Marker %d artikkel/artikler som leste?"
 msgid "Error: unable to load article."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: digest.js:402 digest.js:647 viewfeed.js:444
+#: digest.js:402 digest.js:651 viewfeed.js:437
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
-#: digest.js:404 digest.js:651 viewfeed.js:449
+#: digest.js:404 digest.js:655 viewfeed.js:442
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
-#: digest.js:407 digest.js:682 viewfeed.js:482
+#: digest.js:407 digest.js:686 viewfeed.js:475
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
@@ -2327,355 +2271,638 @@ msgstr "Fjern publiseringen av artikkelen."
 msgid "Click to expand article."
 msgstr "Trykk for å utvide artikkel"
 
-#: digest.js:438
+#: digest.js:439
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
 
-#: digest.js:483
+#: digest.js:484
 msgid "%d more..."
 msgstr ""
 
-#: digest.js:588
+#: digest.js:491
+#, fuzzy
+msgid "No unread feeds."
+msgstr "Skjul/vis leste nyhetsstrømmer"
+
+#: digest.js:591
 #, fuzzy
 msgid "Load more..."
 msgstr "Laster hjelp..."
 
-#: feedlist.js:271
+#: feedlist.js:276
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: functions.js:502
-msgid "Can't add filter: nothing to match on."
-msgstr "Kan ikke legge til filter, ingen match på kriteriene"
+#: FeedTree.js:128
+#, fuzzy
+msgid "Update feed"
+msgstr "Oppdater alle nyhetsstrømmer"
 
-#: functions.js:562
-msgid "Can't subscribe: no feed URL given."
-msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
+#: functions.js:615
+msgid "Date syntax appears to be correct."
+msgstr ""
 
-#: functions.js:566
+#: functions.js:621
+#, fuzzy
+msgid "Date syntax is incorrect."
+msgstr "Gammelt passord er feil"
+
+#: functions.js:756
+#, fuzzy
+msgid "Remove stored feed icon?"
+msgstr "Fjern lagrede data"
+
+#: functions.js:788
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Vennligst velg en nyhetsstrøm"
+
+#: functions.js:790
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: functions.js:807
+msgid "Please enter label caption:"
+msgstr "Vennligst skriv inn merkelappstekst:"
+
+#: functions.js:812
+msgid "Can't create label: missing caption."
+msgstr "Kan ikke skape merkelapp, mangler overskrift."
+
+#: functions.js:854
+msgid "Subscribe to Feed"
+msgstr "Abonner på nyhetsstrøm"
+
+#: functions.js:862
 msgid "Subscribing to feed..."
 msgstr "Abonnerer på nyhetsstrømmen..."
 
-#: functions.js:581
+#: functions.js:871
 msgid "Server error while trying to subscribe to specified feed."
 msgstr ""
 
-#: functions.js:595
+#: functions.js:885
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: functions.js:604
+#: functions.js:890
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: functions.js:607
+#: functions.js:893
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: functions.js:633
+#: functions.js:904
+#, fuzzy
+msgid "Server error while trying to query feed URLs."
+msgstr "Feil under forsøk på å hente flere overskrifter"
+
+#: functions.js:934
 #, fuzzy
 msgid "Couldn't download the specified URL."
 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
-#: functions.js:636
+#: functions.js:937
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: functions.js:1031
-#, fuzzy
-msgid "Subscribed to %d feed(s)."
-msgstr "Abonnerer på følgende nyhetsstrømmer:"
-
-#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
-#: prefs.js:932 prefs.js:952 prefs.js:1651
-msgid "No feeds are selected."
-msgstr "Ingen nyhetsstrømmer er valgt"
-
-#: functions.js:1056
-msgid ""
-"Remove selected feeds from the archive? Feeds with stored articles will not "
-"be removed."
-msgstr ""
-
-#: functions.js:1108
-#, fuzzy
-msgid "Remove stored feed icon?"
-msgstr "Fjern lagrede data"
-
-#: functions.js:1140
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "Vennligst velg en nyhetsstrøm"
-
-#: functions.js:1142
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: functions.js:1159
-msgid "Please enter label caption:"
-msgstr "Vennligst skriv inn merkelappstekst:"
-
-#: functions.js:1164
-msgid "Can't create label: missing caption."
-msgstr "Kan ikke skape merkelapp, mangler overskrift."
+#: functions.js:966
+msgid "Create Filter"
+msgstr "Lag filter"
 
-#: functions.js:1209 tt-rss.js:397
+#: functions.js:1019 tt-rss.js:408
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: functions.js:1326
+#: functions.js:1136
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: functions.js:1357
+#: functions.js:1167
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: prefs.js:220
-msgid "Error: No feed URL given."
-msgstr "Feil: Ingen nyhetsstrømsadresse ble oppgitt."
+#: functions.js:1352 tt-rss.js:387 tt-rss.js:849
+msgid "You can't edit this kind of feed."
+msgstr "Du kan ikke endre denne typen nyhetsstrøm"
+
+#: functions.js:1364
+#, fuzzy
+msgid "Edit Feed"
+msgstr "Rediger nyhetsstrømmen"
 
-#: prefs.js:222
-msgid "Error: Invalid feed URL."
-msgstr "Feil: Ugyldig nyhetsstrømsadresse."
+#: functions.js:1401
+#, fuzzy
+msgid "More Feeds"
+msgstr "Flere nyhetsstrømmer"
 
-#: prefs.js:250
+#: functions.js:1438
 #, fuzzy
-msgid "Can't add profile: no name specified."
-msgstr "Kan ikke legge til kategori: mangler navn"
+msgid "Subscribed to %d feed(s)."
+msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: prefs.js:272
-msgid "Can't add category: no name specified."
-msgstr "Kan ikke legge til kategori: mangler navn"
+#: functions.js:1446 prefs.js:416 prefs.js:446 prefs.js:478 prefs.js:664
+#: prefs.js:684 prefs.js:1363
+msgid "No feeds are selected."
+msgstr "Ingen nyhetsstrømmer er valgt"
+
+#: functions.js:1486
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
+
+#: PrefFilterTree.js:32
+#, fuzzy
+msgid "Inverse"
+msgstr "(Motsatt)"
 
-#: prefs.js:294
+#: prefs.js:105
 msgid "Please enter login:"
 msgstr "Vennligst skriv inn brukernavn:"
 
-#: prefs.js:301
+#: prefs.js:112
 msgid "Can't create user: no login specified."
 msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
-#: prefs.js:450
+#: prefs.js:174
+#, fuzzy
+msgid "Edit Filter"
+msgstr "Filtre"
+
+#: prefs.js:178
+msgid "Remove filter %s?"
+msgstr "Fjerne %s filteret?"
+
+#: prefs.js:297
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
-#: prefs.js:466
+#: prefs.js:313 prefs.js:1404
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: prefs.js:480
+#: prefs.js:327
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
+#: prefs.js:344 prefs.js:554 prefs.js:575 prefs.js:614
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: prefs.js:515
+#: prefs.js:362
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: prefs.js:531 prefs.js:912
+#: prefs.js:378 prefs.js:644
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: prefs.js:550
+#: prefs.js:397
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: prefs.js:584
+#: prefs.js:431
 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 
-#: prefs.js:590
+#: prefs.js:437
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 
-#: prefs.js:612
+#: prefs.js:459
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
 
-#: prefs.js:644
+#: prefs.js:491 prefs.js:1436
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: prefs.js:660
+#: prefs.js:507
 #, fuzzy
 msgid "No profiles selected."
 msgstr "Ingen artikkel er valgt."
 
-#: prefs.js:672
-msgid "Remove selected categories?"
-msgstr "Fjerne valgte kategorier?"
-
-#: prefs.js:690
-msgid "No categories are selected."
-msgstr "Ingen kategorier er valgt."
-
-#: prefs.js:744
+#: prefs.js:525
 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 
-#: prefs.js:827 prefs.js:848 prefs.js:887
+#: prefs.js:559 prefs.js:580 prefs.js:619
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: prefs.js:852
+#: prefs.js:584
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
-#: prefs.js:917
+#: prefs.js:649
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: prefs.js:993
-msgid "No OPML file to upload."
-msgstr "Ingen OPML-fil til å lastes opp."
+#: prefs.js:698
+#, fuzzy
+msgid "Edit Multiple Feeds"
+msgstr "Nyhetsstrømsredigerer"
+
+#: prefs.js:722
+msgid "Save changes to selected feeds?"
+msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
+
+#: prefs.js:793
+#, fuzzy
+msgid "OPML Import"
+msgstr "Importer"
+
+#: prefs.js:812
+#, fuzzy
+msgid "Please choose an OPML file first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: prefs.js:1170
+#: prefs.js:956
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: prefs.js:1498
+#: prefs.js:1173
+#, fuzzy
+msgid "Feed Categories"
+msgstr "Kategori:"
+
+#: prefs.js:1182
+msgid "Remove selected categories?"
+msgstr "Fjerne valgte kategorier?"
+
+#: prefs.js:1201
+msgid "No categories are selected."
+msgstr "Ingen kategorier er valgt."
+
+#: prefs.js:1240
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
-#: prefs.js:1534
-msgid "Save current configuration?"
-msgstr "Lagre nåværende konfigurasjon?"
-
-#: prefs.js:1635
+#: prefs.js:1347
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: prefs.js:1658
+#: prefs.js:1370
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
-#: prefs.js:1677
-msgid "Remove filter %s?"
-msgstr "Fjerne %s filteret?"
-
-#: prefs.js:1707
-msgid "Save changes to selected feeds?"
-msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
-
-#: prefs.js:1787
-msgid "Reset label colors to default?"
+#: prefs.js:1390
+#, fuzzy
+msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 
-#: prefs.js:1812
-msgid "Please enter new label foreground color:"
-msgstr "Vennligst legg inn forgrunnsfarge for merkelappen:"
+#: prefs.js:1427
+msgid "Settings Profiles"
+msgstr ""
 
-#: prefs.js:1814
-msgid "Please enter new label background color:"
-msgstr "Vennligst skriv inn bakgrunnsfarge for merkelappen:"
+#: prefs.js:1454
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "Ingen artikkel er valgt."
 
-#: prefs.js:1946
+#: prefs.js:1462 prefs.js:1515
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 
-#: prefs.js:1962
+#: prefs.js:1478 prefs.js:1531
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1986
+#: prefs.js:1539
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: tt-rss.js:161
+#: prefs.js:1640
+msgid "Label Editor"
+msgstr "Merkelappredigerer"
+
+#: prefs.js:1704
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
+
+#: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
-#: tt-rss.js:386
+#: tt-rss.js:397
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: tt-rss.js:391 tt-rss.js:537 tt-rss.js:665 tt-rss.js:1128
+#: tt-rss.js:402 tt-rss.js:610 tt-rss.js:1068
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: tt-rss.js:542
-msgid "You can't edit this kind of feed."
-msgstr "Du kan ikke endre denne typen nyhetsstrøm"
-
-#: tt-rss.js:660
+#: tt-rss.js:605
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: tt-rss.js:670
+#: tt-rss.js:615
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: viewfeed.js:673 viewfeed.js:711 viewfeed.js:748 viewfeed.js:809
-#: viewfeed.js:841 viewfeed.js:957 viewfeed.js:1000 viewfeed.js:1049
-#: viewfeed.js:1860
+#: tt-rss.js:1108
+#, fuzzy
+msgid "New version available!"
+msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
+
+#: viewfeed.js:666 viewfeed.js:704 viewfeed.js:741 viewfeed.js:803
+#: viewfeed.js:835 viewfeed.js:951 viewfeed.js:995 viewfeed.js:1045
+#: viewfeed.js:1846
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: viewfeed.js:937
+#: viewfeed.js:931
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 
-#: viewfeed.js:966
+#: viewfeed.js:960
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: viewfeed.js:968
+#: viewfeed.js:962
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: viewfeed.js:1009
+#: viewfeed.js:1004
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: viewfeed.js:1012
+#: viewfeed.js:1007
 msgid "Move %d archived articles back?"
 msgstr ""
 
-#: viewfeed.js:1055
+#: viewfeed.js:1051
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: viewfeed.js:1536
+#: viewfeed.js:1084
+#, fuzzy
+msgid "Edit article Tags"
+msgstr "Endre Stikkord"
+
+#: viewfeed.js:1518
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: viewfeed.js:1571
+#: viewfeed.js:1553
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
-#: viewfeed.js:1573
+#: viewfeed.js:1555
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
-#: viewfeed.js:1658
+#: viewfeed.js:1644
 #, fuzzy
 msgid "Unable to load article."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: viewfeed.js:1719
+#: viewfeed.js:1705
 #, fuzzy
 msgid "Loading..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: viewfeed.js:1843
+#: viewfeed.js:1829
 msgid "Please enter a note for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
+#: viewfeed.js:1860
+msgid "Forward article by email"
+msgstr ""
+
+#: viewfeed.js:2244
+#, fuzzy
+msgid "View article"
+msgstr "Filtrer artikkel"
+
+#: viewfeed.js:2250
+#, fuzzy
+msgid "View in a new tab"
+msgstr "Åpne artikkel i nytt nettleservindu"
+
+#: viewfeed.js:2258
+#, fuzzy
+msgid "Open original article"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#, fuzzy
+#~ msgid "Fatal Exception"
+#~ msgstr "Alvorlig feil"
+
+#, fuzzy
+#~ msgid "Add category..."
+#~ msgstr "Legger til kategori for nyhetsstrømmer"
+
+#~ msgid "audio/mpeg"
+#~ msgstr "Lyd/mpeg"
+
+#, fuzzy
+#~ msgid "Add label..."
+#~ msgstr "Legger til kategori for nyhetsstrømmer"
+
+#~ msgid "General"
+#~ msgstr "Generelt"
+
+#~ msgid "Enable offline reading"
+#~ msgstr "Tillatt lesning uten internett-tilgang"
+
+#~ msgid "Synchronize new articles for offline reading using Google Gears."
+#~ msgstr ""
+#~ "Synkroniser nye artikler for å kunne bytte modus til å kunne lese uten "
+#~ "internett-tilgang med Google Gears."
+
+#~ msgid "Interface"
+#~ msgstr "Grensesnitt"
+
+#~ msgid "Default article limit"
+#~ msgstr "Standard artikkelbegrensning"
+
+#~ msgid ""
+#~ "Default limit for articles to display, any custom number you like (0 - "
+#~ "disables)."
+#~ msgstr ""
+#~ "Standard begrensning for artikler som skal vises, valgfritt antall (0 - "
+#~ "fjerner funksjonen)."
+
+#~ msgid "Enable search toolbar"
+#~ msgstr "Vis søkelinjen"
+
+#~ msgid "Open article links in new browser window"
+#~ msgstr "Åpne artikkel-lenker i nytt nettleservindu"
+
+#~ msgid ""
+#~ "Link to user stylesheet to override default style, disabled if empty."
+#~ msgstr ""
+#~ "Lenke til brukerbestemt utseendemal for å overstyre standarden, avskrudd "
+#~ "hvis tomt felt."
+
+#~ msgid "Hide feedlist"
+#~ msgstr "Skjul nyhetskanalslisten"
+
+#~ msgid ""
+#~ "This option hides feedlist and allows it to be toggled on the fly, useful "
+#~ "for small screens."
+#~ msgstr ""
+#~ "Dette valget skjuler kanallisten og tillater at den vises etter ønske, "
+#~ "brukbart for små skjermer."
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Enable feed icons"
+#~ msgstr "Bruk nyhetsstrømsikoner"
+
+#~ msgid "Enable labels"
+#~ msgstr "Tillat merkelapper"
+
+#~ msgid ""
+#~ "Experimental support for virtual feeds based on user crafted SQL queries. "
+#~ "This feature is highly experimental and at this point not user friendly. "
+#~ "Use with caution."
+#~ msgstr ""
+#~ "Eksperimentel støtte for virtuelle nyhetsstrømmer basert på brukerlagde "
+#~ "SQL-spørringer. Denne funksjonen er veldig eksperimentel og er på "
+#~ "nåværende tidspunkt ikke brukervennlig. Benytt med varsomhet."
+
+#~ msgid "Show additional information in feedlist"
+#~ msgstr "Vis tilleggsinformasjon i nyhetsstrømslisten"
+
+#~ msgid "Prefer more accurate feedlist counters to UI speed"
+#~ msgstr ""
+#~ "Foretrekk en mer treffsikker nyhetsstrømsliste i motsetning til hastighet "
+#~ "på brukergrensesnittet."
+
+#~ msgid "Enable inline MP3 player"
+#~ msgstr "Skru på den innebygde MP3-spilleren"
+
+#~ msgid ""
+#~ "Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
+#~ msgstr ""
+#~ "Bruk den flashbaserte XSPF spilleren for å spille MP3-formaterte "
+#~ "podcaster."
+
+#~ msgid ""
+#~ "Your browser doesn't support Javascript, which is required\n"
+#~ "\t\tfor this application to function properly. Please check your\n"
+#~ "\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."
+
+#, fuzzy
+#~ msgid "Activate"
+#~ msgstr "Tilpasset"
+
+#~ msgid ""
+#~ "You are running the latest version of Tiny Tiny RSS. The fact that you "
+#~ "are seeing this dialog is probably a bug."
+#~ msgstr ""
+#~ "Du kjører siste utgave av Tiny Tiny RSS. Det at du ser denne dialogboksen "
+#~ "er mest sannsynlig en feil."
+
+#~ msgid "Feed Browser"
+#~ msgstr "Nyhetsstrømsredigerer"
+
+#~ msgid "Update Errors"
+#~ msgstr "Oppdaterer feil"
+
+#~ msgid "Category editor"
+#~ msgstr "Kategoriredigerer"
+
+#, fuzzy
+#~ msgid "Edit feeds"
+#~ msgstr "Rediger nyhetsstrømmen"
+
+#~ msgid "Show last article times"
+#~ msgstr "Vis tidspunktene for siste artikkel"
+
+#~ msgid "Last&nbsp;Article"
+#~ msgstr "Siste&nbsp;Artikkel"
+
+#, fuzzy
+#~ msgid "You don't have any subscribed feeds."
+#~ msgstr "Du kan ikke fjerne abonnement fra kategorien."
+
+#, fuzzy
+#~ msgid "No matching feeds found."
+#~ msgstr "Ingen filtre ble funnet."
+
+#~ msgid "Filter Editor"
+#~ msgstr "Filteradministrering"
+
+#~ msgid "Field"
+#~ msgstr "Felt"
+
+#~ msgid "Params"
+#~ msgstr "Parametre"
+
+#~ msgid "(Disabled)"
+#~ msgstr "(Avskrudd)"
+
+#~ msgid "No filters defined."
+#~ msgstr "Ingen filtre er valgt"
+
+#~ msgid "No matching filters found."
+#~ msgstr "Ingen filtre ble funnet."
+
+#~ msgid "Click to change color"
+#~ msgstr "Trykk for å endre farge"
+
+#~ msgid "No labels defined."
+#~ msgstr "Ingen merkelapper er valgt"
+
+#~ msgid "No matching labels found."
+#~ msgstr "Ingen passende merkelapper ble funnet."
+
+#~ msgid "custom color:"
+#~ msgstr "valgfri farge:"
+
+#~ msgid "Can't add filter: nothing to match on."
+#~ msgstr "Kan ikke legge til filter, ingen match på kriteriene"
+
+#~ msgid "Can't subscribe: no feed URL given."
+#~ msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
+
+#~ msgid "Error: No feed URL given."
+#~ msgstr "Feil: Ingen nyhetsstrømsadresse ble oppgitt."
+
+#~ msgid "Error: Invalid feed URL."
+#~ msgstr "Feil: Ugyldig nyhetsstrømsadresse."
+
+#, fuzzy
+#~ msgid "Can't add profile: no name specified."
+#~ msgstr "Kan ikke legge til kategori: mangler navn"
+
+#~ msgid "Can't add category: no name specified."
+#~ msgstr "Kan ikke legge til kategori: mangler navn"
+
+#~ msgid "No OPML file to upload."
+#~ msgstr "Ingen OPML-fil til å lastes opp."
+
+#~ msgid "Save current configuration?"
+#~ msgstr "Lagre nåværende konfigurasjon?"
+
+#~ msgid "Please enter new label foreground color:"
+#~ msgstr "Vennligst legg inn forgrunnsfarge for merkelappen:"
+
+#~ msgid "Please enter new label background color:"
+#~ msgstr "Vennligst skriv inn bakgrunnsfarge for merkelappen:"
+
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Lagret filter <b>%s</b>"
 
@@ -2683,15 +2910,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "Tiny Tiny RSS"
 #~ msgstr "Returner til Tiny Tiny RSS"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Marker utvalg:"
-
-#~ msgid "Selection:"
-#~ msgstr "Utvalg:"
-
-#~ msgid "Feed:"
-#~ msgstr "Nyhetsstrøm:"
-
 #~ msgid "Click to collapse category"
 #~ msgstr "Velg for å slå sammen kategorien"
 
@@ -2726,17 +2944,9 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgstr "Benytt modus for lesning med internett-tilgang"
 
 #, fuzzy
-#~ msgid "Categories:"
-#~ msgstr "Kategori:"
-
-#, fuzzy
 #~ msgid "Toggle reordering mode"
 #~ msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#, fuzzy
-#~ msgid "Reset order"
-#~ msgstr "Nullstill passordet"
-
 #~ msgid "Reset UI layout"
 #~ msgstr "Tilbakestill de grafiske instillingene"
 
@@ -2904,9 +3114,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "Entire feed"
 #~ msgstr "Hele nyhetsstrømmen"
 
-#~ msgid "Error while trying to load more headlines"
-#~ msgstr "Feil under forsøk på å hente flere overskrifter"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "Feilet med å åpne artikkel i nytt nettleservindu."
 
@@ -2929,9 +3136,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "Please wait until operation finishes."
 #~ msgstr "Vennligst venn til operasjonen avsluttes."
 
-#~ msgid "Purging selected feed..."
-#~ msgstr "Sletter den valgte nyhetsstrømmen..."
-
 #~ msgid "Remove selected articles from label?"
 #~ msgstr "Fjerne merkede artikler fra merkelappen?"
 
@@ -3011,9 +3215,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ "Du kan ikke benytte tilgang til lesning uten internett-tilgang før du "
 #~ "bytter til denne modusen neste gang. Les med internett-tilgang?"
 
-#~ msgid "Display original article content"
-#~ msgstr "Vis opprinnelig artikkelinnhold"
-
 #~ msgid "All feeds updated."
 #~ msgstr "Alle nyhetsstrømmer er oppdatert"
 
@@ -3042,18 +3243,12 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "You can't clear this type of feed."
 #~ msgstr "Du kan ikke rydde opp i denne typen nyhetsstrøm"
 
-#~ msgid "Clear articles"
-#~ msgstr "Fjern artikler"
-
 #~ msgid "Adding category <b>%s</b>...<br>"
 #~ msgstr "Legger til kategori <b>%s</b>...<br>"
 
 #~ msgid "Done."
 #~ msgstr "Ferdig."
 
-#~ msgid "Close"
-#~ msgstr "Steng"
-
 #~ msgid "The configuration was reset to defaults."
 #~ msgstr "Konfigurasjonen er satt tilbake til standard"
 
@@ -3335,9 +3530,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "Content Filtering"
 #~ msgstr "Innholdsfilter"
 
-#~ msgid "Label Editor"
-#~ msgstr "Merkelappredigerer"
-
 #~ msgid "User Manager"
 #~ msgstr "Brukeradministrering"
 
@@ -3421,9 +3613,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ "installasjonen. Vennligst kontakt sideadministratoren eller rediger "
 #~ "konfigurasjonsfilen for å åpne for denne funksjonaliteten."
 
-#~ msgid "Caption"
-#~ msgstr "Overskrift"
-
 #~ msgid "Match SQL"
 #~ msgstr "Match SQL"
 
@@ -3523,9 +3712,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "Placeholder"
 #~ msgstr "Navneholder"
 
-#~ msgid "Update errors"
-#~ msgstr "Oppdateringsfeil"
-
 #~ msgid "Toggle"
 #~ msgstr "Vis"
author	Andrew Dolgov <[email protected]>	2010-11-29 13:08:31 +0300
committer	Andrew Dolgov <[email protected]>	2010-11-29 13:08:31 +0300
commit	2cd992574a5ce73a3d99d52c70184e442226f38b (patch)
tree	4a36dbbcd2eb2873ed678d6cc237692d21d8956c /locale/nb_NO
parent	30b6ee8c08a5c5d0201be95864706ab529298a70 (diff)