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

[apt.git] / po / nn.po

diff --git a/po/nn.po b/po/nn.po
index 483250eed0f642ac5c521881e915b7539f598024..a26ead0c18271acd398e6eca404c9e44f863550d 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 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-11-30 08:50+0100\n"
+"POT-Creation-Date: 2016-06-23 09:02+0200\n"

 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"


@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
 
 "unauthenticated"
 msgstr "Det oppstod problem, og «-y» vart brukt utan «--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 ikkje henta %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Klarte ikkje henta %s  %s"

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


@@ -253,6 +253,36 @@ msgstr "Du har ikkje nok ledig plass i %s."
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 

+#: 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 ""
+"Nokre av pakkane kunne ikkje installerast. Dette kan koma av at du har\n"
+"valt ein umogleg situasjon. Dersom du brukar den ustabile utgåva av\n"
+"distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
+"er laga enno eller at dei framleis ligg i «Incoming»."
+
+#.
+#. 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ølgjande informasjon kan hjelpa med å løysa situasjonen:"
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "Øydelagde pakkar"
+

 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""


@@ -398,20 +428,6 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 

-#.
-#. 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ølgjande informasjon kan hjelpa med å løysa situasjonen:"
-

 #: apt-private/private-install.cc
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"


@@ -455,22 +471,6 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 

-#: 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 ""
-"Nokre av pakkane kunne ikkje installerast. Dette kan koma av at du har\n"
-"valt ein umogleg situasjon. Dersom du brukar den ustabile utgåva av\n"
-"distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
-"er laga enno eller at dei framleis ligg i «Incoming»."
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "Øydelagde pakkar"
-

 #: apt-private/private-install.cc
 #, fuzzy
 msgid "The following additional packages will be installed:"
 #: apt-private/private-install.cc
 #, fuzzy
 msgid "The following additional packages will be installed:"


@@ -536,12 +536,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

+#. 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 ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc
 msgstr ""
 
 #: apt-private/private-output.cc apt-private/private-show.cc


@@ -753,10 +755,6 @@ msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 

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

 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format


@@ -775,10 +773,6 @@ msgstr "  Kandidat: "
 msgid "(none)"
 msgstr "(ingen)"
 
 msgid "(none)"
 msgstr "(ingen)"
 

-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr "  Pakke spikra 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:"


@@ -881,27 +875,6 @@ msgstr ""
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 

-#: apt-private/private-source.cc
-msgid "Must specify at least one package to check builddeps for"
-msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
-
-#: apt-private/private-source.cc
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Klarte ikkje behandla byggjekrava"
-

 #: 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"


@@ -913,50 +886,25 @@ msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
 #: apt-private/private-source.cc
 msgstr "%s har ingen byggjekrav.\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 ikkje oppfyllast fordi pakken %s ikkje finst"
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"

 
 #: apt-private/private-source.cc
 #, c-format
 msgid ""
 
 #: 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 ikkje oppfyllast fordi pakken %s ikkje finst"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"

 msgstr ""
 msgstr ""

-"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"

 
 #: apt-private/private-source.cc
 
 #: 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"
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"

 msgstr ""
 msgstr ""

-"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
-"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"

 
 #: apt-private/private-source.cc
 #, fuzzy, c-format
 
 #: 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 ikkje oppfyllast fordi pakken %s ikkje finst"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Klarte ikkje behandla byggjekrava"

 
 #: apt-private/private-source.cc
 msgid "Failed to process build dependencies"
 
 #: apt-private/private-source.cc
 msgid "Failed to process build dependencies"


@@ -1299,6 +1247,7 @@ msgstr ""
 #: 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"


@@ -1313,6 +1262,10 @@ msgstr ""
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr ""
 

+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr ""
+

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


@@ -1567,11 +1520,11 @@ msgstr "Det hende noko dumt ved oppslag av 
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 

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

 msgid "Failed to stat"
 msgstr "Klarte ikkje få status"
 
 msgid "Failed to stat"
 msgstr "Klarte ikkje 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 ikkje setja endringstidspunkt"
 
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 


@@ -1726,6 +1679,21 @@ msgstr "Sp
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 

+#. 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 ""
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr ""


@@ -1739,16 +1707,14 @@ msgstr ""
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 

-#. 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?)"
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"

 msgstr ""
 
 msgstr ""
 

+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.

 #: methods/gpgv.cc
 #: methods/gpgv.cc

-msgid "Unknown error executing apt-key"
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"

 msgstr ""
 
 #: methods/gpgv.cc
 msgstr ""
 
 #: methods/gpgv.cc


@@ -1762,10 +1728,6 @@ msgid ""
 "available:\n"
 msgstr ""
 
 "available:\n"
 msgstr ""
 

-#: 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"


@@ -1833,6 +1795,12 @@ msgstr "Klarte ikkje opna fila %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
 msgid "[Mirror: %s]"
 msgstr ""
 

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

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


