rebase translations

2 files changed, 101 insertions, 101 deletions

diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 75faeaf3b..40cf1cfd6 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 7314b877e..8d7b903df 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-02 16:38+0400\n"
+"POT-Creation-Date: 2013-04-02 16:46+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"
@@ -488,7 +488,7 @@ msgstr "Logg ut"
 #: prefs.php:36
 #: prefs.php:121
 #: include/functions.php:1929
-#: classes/pref/prefs.php:428
+#: classes/pref/prefs.php:427
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -942,7 +942,7 @@ msgstr "Nyhetsstrøm"
 #: classes/backend.php:105
 #: classes/pref/users.php:99
 #: classes/pref/filters.php:147
-#: classes/pref/prefs.php:1059
+#: classes/pref/prefs.php:1058
 #: classes/pref/feeds.php:1588
 #: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:406
@@ -998,7 +998,7 @@ msgstr "Fil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:233
 #: classes/rpc.php:64
-#: classes/pref/prefs.php:995
+#: classes/pref/prefs.php:994
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
@@ -1034,7 +1034,7 @@ msgstr "Denne artikkelens stikkord (separert med kommaer):"
 #: classes/pref/users.php:176
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/prefs.php:941
+#: classes/pref/prefs.php:940
 #: classes/pref/feeds.php:733
 #: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
@@ -1055,7 +1055,7 @@ msgstr "Lagre"
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/prefs.php:943
+#: classes/pref/prefs.php:942
 #: classes/pref/feeds.php:734
 #: classes/pref/feeds.php:884
 #: classes/pref/feeds.php:1797
@@ -1293,7 +1293,7 @@ msgstr "Velg:"
 #: classes/pref/filters.php:648
 #: classes/pref/filters.php:737
 #: classes/pref/filters.php:764
-#: classes/pref/prefs.php:955
+#: classes/pref/prefs.php:954
 #: classes/pref/feeds.php:1266
 #: classes/pref/feeds.php:1536
 #: classes/pref/feeds.php:1606
@@ -1313,7 +1313,7 @@ msgstr "Motsatt"
 #: classes/pref/filters.php:650
 #: classes/pref/filters.php:739
 #: classes/pref/filters.php:766
-#: classes/pref/prefs.php:957
+#: classes/pref/prefs.php:956
 #: classes/pref/feeds.php:1268
 #: classes/pref/feeds.php:1538
 #: classes/pref/feeds.php:1608
@@ -1459,7 +1459,7 @@ msgid "Login"
 msgstr "Logg inn"
 
 #: classes/feeds.php:1007
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:252
 #: classes/pref/feeds.php:602
 #: classes/pref/feeds.php:828
 #: classes/pref/feeds.php:1778
@@ -1690,7 +1690,7 @@ msgstr "[tt-rss] Varsel om endring av passord"
 #: classes/pref/filters.php:645
 #: classes/pref/filters.php:734
 #: classes/pref/filters.php:761
-#: classes/pref/prefs.php:952
+#: classes/pref/prefs.php:951
 #: classes/pref/feeds.php:1263
 #: classes/pref/feeds.php:1533
 #: classes/pref/feeds.php:1603
@@ -1930,7 +1930,7 @@ msgstr "Svartelistede stikkord"
 
 #: classes/pref/prefs.php:27
 #, fuzzy
-msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)"
+msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
 msgstr "Når stikkord blir automatisk funnet i artikler skal følgende stikkord ikke bli oppdaget (komma-separert liste)"
 
 #: classes/pref/prefs.php:28
@@ -1940,7 +1940,7 @@ msgstr "Utvid artikler automatisk i kombinert modus"
 
 #: classes/pref/prefs.php:28
 #, fuzzy
-msgid "Mark articles as read automatically while you scroll article list."
+msgid "This option enables marking articles as read automatically while you scroll article list."
 msgstr "Dette valge muliggjør markeringen av artikler som leste automatisk i kombinert modus, mens du blar i artikkellisten (med unntak for ferske artikler nyhetsstrømmen)."
 
 #: classes/pref/prefs.php:29
@@ -1966,8 +1966,8 @@ msgstr "Ingen artikler funnet som kan vises"
 
 #: classes/pref/prefs.php:33
 #, fuzzy
-msgid "Default feed update interval"
-msgstr "Standard intervall:"
+msgid "Default interval between feed updates"
+msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
 
 #: classes/pref/prefs.php:34
 msgid "Mark articles in e-mail digest as read"
@@ -1975,7 +1975,7 @@ msgstr "Marker artikler i e--postsammendrag som leste"
 
 #: classes/pref/prefs.php:35
 #, fuzzy
