Merge github.com:adrian17/apt

[apt.git] / po / nn.po

diff --git a/po/nn.po b/po/nn.po
index cd49cb2d672fb8ade61d4392fe1022d8578b98dd..d5dacaa7946d0394dc8c180d3b7b2462ddc81c12 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"
-"POT-Creation-Date: 2015-12-24 17:02+0100\n"
+"POT-Creation-Date: 2016-01-25 18:05+0100\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"
@@ -1299,6 +1299,7 @@ msgstr ""
 #: 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"
@@ -1313,6 +1314,10 @@ 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 ""
@@ -1567,11 +1572,11 @@ msgstr "Det hende noko dumt ved oppslag av 
 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"
 
-#: 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"
 
@@ -1762,10 +1767,6 @@ msgid ""
 "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"
@@ -1833,6 +1834,12 @@ msgstr "Klarte ikkje opna fila %s"
 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"
@@ -1888,6 +1895,10 @@ msgstr ""
 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"
@@ -2124,11 +2135,6 @@ msgstr ""
 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"
@@ -2255,7 +2261,7 @@ msgstr "Klarte ikkje opna %s"
 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"
@@ -3017,6 +3023,10 @@ msgstr "Underprosessen %s avslutta uventa"
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av fila"
 
+#: apt-pkg/contrib/fileutl.cc
+msgid "Unexpected end of file"
+msgstr ""
+
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikkje oppretta underprosessen IPC"
@@ -3512,11 +3522,6 @@ msgstr "Pakkelagerfila er 
 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'"
@@ -3527,6 +3532,11 @@ msgstr "APT st
 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"