@@ -1888,6 +1856,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 ""
+

 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "Dårleg standardinnstilling"
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "Dårleg standardinnstilling"


@@ -1925,6 +1897,20 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 

+#: 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 "Venta på %s, men den fanst ikkje"
+

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


@@ -2124,11 +2110,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikkje opna DB-fila %s: %s"
 
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikkje opna DB-fila %s: %s"
 

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

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


@@ -2255,7 +2236,7 @@ msgstr "Klarte ikkje opna %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 ikkje lesa lenkja %s"
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikkje lesa lenkja %s"


@@ -2462,16 +2443,51 @@ msgid ""
 "details."
 msgstr ""
 
 "details."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "endring av namn mislukkast, %s (%s -> %s)."
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Katalogen %s er avleidd"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "Katalogen %s er avleidd"
+
+#: 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 avleidd"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Katalogen %s er avleidd"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "Katalogen %s er avleidd"

 
 #: apt-pkg/acquire-item.cc
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
 
 #: apt-pkg/acquire-item.cc
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 

+#: 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 "endring av namn mislukkast, %s (%s -> %s)."
+

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


@@ -2514,7 +2530,10 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
 msgstr ""
 
 #: apt-pkg/acquire-item.cc

-msgid "There is no public key available for the following key IDs:\n"
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"

 msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is


@@ -2532,33 +2551,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 

-#. 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 avleidd"
-
-#. 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 avleidd"
-
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "Katalogen %s er avleidd"
-
-#: 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 ""


@@ -2980,11 +2972,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 "Venta på %s, men den fanst ikkje"
-

 #: 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."


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

-#, c-format
-msgid "Could not open file %s"
-msgstr "Klarte ikkje opna fila %s"
-
-#: apt-pkg/contrib/fileutl.cc
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Klarte ikkje opna røyr for %s"
+msgid "Unexpected end of file"
+msgstr ""

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


@@ -3028,6 +3009,16 @@ msgstr "Klarte ikkje oppretta underprosessen IPC"
 msgid "Failed to exec compressor "
 msgstr "Klarte ikkje køyra komprimeringa "
 
 msgid "Failed to exec compressor "
 msgstr "Klarte ikkje køyra komprimeringa "
 

+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "Klarte ikkje opna fila %s"
+
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Klarte ikkje opna røyr for %s"
+

 #: 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"


@@ -3186,13 +3177,15 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc
 msgstr ""
 
 #: apt-pkg/deb/debmetaindex.cc

-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
+#, c-format
+msgid ""
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"
+msgstr ""

 
 #: apt-pkg/deb/debmetaindex.cc
 #, fuzzy, c-format
 
 #: apt-pkg/deb/debmetaindex.cc
 #, fuzzy, c-format

-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Invalid '%s' entry in Release file %s"

 msgstr "Ugyldig linje i avleiingsfila: %s"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 msgstr "Ugyldig linje i avleiingsfila: %s"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite


@@ -3206,6 +3199,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)"


@@ -3271,7 +3269,7 @@ msgstr ""
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 

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

 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"


@@ -3498,11 +3496,6 @@ msgstr "Pakkelagerfila er 
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 

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

 #: 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'"


@@ -3513,6 +3506,11 @@ msgstr "APT st
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 

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

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


@@ -3549,14 +3547,14 @@ msgstr ""
 msgid "Enhances"
 msgstr ""
 
 msgid "Enhances"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc
-msgid "important"
-msgstr "viktig"
-

 #: apt-pkg/pkgcache.cc
 msgid "required"
 msgstr "påkravd"
 
 #: apt-pkg/pkgcache.cc
 msgid "required"
 msgstr "påkravd"
 

+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "viktig"
+

 #: apt-pkg/pkgcache.cc
 msgid "standard"
 msgstr "vanleg"
 #: apt-pkg/pkgcache.cc
 msgid "standard"
 msgstr "vanleg"


@@ -3678,14 +3676,9 @@ msgstr "Du m
 
 #: apt-pkg/tagfile.cc
 #, c-format
 
 #: apt-pkg/tagfile.cc
 #, c-format

-msgid "Cannot convert %s to integer"
+msgid "Cannot convert %s to integer: out of range"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Klarte ikkje henta %s  %s\n"
-

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


@@ -3699,6 +3692,53 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Reknar ut oppgradering"
 
 msgid "Calculating upgrade"
 msgstr "Reknar ut oppgradering"
 

+#~ msgid "(not found)"
+#~ msgstr "(ikkje funne)"
+
+#~ msgid "  Package pin: "
+#~ msgstr "  Pakke spikra til: "
+
+#, fuzzy
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "Katalogen %s er avleidd"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+#~ "packages"
+#~ msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr ""
+#~ "Klarte ikkje oppfylla kravet %s 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 ikkje oppfyllast fordi det ikkje finst nokon "
+#~ "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
+

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