don't change owner/perms/times through file:// symlinks

[apt.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index 1b0f1fbedf36aafcb94afc72e9d6497a5e7f1b3f..de323284198c1538899121eb85a339056c32a47d 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,20 +7,21 @@
 # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
 # Bjorn Steensrud <bjornst@powertech.no>, 2004.
 # Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.
 # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
 # Bjorn Steensrud <bjornst@powertech.no>, 2004.
 # Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.

+# Petter Reinholdtsen <pere@hungry.com>, 2016.

 msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2015-12-14 16:56+0100\n"
-"PO-Revision-Date: 2010-09-01 21:10+0200\n"
-"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2016-06-23 09:02+0200\n"
+"PO-Revision-Date: 2016-06-11 22:38+0200\n"
+"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
+"Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"

 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Lokalize 1.5\n"

 
 #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
 #: apt-private/acqprogress.cc
 
 #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
 #: apt-private/acqprogress.cc


@@ -99,7 +100,7 @@ msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
 
 #: apt-private/private-cacheset.cc apt-private/private-search.cc
 msgid "Sorting"
 
 #: apt-private/private-cacheset.cc apt-private/private-search.cc
 msgid "Sorting"

-msgstr ""
+msgstr "Sorterer"

 
 #: apt-private/private-cacheset.cc
 #, c-format
 
 #: apt-private/private-cacheset.cc
 #, c-format


@@ -122,7 +123,6 @@ msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
 
 #: apt-private/private-cacheset.cc
 msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
 
 #: apt-private/private-cacheset.cc

-#, fuzzy

 msgid " [Installed]"
 msgstr " [Installert]"
 
 msgid " [Installed]"
 msgstr " [Installert]"
 


@@ -161,9 +161,11 @@ msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: apt-private/private-cacheset.cc apt-private/private-install.cc
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: apt-private/private-cacheset.cc apt-private/private-install.cc

-#, fuzzy, c-format
+#, c-format

 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"

-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+msgstr ""
+"Pakken '%s' er ikke installert, og derfor heller ikke fjernet. Mente du "
+"'%s'?\n"

 
 #: apt-private/private-cacheset.cc apt-private/private-install.cc
 #, fuzzy, c-format
 
 #: apt-private/private-cacheset.cc apt-private/private-install.cc
 #, fuzzy, c-format


@@ -177,12 +179,12 @@ msgstr "Merk, velger «%s» istedenfor «%s»\n"
 
 #: apt-private/private-cmndline.cc
 msgid "Most used commands:"
 
 #: apt-private/private-cmndline.cc
 msgid "Most used commands:"

-msgstr ""
+msgstr "Mest brukte kommandoer:"

 
 #: apt-private/private-cmndline.cc
 #, c-format
 msgid "See %s for more information about the available commands."
 
 #: apt-private/private-cmndline.cc
 #, c-format
 msgid "See %s for more information about the available commands."

-msgstr ""
+msgstr "Se %s for mer informasjon om de tilgjengelige kommandoene."

 
 #: apt-private/private-cmndline.cc
 msgid ""
 
 #: apt-private/private-cmndline.cc
 msgid ""


@@ -191,6 +193,9 @@ msgid ""
 "Package and version choices can be expressed via apt_preferences(5).\n"
 "Security details are available in apt-secure(8).\n"
 msgstr ""
 "Package and version choices can be expressed via apt_preferences(5).\n"
 "Security details are available in apt-secure(8).\n"
 msgstr ""

+"Detaljer om oppsettvalg og syntaks finnes i apt.conf(5).\n"
+"Informasjon om hvordan en setter opp kilder finnes i sources.list(5).\n"
+"Sikkerhetsdetaljer er tilgjengelig i apt-secure(8).\n"

 
 #: apt-private/private-cmndline.cc
 msgid "This APT has Super Cow Powers."
 
 #: apt-private/private-cmndline.cc
 msgid "This APT has Super Cow Powers."


@@ -226,6 +231,7 @@ msgid ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
 msgstr ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
 msgstr ""

+"--force-yes er utdatert, bruk en av valgene som starter med --allow istedet."

 
 #: apt-private/private-download.cc
 #, fuzzy
 
 #: apt-private/private-download.cc
 #, fuzzy


@@ -234,10 +240,10 @@ msgid ""
 "unauthenticated"
 msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
 
 "unauthenticated"
 msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
 

-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikke å skaffe %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Klarte ikke å skaffe %s  %s"

 
 #: apt-private/private-download.cc
 #, c-format
 
 #: apt-private/private-download.cc
 #, c-format


@@ -253,6 +259,36 @@ msgstr "Dessverre, ikke nok ledig plass i %s"
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 

+#: apt-private/private-install.cc
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
+"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
+"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
+"distribusjonen."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "Ødelagte pakker"
+

 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"


@@ -278,6 +314,8 @@ msgid ""
 "Held packages were changed and -y was used without --allow-change-held-"
 "packages."
 msgstr ""
 "Held packages were changed and -y was used without --allow-change-held-"
 "packages."
 msgstr ""

+"Pakker som er holdt igjen ble endret og -y ble brukt uten --allow-change-"
+"held-packages."

 
 #: apt-private/private-install.cc
 msgid "Internal error, Ordering didn't finish"
 
 #: apt-private/private-install.cc
 msgid "Internal error, Ordering didn't finish"


@@ -405,20 +443,6 @@ msgstr ""
 "Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
 "virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
 
 "Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
 "virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
 

-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
-

 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"


@@ -446,7 +470,7 @@ msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 #, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."
 #, fuzzy, c-format
 msgid "Use '%s' to remove it."
 msgid_plural "Use '%s' to remove them."

-msgstr[0] "Bruk «%s» for å fjerne dem."
+msgstr[0] "Bruk «%s» for å fjerne den."

 msgstr[1] "Bruk «%s» for å fjerne dem."
 
 #: apt-private/private-install.cc
 msgstr[1] "Bruk «%s» for å fjerne dem."
 
 #: apt-private/private-install.cc


@@ -462,25 +486,8 @@ msgstr ""
 "angi en løsning)."
 
 #: apt-private/private-install.cc
 "angi en løsning)."
 
 #: apt-private/private-install.cc

-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
-"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
-"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
-"distribusjonen."
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "Ødelagte pakker"
-
-#: apt-private/private-install.cc
-#, fuzzy

 msgid "The following additional packages will be installed:"
 msgid "The following additional packages will be installed:"

-msgstr "Følgende ekstra pakker vil bli installert."
+msgstr "Følgende ekstra pakker vil bli installert:"

 
 #: apt-private/private-install.cc
 msgid "Suggested packages:"
 
 #: apt-private/private-install.cc
 msgid "Suggested packages:"


@@ -531,7 +538,7 @@ msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
 #: apt-private/private-list.cc
 msgid "Listing"
 
 #: apt-private/private-list.cc
 msgid "Listing"

-msgstr ""
+msgstr "Lister opp"

 
 #: apt-private/private-list.cc
 #, c-format
 
 #: apt-private/private-list.cc
 #, c-format


@@ -539,23 +546,27 @@ msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
 "There are %i additional versions. Please use the '-a' switch to see them."
 msgstr[0] ""
 msgid_plural ""
 "There are %i additional versions. Please use the '-a' switch to see them."
 msgstr[0] ""

+"Det er %i ekstra versjon.  Vær så snill å bruk '-a'-bryteren for å se den"

 msgstr[1] ""
 msgstr[1] ""

+"Det er %i ekstra versjoner.  Vær så snill å bruk '-a'-bryteren for å se dem."

 
 

+#. TRANSLATORS: placeholder is a binary name like apt or apt-get

 #: apt-private/private-main.cc
 #: apt-private/private-main.cc

+#, c-format

 msgid ""
 "NOTE: This is only a simulation!\n"
 msgid ""
 "NOTE: This is only a simulation!\n"

-"      apt-get needs root privileges for real execution.\n"
+"      %s needs root privileges for real execution.\n"

 "      Keep also in mind that locking is deactivated,\n"
 "      Keep also in mind that locking is deactivated,\n"

-"      so don't depend on the relevance to the real current situation!"
+"      so don't depend on the relevance to the real current situation!\n"

 msgstr ""
 "MERK: Dette er kun en simulering.\n"
 msgstr ""
 "MERK: Dette er kun en simulering.\n"

-"      apt-get må ha root-rettigheter for reell utførelse.\n"
+"      %s må ha root-rettigheter for reell utførelse.\n"

 "      Husk også at låsing er deaktivert, så ikke regn med \n"
 "      Husk også at låsing er deaktivert, så ikke regn med \n"

-"      relevans i forhold til den reelle gjeldende situasjonen."
+"      relevans i forhold til den reelle gjeldende situasjonen.\n"

 
 #: apt-private/private-output.cc apt-private/private-show.cc
 msgid "unknown"
 
 #: apt-private/private-output.cc apt-private/private-show.cc
 msgid "unknown"

-msgstr ""
+msgstr "ukjent"

 
 #: apt-private/private-output.cc
 #, fuzzy, c-format
 
 #: apt-private/private-output.cc
 #, fuzzy, c-format


@@ -569,7 +580,7 @@ msgstr " [Installert]"
 
 #: apt-private/private-output.cc
 msgid "[installed,auto-removable]"
 
 #: apt-private/private-output.cc
 msgid "[installed,auto-removable]"

-msgstr ""
+msgstr "[installert,auto-fjernbar]"

 
 #: apt-private/private-output.cc
 #, fuzzy
 
 #: apt-private/private-output.cc
 #, fuzzy


@@ -584,7 +595,7 @@ msgstr " [Installert]"
 #: apt-private/private-output.cc
 #, c-format
 msgid "[upgradable from: %s]"
 #: apt-private/private-output.cc
 #, c-format
 msgid "[upgradable from: %s]"

-msgstr ""
+msgstr "[oppgraderbar fra: %s]"

 
 #: apt-private/private-output.cc
 msgid "[residual-config]"
 
 #: apt-private/private-output.cc
 msgid "[residual-config]"


@@ -710,7 +721,7 @@ msgstr "J"
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
 #: apt-private/private-output.cc
 msgid "N"
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
 #: apt-private/private-output.cc
 msgid "N"

-msgstr ""
+msgstr "N"

 
 #: apt-private/private-output.cc apt-pkg/cachefilter.cc
 #, c-format
 
 #: apt-private/private-output.cc apt-pkg/cachefilter.cc
 #, c-format


@@ -723,7 +734,7 @@ msgstr "Du må oppgi minst ett søkemønster"
 
 #: apt-private/private-search.cc
 msgid "Full Text Search"
 
 #: apt-private/private-search.cc
 msgid "Full Text Search"

-msgstr ""
+msgstr "Fulltekstsøk"

 
 #: apt-private/private-show.cc cmdline/apt-cache.cc
 #, c-format
 
 #: apt-private/private-show.cc cmdline/apt-cache.cc
 #, c-format


@@ -736,11 +747,14 @@ msgid "There is %i additional record. Please use the '-a' switch to see it"
 msgid_plural ""
 "There are %i additional records. Please use the '-a' switch to see them."
 msgstr[0] ""
 msgid_plural ""
 "There are %i additional records. Please use the '-a' switch to see them."
 msgstr[0] ""

+"Det er %i ekstra oppføring.  Vær så snill å bruk '-a'-bryteren for å se den"

 msgstr[1] ""
 msgstr[1] ""

+"Det er %i ekstra oppføringer.  Vær så snill å bruk '-a'-bryteren for å se "
+"dem."

 
 #: apt-private/private-show.cc
 msgid "not a real package (virtual)"
 
 #: apt-private/private-show.cc
 msgid "not a real package (virtual)"

-msgstr ""
+msgstr "ikke en virkelig pakke (virtuell)"

 
 #: apt-private/private-show.cc apt-pkg/cacheset.cc
 #, c-format
 
 #: apt-private/private-show.cc apt-pkg/cacheset.cc
 #, c-format


@@ -761,15 +775,11 @@ msgstr ""
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 

-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr "(ikke funnet)"
-

 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
 msgid "%s -> %s with priority %d\n"
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
 msgid "%s -> %s with priority %d\n"

-msgstr ""
+msgstr "%s -> %s med prioritet %d\n"

 
 #: apt-private/private-show.cc
 msgid "  Installed: "
 
 #: apt-private/private-show.cc
 msgid "  Installed: "


@@ -783,10 +793,6 @@ msgstr "  Kandidat: "
 msgid "(none)"
 msgstr "(ingen)"
 
 msgid "(none)"
 msgstr "(ingen)"
 

-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr "  Pakke låst til: "
-

 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"
 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"


@@ -894,53 +900,6 @@ msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 

-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
-"%s er for ny"
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
-"versjoner av pakken %s som oppfyller versjonskravene"
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-

 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"


@@ -961,11 +920,13 @@ msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""

+"Ingen arkitekturinformasjon tilgjengelig for %s.  Se apt.conf(5) APT::"
+"Architectures for oppsett."

 
 #: apt-private/private-source.cc
 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
 
 #: apt-private/private-source.cc
 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"

-msgstr ""
+msgstr "Merk, bruker '%s'-katalogen for å få tak i byggavhengigheter\n"

 
 #: apt-private/private-source.cc
 #, fuzzy, c-format
 
 #: apt-private/private-source.cc
 #, fuzzy, c-format


@@ -984,7 +945,7 @@ msgstr "Klarte ikke å endre navnet på %s til %s"
 #: apt-private/private-sources.cc
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 #: apt-private/private-sources.cc
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."

-msgstr ""
+msgstr "'%s'-filen din ble endret, vær så snill å kjør 'apt-get update'."

 
 #: apt-private/private-unmet.cc
 #, c-format
 
 #: apt-private/private-unmet.cc
 #, c-format


@@ -1001,11 +962,13 @@ msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
 "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
 msgstr[0] ""
 msgid_plural ""
 "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
 msgstr[0] ""

+"%i pakke kan oppgraderes.  Kjør 'apt list --upgradable' for å se den.\n"

 msgstr[1] ""
 msgstr[1] ""

+"%i pakker kan oppgraderes.  Kjør 'apt list --upgradable' for å se dem.\n"

 
 #: apt-private/private-update.cc
 msgid "All packages are up to date."
 
 #: apt-private/private-update.cc
 msgid "All packages are up to date."

-msgstr ""
+msgstr "Alle pakkene er oppdatert."

 
 #: cmdline/apt-cache.cc
 #, fuzzy
 
 #: cmdline/apt-cache.cc
 #, fuzzy


@@ -1079,6 +1042,8 @@ msgstr "Samlet mengde redegjort plass: "
 #: cmdline/apt-cache.cc
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 #: cmdline/apt-cache.cc
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""

+"Denne kommandoen er utdatert.  Vær så snill å bruke 'apt-mark showauto' "
+"istedet."

 
 #: cmdline/apt-cache.cc
 msgid ""
 
 #: cmdline/apt-cache.cc
 msgid ""


@@ -1195,6 +1160,8 @@ msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""

+"Denne kommandoen er utdatert. Vær så snill å bruk 'apt-mark auto' og 'apt-"
+"mark manual' istedet."

 
 #: cmdline/apt-get.cc
 msgid "Internal error, problem resolver broke stuff"
 
 #: cmdline/apt-get.cc
 msgid "Internal error, problem resolver broke stuff"


@@ -1278,15 +1245,15 @@ msgstr "Last ned kildekode fra arkivene"
 
 #: cmdline/apt-get.cc
 msgid "Download the binary package into the current directory"
 
 #: cmdline/apt-get.cc
 msgid "Download the binary package into the current directory"

-msgstr ""
+msgstr "Last ned binærpakke til gjeldende katalog"

 
 #: cmdline/apt-get.cc
 msgid "Download and display the changelog for the given package"
 
 #: cmdline/apt-get.cc
 msgid "Download and display the changelog for the given package"

-msgstr ""
+msgstr "Last ned og vis endringsloggen for den oppgitte pakken"

 
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"
 
 #: cmdline/apt-helper.cc
 msgid "Need one URL as argument"

-msgstr ""
+msgstr "Trenger en URL som argument"

 
 #: cmdline/apt-helper.cc
 #, fuzzy
 
 #: cmdline/apt-helper.cc
 #, fuzzy


@@ -1295,16 +1262,17 @@ msgstr "Du må angi minst en pakke du vil ha kildekoden til"
 
 #: cmdline/apt-helper.cc
 msgid "Download Failed"
 
 #: cmdline/apt-helper.cc
 msgid "Download Failed"

-msgstr ""
+msgstr "Nedlasting feilet"

 
 #: cmdline/apt-helper.cc
 #, c-format
 msgid "GetSrvRec failed for %s"
 
 #: cmdline/apt-helper.cc
 #, c-format
 msgid "GetSrvRec failed for %s"

-msgstr ""
+msgstr "GetSrvRec feilet for %s"

 
 #: cmdline/apt-helper.cc
 msgid ""
 "Usage: apt-helper [options] command\n"
 
 #: cmdline/apt-helper.cc
 msgid ""
 "Usage: apt-helper [options] command\n"

+"       apt-helper [options] cat-file file ...\n"

 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper bundles a variety of commands for shell scripts to use\n"
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper bundles a variety of commands for shell scripts to use\n"


@@ -1317,7 +1285,11 @@ msgstr ""
 
 #: cmdline/apt-helper.cc
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 
 #: cmdline/apt-helper.cc
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"

-msgstr ""
+msgstr "Slå opp en SRV-oppføring (f.eks. _http._tcp.ftp.debian.org)"
+
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr "slå sammen filer, med automatisk utpakking"

 
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"
 
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"


@@ -1350,7 +1322,7 @@ msgstr "%s er allerede nyeste versjon.\n"
 
 #: cmdline/apt-mark.cc
 msgid "Executing dpkg failed. Are you root?"
 
 #: cmdline/apt-mark.cc
 msgid "Executing dpkg failed. Are you root?"

-msgstr ""
+msgstr "Klarte ikke kjøre dpkg.  Er du root?"

 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format
 
 #: cmdline/apt-mark.cc
 #, fuzzy, c-format


@@ -1370,12 +1342,12 @@ msgstr ""
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for removal.\n"
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for removal.\n"

-msgstr ""
+msgstr "Valgte %s for fjerning.\n"

 
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for installation.\n"
 
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for installation.\n"

-msgstr ""
+msgstr "Valgte %s for installering.\n"

 
 #: cmdline/apt-mark.cc
 msgid ""
 
 #: cmdline/apt-mark.cc
 msgid ""


@@ -1399,11 +1371,11 @@ msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
 #: cmdline/apt-mark.cc
 msgid "Mark a package as held back"
 
 #: cmdline/apt-mark.cc
 msgid "Mark a package as held back"

-msgstr ""
+msgstr "Marker en pakke som holdt tilbake"

 
 #: cmdline/apt-mark.cc
 msgid "Unset a package set as held back"
 
 #: cmdline/apt-mark.cc
 msgid "Unset a package set as held back"

-msgstr ""
+msgstr "Fjern markering som holdt tilbake for en pakke"

 
 #: cmdline/apt-mark.cc
 #, fuzzy
 
 #: cmdline/apt-mark.cc
 #, fuzzy


@@ -1417,7 +1389,7 @@ msgstr "%s satt til manuell installasjon.\n"
 
 #: cmdline/apt-mark.cc
 msgid "Print the list of package on hold"
 
 #: cmdline/apt-mark.cc
 msgid "Print the list of package on hold"

-msgstr ""
+msgstr "Skriv listen med pakker som holdes tilbake"

 
 #: cmdline/apt.cc
 msgid ""
 
 #: cmdline/apt.cc
 msgid ""


@@ -1433,7 +1405,7 @@ msgstr ""
 #. query
 #: cmdline/apt.cc
 msgid "list packages based on package names"
 #. query
 #: cmdline/apt.cc
 msgid "list packages based on package names"

-msgstr ""
+msgstr "list pakker basert på pakkenavn"

 
 #: cmdline/apt.cc
 #, fuzzy
 
 #: cmdline/apt.cc
 #, fuzzy


@@ -1442,7 +1414,7 @@ msgstr "Leser pakkelister"
 
 #: cmdline/apt.cc
 msgid "show package details"
 
 #: cmdline/apt.cc
 msgid "show package details"

-msgstr ""
+msgstr "vis pakkedetaljer"

 
 #. package stuff
 #: cmdline/apt.cc
 
 #. package stuff
 #: cmdline/apt.cc


@@ -1463,11 +1435,11 @@ msgstr "%s satt til manuell installasjon.\n"
 
 #: cmdline/apt.cc
 msgid "upgrade the system by installing/upgrading packages"
 
 #: cmdline/apt.cc
 msgid "upgrade the system by installing/upgrading packages"

-msgstr ""
+msgstr "oppgrader systemet ved å installere/oppgradere pakker"

 
 #: cmdline/apt.cc
 msgid "upgrade the system by removing/installing/upgrading packages"
 
 #: cmdline/apt.cc
 msgid "upgrade the system by removing/installing/upgrading packages"

-msgstr ""
+msgstr "oppgrader systemet ved å fjerne/installere/oppgradere pakker"

 
 #. misc
 #: cmdline/apt.cc
 
 #. misc
 #: cmdline/apt.cc


@@ -1573,11 +1545,11 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikke koble til %s:%s:"
 
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikke koble til %s:%s:"
 

-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/store.cc

 msgid "Failed to stat"
 msgstr "Klarte ikke å få status"
 
 msgid "Failed to stat"
 msgstr "Klarte ikke å få status"
 

-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc methods/rred.cc methods/store.cc

 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 


@@ -1732,6 +1704,21 @@ msgstr "Spørring"
 msgid "Unable to invoke "
 msgstr "Klarte ikke å starte"
 
 msgid "Unable to invoke "
 msgstr "Klarte ikke å starte"
 

+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr ""
+

 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."


@@ -1747,18 +1734,16 @@ msgstr ""
 "Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg "
 "installert?)"
 
 "Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg "
 "installert?)"
 

-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr ""
-

 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr "Ukjent feil ved kjøring av apt-key"
 
 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr "Ukjent feil ved kjøring av apt-key"
 

+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr "Signatur med nøkkel %s bruker svak oppsummeringsalgoritme (%s)"
+

 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"


@@ -1771,10 +1756,6 @@ msgstr ""
 "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 "ikke er tilgjengelig:\n"
 
 "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 "ikke er tilgjengelig:\n"
 

-#: methods/gzip.cc
-msgid "Empty files can't be valid archives"
-msgstr ""
-

 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"


@@ -1842,6 +1823,12 @@ msgstr "Ingen speilfil «%s» funnet"
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
 
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
 

+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Klarte ikke å få statusen på %s"
+

 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikke å opprette IPC-rør til underprosessen"


@@ -1897,6 +1884,10 @@ msgstr ""
 msgid "Internal error"
 msgstr "Intern feil"
 
 msgid "Internal error"
 msgstr "Intern feil"
 

+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr "Tomme filer kan ikke være gyldige arkiver"
+

 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "Feil standardinnstilling!"
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "Feil standardinnstilling!"


@@ -1911,9 +1902,9 @@ msgstr "Trykk «Enter» og fortsett"
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
 
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
 

-# Note to translators: The following four messages belong together. It doesn't\r
-# matter where sentences start, but it has to fit in just these four lines, and\r
-# at only 80 characters per line, if possible.\r
+# Note to translators: The following four messages belong together. It doesn't
+# matter where sentences start, but it has to fit in just these four lines, and
+# at only 80 characters per line, if possible.

 #: dselect/install:102
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "Feil oppstod ved utpakkinga. Setter nå opp de installerte pakkene."
 #: dselect/install:102
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "Feil oppstod ved utpakkinga. Setter nå opp de installerte pakkene."


@@ -1935,6 +1926,20 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 

+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ventet på %s, men den ble ikke funnet"
+

 #: cmdline/apt-extracttemplates.cc
 #, fuzzy
 msgid ""
 #: cmdline/apt-extracttemplates.cc
 #, fuzzy
 msgid ""


@@ -2140,11 +2145,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikke å åpne Databasefila %s: %s"
 
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikke å åpne Databasefila %s: %s"
 

-#: ftparchive/cachedb.cc apt-inst/extract.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Klarte ikke å få statusen på %s"
-

 #: ftparchive/cachedb.cc
 #, fuzzy
 msgid "Failed to read .dsc"
 #: ftparchive/cachedb.cc
 #, fuzzy
 msgid "Failed to read .dsc"


@@ -2271,7 +2271,7 @@ msgstr "Klarte ikke å åpne %s"
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 

-#: ftparchive/writer.cc
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc

 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikke å lese lenken %s"
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikke å lese lenken %s"


@@ -2478,15 +2478,50 @@ msgid ""
 "details."
 msgstr ""
 
 "details."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Katalogen %s er avledet"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "Katalogen %s er avledet"
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Katalogen %s er avledet"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Katalogen %s er avledet"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "Katalogen %s er avledet"

 
 #: apt-pkg/acquire-item.cc
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
 
 #: apt-pkg/acquire-item.cc
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 

+#: apt-pkg/acquire-item.cc
+msgid "Insufficient information available to perform this download securely"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
+

 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "Feil størrelse"
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "Feil størrelse"


@@ -2537,11 +2572,6 @@ msgid ""
 "weak security information for it"
 msgstr ""
 
 "weak security information for it"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
-

 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)


