summaryrefslogtreecommitdiff
path: root/po/nb.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-23 00:45:56 +0100
committerMichael Vogt <mvo@debian.org>2014-02-23 00:45:56 +0100
commiteccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch)
treed539d21c6716af3122edabae91feadccfb3c12ad /po/nb.po
parent2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff)
parentb7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'po/nb.po')
-rw-r--r--po/nb.po36
1 files changed, 17 insertions, 19 deletions
diff --git a/po/nb.po b/po/nb.po
index cbd14b77c..ed0c7b9fe 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:43+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+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"
@@ -162,7 +162,7 @@ msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -1711,12 +1711,7 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
msgid "Merging available information"
msgstr "Fletter tilgjengelig informasjon"
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s er ikke en gyldig debianpakke."
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1741,12 +1736,12 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:298
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
@@ -2122,23 +2117,23 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122
msgid "Failed to create pipes"
msgstr "Klarte ikke å opprette rør"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149
msgid "Failed to exec gzip "
msgstr "Klarte ikke å kjøre gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
msgid "Corrupted archive"
msgstr "Ødelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjent TAR-hode: type %u, medlem %s"
@@ -2261,18 +2256,18 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
msgid "Unable to stat %s"
msgstr "Klarte ikke å få statusen på %s"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:57
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "Intern feil, fant ikke medlemmet %s"
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219
msgid "Unparsable control file"
msgstr "Kontrollfila kan ikke tolkes"
@@ -3510,6 +3505,9 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s er ikke en gyldig debianpakke."
+
#~ msgid ""
#~ "Using CD-ROM mount point %s\n"
#~ "Mounting CD-ROM\n"