-msgid "Enable email digest"
+msgid "Enable e-mail digest"
 msgstr "Tillatt e-postsammendrag"
 
 #: classes/pref/prefs.php:35
@@ -1991,7 +1991,12 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: classes/pref/prefs.php:37
-msgid "Enable external API"
+#, fuzzy
+msgid "Enable API access"
+msgstr "Tillat merkelapper"
+
+#: classes/pref/prefs.php:37
+msgid "Allows external clients to access this account through the API"
 msgstr ""
 
 #: classes/pref/prefs.php:38
@@ -2013,7 +2018,7 @@ msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
 
 #: classes/pref/prefs.php:42
 #, fuzzy
-msgid "Show special feeds and labels when hiding read feeds"
+msgid "Show special feeds when hiding read feeds"
 msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 
 #: classes/pref/prefs.php:43
@@ -2081,276 +2086,268 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
 
 #: classes/pref/prefs.php:54
-msgid "Select theme"
-msgstr "Velg utseende"
-
-#: classes/pref/prefs.php:54
-msgid "Select one of the available CSS themes"
-msgstr ""
-
-#: classes/pref/prefs.php:55
 #: js/prefs.js:1725
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 
-#: classes/pref/prefs.php:55
+#: classes/pref/prefs.php:54
 msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
-#: classes/pref/prefs.php:56
+#: classes/pref/prefs.php:55
 msgid "User timezone"
 msgstr ""
 
-#: classes/pref/prefs.php:57
+#: classes/pref/prefs.php:56
 msgid "Group headlines in virtual feeds"
 msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
 
-#: classes/pref/prefs.php:57
-msgid "When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"
-msgstr "Med dette valget haket av så vil overskriftene i spesielle nyhetskanaler og merkelapper grupperes etter nyhetskanalene"
+#: classes/pref/prefs.php:56
+msgid "Special feeds, labels, and categories are grouped by originating feeds"
+msgstr ""
 
-#: classes/pref/prefs.php:68
+#: classes/pref/prefs.php:67
 msgid "Old password cannot be blank."
 msgstr "Gammelt passord kan ikke være blankt."
 
-#: classes/pref/prefs.php:73
+#: classes/pref/prefs.php:72
 msgid "New password cannot be blank."
 msgstr "Nytt passord kan ikke vært blankt."
 
-#: classes/pref/prefs.php:78
+#: classes/pref/prefs.php:77
 msgid "Entered passwords do not match."
 msgstr "Innskrivne passord matcher ikke."
 
-#: classes/pref/prefs.php:88
+#: classes/pref/prefs.php:87
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:120
+#: classes/pref/prefs.php:119
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: classes/pref/prefs.php:134
+#: classes/pref/prefs.php:133
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: classes/pref/prefs.php:148
+#: classes/pref/prefs.php:147
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "Passord har blitt endret."
 
-#: classes/pref/prefs.php:188
+#: classes/pref/prefs.php:187
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autentifisering"
 
-#: classes/pref/prefs.php:208
+#: classes/pref/prefs.php:207
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: classes/pref/prefs.php:218
+#: classes/pref/prefs.php:217
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:222
+#: classes/pref/prefs.php:221
 msgid "E-mail"
 msgstr "E-post"
 
-#: classes/pref/prefs.php:228
+#: classes/pref/prefs.php:227
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:237
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: classes/pref/prefs.php:260
+#: classes/pref/prefs.php:259
 #, 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."
 
-#: classes/pref/prefs.php:287
+#: classes/pref/prefs.php:286
 msgid "Changing your current password will disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:292
+#: classes/pref/prefs.php:291
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: classes/pref/prefs.php:295
+#: classes/pref/prefs.php:294
 msgid "New password"
 msgstr "Nytt passord"
 
-#: classes/pref/prefs.php:300
+#: classes/pref/prefs.php:299
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: classes/pref/prefs.php:310
+#: classes/pref/prefs.php:309
 msgid "Change password"
 msgstr "Endre passord"
 
-#: classes/pref/prefs.php:316
+#: classes/pref/prefs.php:315
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:320
+#: classes/pref/prefs.php:319
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr ""
 
-#: classes/pref/prefs.php:345
-#: classes/pref/prefs.php:396
+#: classes/pref/prefs.php:344
+#: classes/pref/prefs.php:395
 #, fuzzy
 msgid "Enter your password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:355
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(Avskrudd)"
 
-#: classes/pref/prefs.php:362
+#: classes/pref/prefs.php:361
 msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:364