@@ -2557,33 +2587,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 

-#. No Release file was present, or verification failed, so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is not signed."
-msgstr "Katalogen %s er avledet"
-
-#. No Release file was present so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' does not have a Release file."
-msgstr "Katalogen %s er avledet"
-
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "Katalogen %s er avledet"
-
-#: apt-pkg/acquire-item.cc
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-

 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""


@@ -3012,11 +3015,6 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ventet på %s, men den ble ikke funnet"
-

 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."


@@ -3043,14 +3041,8 @@ msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av gzip-fila %s"
 
 #: apt-pkg/contrib/fileutl.cc
 msgstr "Problem ved låsing av gzip-fila %s"
 
 #: apt-pkg/contrib/fileutl.cc

-#, c-format
-msgid "Could not open file %s"
-msgstr "Klarte ikke åpne fila %s"
-
-#: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Klarte ikke åpne fildeskriptor %d"
+msgid "Unexpected end of file"
+msgstr "Uventet slutt på fil"

 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"


@@ -3060,6 +3052,16 @@ msgstr "Klarte ikke å opprette underprosessen IPC"
 msgid "Failed to exec compressor "
 msgstr "Klarte ikke å kjøre komprimeringen"
 
 msgid "Failed to exec compressor "
 msgstr "Klarte ikke å kjøre komprimeringen"
 

