po: Regenerate .pot files and merge .po files with them

1 files changed, 34 insertions, 28 deletions

diff --git a/po/nn.po b/po/nn.po
index a2d5ec46d..5954ea0e3 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2016-07-31 12:58+0200\n"
+"POT-Creation-Date: 2016-11-06 03:24+0100\n"
 "PO-Revision-Date: 2015-04-07 09:51+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -179,8 +179,8 @@ msgstr "uventa slutt på fil i %.250s"
 msgid "failed to seek"
 msgstr "klarte ikkje køyra «tar»"
 
-#: lib/dpkg/command.c lib/dpkg/path-remove.c src/unpack.c dpkg-deb/build.c
-#: dpkg-split/split.c utils/update-alternatives.c
+#: lib/dpkg/command.c lib/dpkg/path-remove.c src/unpack.c dpkg-split/split.c
+#: utils/update-alternatives.c
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "klarte ikkje køyra %s"
@@ -2858,11 +2858,6 @@ msgstr ""
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr "kan ikkje oppfylla førkrav for %.250s (ønskt grunna %.250s)"
 
-#: src/enquiry.c dpkg-deb/main.c
-#, fuzzy, c-format
-msgid "obsolete option '--%s'; please use '--%s' instead"
-msgstr "Åtvaring: Forelda val «%s»\n"
-
 #: src/enquiry.c
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
@@ -3016,13 +3011,13 @@ msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
-msgid "control file '%s' missing value"
-msgstr "fann ikkje «%.255s» (i «%.255s»)"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
-msgid "control file '%s' missing value separator"
-msgstr "fann ikkje «%.255s» (i «%.255s»)"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
@@ -3033,29 +3028,29 @@ msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 #: src/filesdb-hash.c
 #, fuzzy, c-format
 #| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open '%s' control file for package '%s'"
+msgid "cannot open control file '%s' for package '%s'"
 msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
-msgid "cannot stat '%s' control file for package '%s'"
+msgid "cannot stat control file '%s' for package '%s'"
 msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
-msgid "'%s' file for package '%s' is not a regular file"
+msgid "control file '%s' for package '%s' is not a regular file"
 msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
 #| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read '%s' control file for package '%s'"
+msgid "cannot read control file '%s' for package '%s'"
 msgstr "klarte ikkje lesa oppsettsfilkatalogen «%.250s» (frå «%.250s»)"
 
 #: src/filesdb-hash.c
 #, fuzzy, c-format
 #| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close '%s' control file for package '%s'"
+msgid "cannot close control file '%s' for package '%s'"
 msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
 
 #: src/help.c
@@ -4255,7 +4250,7 @@ msgstr "ugyldig pakkenamn på linje %d: %.250s"
 #: src/select.c
 #, fuzzy, c-format
 #| msgid "illegal package name at line %d: %.250s"
-msgid "package not in database at line %d: %.250s"
+msgid "package not in status nor available database at line %d: %.250s"
 msgstr "ugyldig pakkenamn på linje %d: %.250s"
 
 #: src/select.c
@@ -4270,7 +4265,8 @@ msgstr "lesefeil frå standard-inn"
 #: src/select.c
 msgid ""
 "found unknown packages; this might mean the available database\n"
-"is outdated, and needs to be updated through a frontend method"
+"is outdated, and needs to be updated through a frontend method;\n"
+"please see the FAQ <https://wiki.debian.org/Teams/Dpkg/FAQ>"
 msgstr ""
 
 #: src/selinux.c
@@ -4960,7 +4956,7 @@ msgstr "mellom medlemmer"
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c
+#: dpkg-deb/build.c dpkg-split/split.c
 #, fuzzy, c-format
 #| msgid "unable to create '%.255s'"
 msgid "unable to parse timestamp '%.255s'"
@@ -5378,9 +5374,6 @@ msgid ""
 "      --deb-format=<format>        Select archive format.\n"
 "                                     Allowed values: 0.939000, 2.0 "
 "(default).\n"
-"      --old                        Legacy alias for '--deb-"
-"format=0.939000'.\n"
-"      --new                        Legacy alias for '--deb-format=2.0'.\n"
 "      --nocheck                    Suppress control file check (build bad\n"
 "                                     packages).\n"
 "      --uniform-compression        Use the compression params on all "
@@ -5388,7 +5381,7 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed types: gzip, xz, bzip2, none.\n"
+"                                     Allowed types: gzip, xz, none.\n"
 "  -S<strategy>                     Set the compression strategy when "
 "building.\n"
 "                                     Allowed values: none; extreme (xz);\n"
@@ -5441,14 +5434,15 @@ msgid "unknown compression type '%s'!"
 msgstr "ukjend komprimeringstype «%s»!"
 
 #: dpkg-deb/main.c
-#, c-format
-msgid "deprecated compression type '%s'; use xz instead"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "unknown compression type `%s'!"
+msgid "obsolete compression type '%s'; use xz instead"
+msgstr "ukjend komprimeringstype «%s»!"
 
 #: dpkg-deb/main.c
 #, fuzzy, c-format
 #| msgid "unknown compression type `%s'!"
-msgid "deprecated compression type '%s'; use xz or gzip instead"
+msgid "obsolete compression type '%s'; use xz or gzip instead"
 msgstr "ukjend komprimeringstype «%s»!"
 
 #: dpkg-deb/main.c
@@ -6454,6 +6448,18 @@ msgstr ""
 msgid "to return to automatic updates use '%s --auto %s'"
 msgstr ""
 
+#, fuzzy
+#~ msgid "obsolete option '--%s'; please use '--%s' instead"
+#~ msgstr "Åtvaring: Forelda val «%s»\n"
+
+#, fuzzy
+#~ msgid "control file '%s' missing value"
+#~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
+
+#, fuzzy
+#~ msgid "control file '%s' missing value separator"
+#~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
+
 #~ msgid "unable to fstat part file '%.250s'"
 #~ msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"