+#: classes/pref/prefs.php:363
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:405
+#: classes/pref/prefs.php:404
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:413
+#: classes/pref/prefs.php:412
 #, fuzzy
 msgid "Enable OTP"
 msgstr "Tillatt"
 
-#: classes/pref/prefs.php:451
+#: classes/pref/prefs.php:450
 msgid "Some preferences are only available in default profile."
 msgstr ""
 
-#: classes/pref/prefs.php:545
+#: classes/pref/prefs.php:544
 #, fuzzy
 msgid "Customize"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 
-#: classes/pref/prefs.php:605
+#: classes/pref/prefs.php:604
 #, fuzzy
 msgid "Register"
 msgstr "Registrert"
 
-#: classes/pref/prefs.php:609
+#: classes/pref/prefs.php:608
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:615
+#: classes/pref/prefs.php:614
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:648
+#: classes/pref/prefs.php:647
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: classes/pref/prefs.php:651
+#: classes/pref/prefs.php:650
 #, fuzzy
 msgid "Manage profiles"
 msgstr "Lag filter"
 
-#: classes/pref/prefs.php:654
+#: classes/pref/prefs.php:653
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
-#: classes/pref/prefs.php:678
-#: classes/pref/prefs.php:680
+#: classes/pref/prefs.php:677
+#: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:682
+#: classes/pref/prefs.php:681
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:684
+#: classes/pref/prefs.php:683
 msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
 msgstr ""
 
-#: classes/pref/prefs.php:710
+#: classes/pref/prefs.php:709
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:714
-#: classes/pref/prefs.php:768
+#: classes/pref/prefs.php:713
+#: classes/pref/prefs.php:767
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:715
-#: classes/pref/prefs.php:769
+#: classes/pref/prefs.php:714
+#: classes/pref/prefs.php:768
 #, fuzzy
 msgid "Description"
 msgstr "beskrivelse"
 
-#: classes/pref/prefs.php:716
-#: classes/pref/prefs.php:770
+#: classes/pref/prefs.php:715
+#: classes/pref/prefs.php:769
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:717
-#: classes/pref/prefs.php:771
+#: classes/pref/prefs.php:716
+#: classes/pref/prefs.php:770
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:746
-#: classes/pref/prefs.php:803
+#: classes/pref/prefs.php:745
+#: classes/pref/prefs.php:802
 msgid "more info"
 msgstr ""
 
-#: classes/pref/prefs.php:755
-#: classes/pref/prefs.php:812
+#: classes/pref/prefs.php:754
+#: classes/pref/prefs.php:811
 #, fuzzy
 msgid "Clear data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref/prefs.php:764
+#: classes/pref/prefs.php:763
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:827
+#: classes/pref/prefs.php:826
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "Bruk nyhetsstrømsikoner"
 
-#: classes/pref/prefs.php:882
-#: classes/pref/prefs.php:900
+#: classes/pref/prefs.php:881
+#: classes/pref/prefs.php:899
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/prefs.php:926
+#: classes/pref/prefs.php:925
 #, php-format
 msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/pref/prefs.php:966
+#: classes/pref/prefs.php:965
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
-#: classes/pref/prefs.php:989
-#: classes/pref/prefs.php:1019
+#: classes/pref/prefs.php:988
+#: classes/pref/prefs.php:1018
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: classes/pref/prefs.php:1053
+#: classes/pref/prefs.php:1052
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/prefs.php:1055
+#: classes/pref/prefs.php:1054
 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
@@ -3876,6 +3873,16 @@ msgstr "Marker artikkel som favoritt"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Default feed update interval"
+#~ msgstr "Standard intervall:"
+
+#~ msgid "Select theme"
+#~ msgstr "Velg utseende"
+
+#~ msgid "When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"
+#~ msgstr "Med dette valget haket av så vil overskriftene i spesielle nyhetskanaler og merkelapper grupperes etter nyhetskanalene"
+
 #~ msgid "Title"
 #~ msgstr "Tittel"
 
@@ -3905,10 +3912,6 @@ msgstr ""
 #~ msgstr "Dette valget er brukervennlig hvis du leser flere globale nyhetsstrømssamlere som har delvis overlappende brukerbase. Når denne er avskrudd kan samme post fra flere forskjellige nyhetsstrømmer vises på en gang."
 
 #, fuzzy
-#~ msgid "Default interval between feed updates"
-#~ msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
-
-#, fuzzy
 #~ msgid "Date syntax appears to be correct:"
 #~ msgstr "Gammelt passord er feil"
 
@@ -4317,9 +4320,6 @@ msgstr ""
 #~ 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 "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."