+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "Klarte ikke åpne fila %s"
+
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Klarte ikke åpne fildeskriptor %d"
+

 #: apt-pkg/contrib/fileutl.cc
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 #: apt-pkg/contrib/fileutl.cc
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"


@@ -3089,9 +3091,9 @@ msgid "Can't mmap an empty file"
 msgstr "Kan ikke utføre mmap på en tom fil"
 
 #: apt-pkg/contrib/mmap.cc
 msgstr "Kan ikke utføre mmap på en tom fil"
 
 #: apt-pkg/contrib/mmap.cc

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't make mmap of %llu bytes"
 msgid "Couldn't make mmap of %llu bytes"

-msgstr "Klarte ikke lage mmap av %lu bytes"
+msgstr "Klarte ikke lage mmap av %llu bytes"

 
 #: apt-pkg/contrib/mmap.cc
 #, c-format
 
 #: apt-pkg/contrib/mmap.cc
 #, c-format


@@ -3152,7 +3154,7 @@ msgstr "%c%s ... Ferdig"
 
 #: apt-pkg/contrib/progress.cc
 msgid "..."
 
 #: apt-pkg/contrib/progress.cc
 msgid "..."

-msgstr ""
+msgstr "..."

 
 #. Print the spinner
 #: apt-pkg/contrib/progress.cc
 
 #. Print the spinner
 #: apt-pkg/contrib/progress.cc


