Run ./prepare-release pre-export

1 files changed, 44 insertions, 45 deletions

diff --git a/po/nb.po b/po/nb.po
index d79320d96..4e28ff2b3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,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-10-27 10:30+0100\n"
+"POT-Creation-Date: 2015-11-25 16:01+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"
@@ -186,7 +186,7 @@ msgstr ""
 
 #: apt-private/private-cmndline.cc
 msgid ""
-"Configuration options and syntax are detailed in apt.conf(5).\n"
+"Configuration options and syntax is detailed in apt.conf(5).\n"
 "Information about how to configure sources can be found in sources.list(5).\n"
 "Package and version choices can be expressed via apt_preferences(5).\n"
 "Security details are available in apt-secure(8).\n"
@@ -223,7 +223,7 @@ msgstr "Installer disse pakkene uten verifikasjon?"
 
 #: apt-private/private-download.cc apt-private/private-install.cc
 msgid ""
-"--force-yes is deprecated; use one of the options starting with --allow "
+"--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
 msgstr ""
 
@@ -1086,10 +1086,10 @@ msgid ""
 "       apt-cache [options] show pkg1 [pkg2 ...]\n"
 "\n"
 "apt-cache queries and displays available information about installed\n"
-"as well as installable packages. It works exclusively on the data\n"
-"acquired via the 'update' command of e.g. apt-get to the local cache.\n"
-"The displayed information can therefore be outdated if the last update\n"
-"is too long ago, but in exchange apt-cache works independently of the\n"
+"and installable packages. It works exclusively on the data acquired\n"
+"into the local cache via the 'update' command of e.g. apt-get. The\n"
+"displayed information may therefore be outdated if the last update was\n"
+"too long ago, but in exchange apt-cache works independently of the\n"
 "availability of the configured sources (e.g. offline).\n"
 msgstr ""
 
@@ -1211,7 +1211,7 @@ msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
 msgid ""
 "Usage: apt-cdrom [options] command\n"
 "\n"
-"apt-cdrom is used to add CD-ROMs, USB flashdrives and other removable\n"
+"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n"
 "media types as package sources to APT. The mount point and device\n"
 "information is taken from apt.conf(5), udev(7) and fstab(5).\n"
 msgstr ""
@@ -1221,12 +1221,16 @@ msgid "Arguments not in pairs"
 msgstr "Ikke parvise argumenter"
 
 #: cmdline/apt-config.cc
+#, fuzzy
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 "apt-config is an interface to the configuration settings used by\n"
-"all APT tools to be used mainly in debugging and shell scripting.\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"
 msgstr ""
+"Bruk: apt-config [innstillinger] kommando\n"
+"\n"
+"apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
@@ -1434,9 +1438,9 @@ msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
 "apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It is also possible to\n"
-"manipulate the dpkg(1) selection states of packages with it.\n"
-"It can also list all packages with or without a certain marking.\n"
+"as manually or automatically installed. It can also be used to\n"
+"manipulate the dpkg(1) selection states of packages, and to list\n"
+"all packages with or without a certain marking.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc
@@ -1972,7 +1976,8 @@ msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
 "apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike.\n"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"
 msgstr ""
 "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
 "\n"
@@ -1995,7 +2000,7 @@ msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 "apt-sortpkgs is a simple tool to sort package information files.\n"
-"It sorts by default by binary package information, but the -s option\n"
+"By default it sorts by binary package information, but the -s option\n"
 "can be used to switch to source package ordering instead.\n"
 msgstr ""
 
@@ -2188,11 +2193,6 @@ msgstr "Klarte ikke å kommunisere med underprosess/fil"
 msgid "Failed to read while computing MD5"
 msgstr "Klarte ikke å lese under utregning av MD5"
 
-#: ftparchive/multicompress.cc
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenken til %s"
-
 #: ftparchive/multicompress.cc apt-inst/extract.cc
 #, c-format
 msgid "Failed to rename %s to %s"
@@ -2278,11 +2278,6 @@ msgstr "Klarte ikke å lese lenken %s"
 
 #: ftparchive/writer.cc
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikke å oppheve lenken %s"
-
-#: ftparchive/writer.cc
-#, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikke å lenke %s til %s"
 
@@ -2506,8 +2501,8 @@ msgstr "Henter fil %li av %li"
 
 #: apt-pkg/acquire-item.cc
 msgid ""
-"Updating such a repository securely is impossible and therefore disabled by "
-"default."
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc
@@ -2563,6 +2558,13 @@ msgstr "GPG-feil: %s: %s"
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
@@ -2954,6 +2956,11 @@ msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem ved oppheving av lenke til fila %s"
+
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
 
@@ -3062,11 +3069,6 @@ msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved endring av navn på fila %s til %s"
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem ved oppheving av lenke til fila %s"
-
-#: apt-pkg/contrib/fileutl.cc
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
@@ -3075,16 +3077,16 @@ msgid "Can't mmap an empty file"
 msgstr "Kan ikke utføre mmap på en tom fil"
 
 #: apt-pkg/contrib/mmap.cc
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Klarte ikke duplisere fildeskriptor %i"
-
-#: apt-pkg/contrib/mmap.cc
 #, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr "Klarte ikke lage mmap av %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Klarte ikke duplisere fildeskriptor %i"
+
+#: apt-pkg/contrib/mmap.cc
 msgid "Unable to close mmap"
 msgstr "Klarte ikke lukke mmap"
 
@@ -3731,6 +3733,12 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Beregner oppgradering"
 
+#~ msgid "Problem unlinking %s"
+#~ msgstr "Problem ved oppheving av lenken til %s"
+
+#~ msgid "Failed to unlink %s"
+#~ msgstr "Klarte ikke å oppheve lenken %s"
+
 #~ msgid ""
 #~ "Usage: apt-cache [options] command\n"
 #~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
@@ -3767,15 +3775,6 @@ msgstr "Beregner oppgradering"
 #~ "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
 
 #~ msgid ""
-#~ "Usage: apt-config [options] command\n"
-#~ "\n"
-#~ "apt-config is a simple tool to read the APT config file\n"
-#~ msgstr ""
-#~ "Bruk: apt-config [innstillinger] kommando\n"
-#~ "\n"
-#~ "apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
-
-#~ msgid ""
 #~ "Options:\n"
 #~ "  -h   This help text.\n"
 #~ "  -c=? Read this configuration file\n"