@@ -3223,19 +3225,14 @@ msgstr "Ingen sjekksumoppføring i Release-fila %s"
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid ""
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid ""

-"No Hash entry in Release file %s, which is considered strong enough for "
+"No Hash entry in Release file %s which is considered strong enough for "

 "security purposes"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 "security purposes"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format

-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
-
-#: apt-pkg/deb/debmetaindex.cc
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
+msgid "Invalid '%s' entry in Release file %s"
+msgstr "Ugyldig «%s»-oppføring i Release-fila %s"

 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 #: apt-pkg/deb/debmetaindex.cc
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 #: apt-pkg/deb/debmetaindex.cc


@@ -3248,6 +3245,11 @@ msgstr ""
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr ""
 
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr ""
 

+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+

 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
 msgid "Unable to parse package file %s (%d)"
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
 msgid "Unable to parse package file %s (%d)"


@@ -3314,7 +3316,7 @@ msgstr "Kjører etter-installasjonsutløser %s"
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 

-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc

 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke åpne fila «%s»"
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke åpne fila «%s»"


@@ -3360,13 +3362,13 @@ msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
 #: apt-pkg/deb/dpkgpm.cc
 msgstr "Fjernet %s fullstendig"
 
 #: apt-pkg/deb/dpkgpm.cc

-#, fuzzy, c-format
+#, c-format

 msgid "Can not write log (%s)"
 msgid "Can not write log (%s)"

-msgstr "Kan ikke skrive til %s"
+msgstr "Kan ikke skrive logg (%s)"

 
 #: apt-pkg/deb/dpkgpm.cc
 msgid "Is /dev/pts mounted?"
 
 #: apt-pkg/deb/dpkgpm.cc
 msgid "Is /dev/pts mounted?"

-msgstr ""
+msgstr "Er /dev/pts montert?"

 
 #: apt-pkg/deb/dpkgpm.cc
 msgid "Operation was interrupted before it could finish"
 
 #: apt-pkg/deb/dpkgpm.cc
 msgid "Operation was interrupted before it could finish"


@@ -3406,13 +3408,12 @@ msgstr ""
 "minne»-feil"
 
 #: apt-pkg/deb/dpkgpm.cc
 "minne»-feil"
 
 #: apt-pkg/deb/dpkgpm.cc

-#, fuzzy

 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""

-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
-"feil"
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer et problem på det "
+"lokale systemet."

 
 #: apt-pkg/deb/dpkgpm.cc
 msgid ""
 
 #: apt-pkg/deb/dpkgpm.cc
 msgid ""


@@ -3551,11 +3552,6 @@ msgstr "Pakkens lagerfil er ødelagt"
 msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 
 msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 

-#: apt-pkg/pkgcache.cc
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Pakkens lagerfil er ødelagt"
-

 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"


@@ -3566,6 +3562,11 @@ msgstr "Denne APT støtter ikke versjonssystemet «%s»"
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 

+#: apt-pkg/pkgcache.cc
+#, fuzzy
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "Pakkens lagerfil er ødelagt"
+

 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr "Avhenger av"
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
 msgstr "Avhenger av"


@@ -3732,12 +3733,7 @@ msgstr ""
 #: apt-pkg/tagfile.cc
 #, c-format
 msgid "Cannot convert %s to integer: out of range"
 #: apt-pkg/tagfile.cc
 #, c-format
 msgid "Cannot convert %s to integer: out of range"

-msgstr ""
-
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Klarte ikke å skaffe %s  %s\n"
+msgstr "Kan ikke gjøre om %s til heltall: utenfor rekkevidde"

 
 #: apt-pkg/update.cc
 #, fuzzy
 
 #: apt-pkg/update.cc
 #, fuzzy


@@ -3752,6 +3748,64 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Beregner oppgradering"
 
 msgid "Calculating upgrade"
 msgstr "Beregner oppgradering"
 

+#~ msgid "Failed to fetch %s  %s\n"
+#~ msgstr "Klarte ikke å skaffe %s  %s\n"
+
+#~ msgid "(not found)"
+#~ msgstr "(ikke funnet)"
+
+#~ msgid "  Package pin: "
+#~ msgstr "  Pakke låst til: "
+
+#~ msgid "Invalid 'Valid-Until' entry in Release file %s"
+#~ msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
+
+#~ msgid "There is no public key available for the following key IDs:\n"
+#~ msgstr ""
+#~ "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-"
+#~ "ene:\n"
+
+#, fuzzy
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "Katalogen %s er avledet"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr ""
+#~ "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte "
+#~ "pakken %s er for ny"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because candidate version of "
+#~ "package %s can't satisfy version requirements"
+#~ msgstr ""
+#~ "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen "
+#~ "tilgjengelige versjoner av pakken %s som oppfyller versjonskravene"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
+

 #~ msgid "Problem unlinking %s"
 #~ msgstr "Problem ved oppheving av lenken til %s"
 
 #~ msgid "Problem unlinking %s"
 #~ msgstr "Problem ved oppheving av lenken til %s"