Merge commit '1.15.8.5'

debian/changelog

@@ -16,6 +16,68 @@ dpkg (1.16.0) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 29 Jul 2010 11:00:22 +0200
 
+dpkg (1.15.8.5) unstable; urgency=low
+
+  [ Guillem Jover ]
+  * Do not print a warning when parsing status or status log files on
+    half-installed packages w/o a Description or Maintainer field, as
+    this happens normally when the package was never installed before.
+    Closes: #594167
+  * Improve git format documentation in dpkg-source(1).
+    Thanks to Joey Hess, based on a patch by Tanguy Ortolo.
+  * Clarify effect of “dpkg --purge” on homedir files in dpkg(1).
+    Thanks to The Fungi <fungi@yuggoth.org>. Closes: #593628
+  * Add gettext plurals infrastructure support.
+  * Add gettext messages for plural forms. Closes: #594218
+  * Fix possible but improbable segfault in update-alternatives in case
+    the master file name contains a format string specifier. Reported by
+    Sandro Cazzaniga.
+  * Fix realloc usage on compat scandir() implementation.
+
+  [ Raphaël Hertzog ]
+  * Fix dpkg-genchanges to not split the short description in the middle of a
+    UTF8 character. Closes: #593442
+  * Drop -k parameter from the tar call used by dpkg-source to extract
+    tarballs. Upstream binary files modified by the packager were not properly
+    installed due to this. Thanks to James Westby for the report.
+    Closes: #594440
+  * Make dpkg Breaks: dpkg-dev (<< 1.15.8) so that older versions of dpkg-dev
+    that did not depend on libdpkg-perl must be upgraded together with dpkg.
+    Closes: #596417
+
+  [ Helge Kreutzmann ]
+  * Fix encoding of German addendum. Closes: #595643
+
+  [ Updated programs translations ]
+  * Esperanto (Felipe Castro). Closes: #596173
+  * French (Christian Perrier).
+  * German (Sven Joachim).
+  * Indonesian (Arief S Fitrianto). Closes: #596657
+  * Italian (Milo Casagrande). Closes: #592953, #595615
+  * Japanese (Kenshi Muto). Closes: #595468
+  * Korean (Changwoo Ryu). Closes: #595556
+  * Norwegian Bokmål (Hans Nordhaug). Closes: #595208
+  * Simplified Chinese (Aron Xu). Closes: #594513
+  * Slovak (Ivan Masár). Closes: #595968
+  * Swedish (Peter Krefting).
+  * Thai (Theppitak Karoonboonyanan). Closes: #594011
+
+  [ Updated man page translations ]
+  * French (Christian Perrier).
+  * German (Helge Kreutzmann).
+  * Swedish (Peter Krefting).
+
+  [ Updated scripts translations ]
+  * French (Christian Perrier). Includes a fix to a specific
+    message translation that was imprecise. Closes: #596333
+  * German (Helge Kreutzmann). Improved by Holger Wansing.
+  * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #595299
+  * Spanish (Omar Campagne).  Closes: #596518
+  * Swedish (Peter Krefting).
+  * Russian (Yuri Kozlov). Closes: #595175
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 14 Sep 2010 01:26:21 +0200
+
 dpkg (1.15.8.4) unstable; urgency=low
 
   [ Guillem Jover ]

debian/control

@@ -32,7 +32,7 @@ Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
 Depends: ${misc:Depends}
-Breaks: dpkg-dev (<< 1.14.16), libdpkg-perl (<< 1.15.8),
+Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
  apt (<< 0.7.7), aptitude (<< 0.4.7-1),
 # install-info transition
 # see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo

dpkg-deb/build.c

@@ -376,7 +376,10 @@ void do_build(const char *const *argv) {
       ohshite(_("error opening conffiles file"));
     }
     if (warns)
-      warning(_("ignoring %d warnings about the control file(s)\n"), warns);
+      warning(P_("ignoring %d warning about the control file(s)\n",
+                 "ignoring %d warnings about the control file(s)\n", warns),
+              warns);
+
   }
   m_output(stdout, _("<standard output>"));
   

dpkg-deb/info.c

@@ -117,10 +117,9 @@ static void info_spew(const char *debar, const char *directory,
   }
   varbuf_destroy(&controlfile);
 
-  if (re==1)
-    ohshit(_("One requested control component is missing"));
-  else if (re>1)
-    ohshit(_("%d requested control components are missing"), re);
+  if (re > 0)
+    ohshit(P_("%d requested control component is missing",
+              "%d requested control components are missing", re), re);
 }
 
 static void info_list(const char *debar, const char *directory) {

dpkg-split/join.c

@@ -42,7 +42,9 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
   unsigned int i;
   size_t nr,buffersize;
 
-  printf(_("Putting package %s together from %d parts: "),
+  printf(P_("Putting package %s together from %d part: ",
+            "Putting package %s together from %d parts: ",
+            partlist[0]->maxpartn),
          partlist[0]->package,partlist[0]->maxpartn);
   
   buffersize= partlist[0]->maxpartlen;

dselect/po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-02-17 08:55+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"

dselect/po/ca.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-03-11 03:15+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"

dselect/po/cs.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2009-09-11 20:35+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"

dselect/po/da.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-10-06 16:32+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"

dselect/po/de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.15.6.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-21 20:15+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-03-31 18:55+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"

dselect/po/dselect.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.15.8.4\n"
+"Project-Id-Version: dpkg 1.15.8.4-20-gf505\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

dselect/po/el.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-02-17 08:56+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"

dselect/po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-03-07 09:18+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"

dselect/po/et.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"

dselect/po/eu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2009-01-05 16:29+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"

dselect/po/fr.po

@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-03-12 07:16+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: fr <debian-l10n-french@lists.debian.org>\n"

dselect/po/gl.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect_gl\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2008-12-27 15:56+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"

dselect/po/hu.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"

dselect/po/id.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-10-06 20:20+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."

dselect/po/it.po

@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-10-06 22:01+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"

dselect/po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-10-06 20:05+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"

dselect/po/ko.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2007-09-16 22:55-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"

dselect/po/nb.po

@@ -1,20 +1,22 @@
-# Norwegian Bokmål translation of dselect.
-# Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003, 2004.
-# Håvard Korsvoll <korsvoll@skulelinux.no>, 2003, 2004.
-# Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005, 2009.
+# Norwegian Bokmål translation of dselect.
+# Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003, 2004.
+# Håvard Korsvoll <korsvoll@skulelinux.no>, 2003, 2004.
+# Bjorn Steensrud <bjornst@powertech.no>, 2004.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
-"PO-Revision-Date: 2009-02-01 20:24+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
+"PO-Revision-Date: 2010-09-02 23:01+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
 
 #: dselect/basecmds.cc:125
 msgid "Search for ? "
@@ -831,18 +833,16 @@ msgstr ""
 "Opphavsrett (C) 2000,2001 Wichert Akkerman.\n"
 
 #: dselect/main.cc:163
-#, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 "Dette er fri programvare. Du finner kopieringsvilkårene i\n"
 "GNU General Public License versjon 2 eller nyere. Det finnes INGEN garanti.\n"
-"Se «%s --licence» for opphavsrett og lisensdetaljer.\n"
 
 #: dselect/main.cc:173 dselect/main.cc:221
 msgid "<standard output>"
-msgstr ""
+msgstr "<standard utdata>"
 
 #: dselect/main.cc:184
 #, c-format
@@ -873,7 +873,7 @@ msgstr ""
 "\n"
 
 #: dselect/main.cc:197
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
@@ -881,7 +881,6 @@ msgid ""
 msgstr ""
 "  --help                     viser denne hjelpmeldingen.\n"
 "  --version                  viser versjonsnummeret.\n"
-"  --license | --licence      viser lisensen.\n"
 "\n"
 
 #: dselect/main.cc:202
@@ -1082,9 +1081,8 @@ msgid "Press <enter> to continue.\n"
 msgstr "Trykk <enter> for å fortsette.\n"
 
 #: dselect/method.cc:180
-#, fuzzy
 msgid "<standard error>"
-msgstr "skrivefeil på standard-feil"
+msgstr "<standard feil>"
 
 #: dselect/method.cc:183
 msgid "error reading acknowledgement of program failure message"
@@ -1272,7 +1270,7 @@ msgstr "utpakket (ikke satt opp)"
 
 #: dselect/pkgdisplay.cc:54
 msgid "half configured (config failed)"
-msgstr ""
+msgstr "halvveis satt opp (oppsett mislyktes)"
 
 #: dselect/pkgdisplay.cc:55
 msgid "awaiting trigger processing"
@@ -1556,7 +1554,7 @@ msgstr "Tilgjengelig kontrollfilinformasjon"
 
 #: dselect/pkglist.cc:421
 msgid "There are no packages."
-msgstr ""
+msgstr "Det er ingen pakker."
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"

dselect/po/nl.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2008-05-05 13:20+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"

dselect/po/nn.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-02-17 08:57+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"

dselect/po/pl.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2009-09-27 02:41+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"

dselect/po/pt.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2008-12-27 16:05+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"

dselect/po/pt_BR.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2008-06-09 02:53-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."

dselect/po/ro.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2008-06-28 19:11+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"

dselect/po/ru.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.7.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-04-25 22:37+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"

dselect/po/sk.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2009-07-20 17:32+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

dselect/po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-03-08 13:37+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"

dselect/po/tl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"

dselect/po/vi.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-10-09 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"

dselect/po/zh_CN.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"

dselect/po/zh_TW.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"

lib/dpkg/i18n.h

@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * i18n.h - i18n support
  *
- * Copyright © 2008 Guillem Jover <guillem@debian.org>
+ * Copyright © 2008-2010 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ DPKG_BEGIN_DECLS
 #include <gettext.h>
 
 #define _(str) gettext(str)
+#define P_(str, str_plural, n) ngettext(str, str_plural, n)
 #define N_(str) gettext_noop(str)
 
 DPKG_END_DECLS

lib/dpkg/parse.c

@@ -249,14 +249,19 @@ int parsedb(const char *filename, enum parsedbflags flags,
       parse_error(&ps, &newpig,
                   _("several package info entries found, only one allowed"));
     parse_must_have_field(&ps, &newpig, newpig.name, "package name");
-    if ((flags & pdb_recordavailable) || newpig.status != stat_notinstalled) {
+    /* XXX: We need to check for status != stat_halfinstalled as while
+     * unpacking a deselected package, it will not have yet all data in
+     * place. But we cannot check for > stat_halfinstalled as stat_configfiles
+     * always should have those fields. */
+    if ((flags & pdb_recordavailable) ||
+        (newpig.status != stat_notinstalled &&
+         newpig.status != stat_halfinstalled)) {
       parse_ensure_have_field(&ps, &newpig,
                               &newpifp->description, "description");
       parse_ensure_have_field(&ps, &newpig,
                               &newpifp->maintainer, "maintainer");
-      if (newpig.status != stat_halfinstalled)
-        parse_must_have_field(&ps, &newpig,
-                              newpifp->version.version, "version");
+      parse_must_have_field(&ps, &newpig,
+                            newpifp->version.version, "version");
     }
     if (flags & pdb_recordavailable)
       parse_ensure_have_field(&ps, &newpig,

man/dpkg-source.1

@@ -555,12 +555,18 @@ The generated .dsc file will contain this value in its \fIFormat\fP field
 and not "3.0 (custom)".
 .
 .SS Format: 3.0 (git)
-This format is experimental. It uses a bundle of a git repository to hold
-the source of a package.
+This format is experimental.
+.PP
+A source package in this format consists of a
+single bundle of a git repository \fB.git\fP to hold the source of a package.
+There may also be a \fB.gitshallow\fP file listing revisions for a shallow
+git clone.
 .PP
 .B Extracting
 .PP
-The bundle is cloned to a new git repository.
+The bundle is cloned as a git repository to the target directory.
+If there is a gitshallow file, it is installed as `.git/shallow` inside
+the cloned git repository.
 .PP
 Note that by default the new repository will have the same branch checked
 out that was checked out in the original source. (Typically "master", but

man/dpkg.1

@@ -86,8 +86,8 @@ The package is selected for deinstallation (i.e. we want to remove all
 files, except configuration files).
 .TP
 .B purge
-The package is selected to be purged (i.e. we want to remove everything,
-even configuration files).
+The package is selected to be purged (i.e. we want to remove everything
+from system directories, even configuration files).
 .SS PACKAGE FLAGS
 .TP
 .B reinst\-required
@@ -172,7 +172,9 @@ respectively. Note: some configuration files might be unknown to
 \fBdpkg\fP because they are created and handled separately through the
 configuration scripts. In that case, \fBdpkg\fP won't remove them by
 itself, but the package's \fIpostrm\fP script (which is called by
-\fBdpkg\fP), has to take care of their removal during purge.
+\fBdpkg\fP), has to take care of their removal during purge. Of course,
+this only applies to files in system directories, not configuration files
+written to individual users' home directories.
 
 Removing of a package consists of the following steps:
 .br

man/po/po4a.cfg

@@ -3,7 +3,7 @@
 
 # Make sure the man pages are generated with the right encoding.
 [po4a_alias:man] man                                      \
-                 opt_de:"-L ISO-8859-1"                   \
+                 opt_de:"-L ISO-8859-1     -A utf-8"      \
                  opt_es:"-L ISO-8859-1     -A utf-8"      \
                  opt_fr:"-L ISO-8859-1"                   \
                  opt_hu:"-L ISO-8859-2     -A ISO-8859-2" \

po/Makevars

@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=_g --from-code=UTF-8
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 --from-code=UTF-8
 
 MSGMERGE_OPTIONS = --previous
 

po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2009-11-14 17:44+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -161,7 +161,7 @@ msgstr ""
 
 #  Now that we have verified everything its time to actually
 #  * build something. Lets start by making the ar-wrapper.
-#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:386
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:389
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -762,38 +762,38 @@ msgstr ""
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -1493,14 +1493,14 @@ msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
 #: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
-#: src/enquiry.c:163 src/enquiry.c:268 src/enquiry.c:411 src/enquiry.c:413
-#: src/enquiry.c:422 src/main.c:65 src/main.c:159 src/main.c:257
+#: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
 #: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:381
-#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:192
-#: dpkg-deb/info.c:248 dpkg-deb/main.c:61 dpkg-deb/main.c:124
+#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
+#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:191
+#: dpkg-deb/info.c:247 dpkg-deb/main.c:61 dpkg-deb/main.c:124
 #: dpkg-split/info.c:250 dpkg-split/main.c:53 dpkg-split/main.c:91
 #: dpkg-split/queue.c:141 dpkg-split/queue.c:266
 msgid "<standard output>"
@@ -2106,14 +2106,14 @@ msgstr ""
 msgid "cannot create new %s file"
 msgstr ""
 
-#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
-#: dpkg-split/join.c:73 dpkg-split/queue.c:185
+#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:527
+#: dpkg-split/join.c:75 dpkg-split/queue.c:185
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
-#: dpkg-split/join.c:75 dpkg-split/queue.c:187
+#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:529
+#: dpkg-split/join.c:77 dpkg-split/queue.c:187
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
@@ -2273,9 +2273,9 @@ msgid ""
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:279 src/enquiry.c:342
-#: src/enquiry.c:418 src/select.c:92 src/select.c:149 src/trigcmd.c:199
-#: src/update.c:44 src/update.c:101 dpkg-split/queue.c:225
+#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:281 src/enquiry.c:344
+#: src/enquiry.c:420 src/select.c:92 src/select.c:149 src/trigcmd.c:199
+#: src/update.c:44 src/update.c:102 dpkg-split/queue.c:225
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2297,64 +2297,66 @@ msgstr ""
 
 #: src/enquiry.c:257
 #, c-format
-msgid " %d packages, from the following sections:"
-msgstr ""
+msgid " %d package, from the following section:"
+msgid_plural " %d packages, from the following sections:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/enquiry.c:292
+#: src/enquiry.c:294
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c:297
+#: src/enquiry.c:299
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c:305
+#: src/enquiry.c:307
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:310
+#: src/enquiry.c:312
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:315
+#: src/enquiry.c:317
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:320
+#: src/enquiry.c:322
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:397
+#: src/enquiry.c:399
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: src/enquiry.c:398
+#: src/enquiry.c:400
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:428
+#: src/enquiry.c:430
 #, c-format
 msgid "obsolete option '--%s', please use '--%s' instead."
 msgstr ""
 
-#: src/enquiry.c:469
+#: src/enquiry.c:471
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: src/enquiry.c:474
+#: src/enquiry.c:476
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:479 src/enquiry.c:486
+#: src/enquiry.c:481 src/enquiry.c:488
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2442,35 +2444,37 @@ msgstr ""
 
 #: src/filesdb.c:446
 #, c-format
-msgid "%d files and directories currently installed.)\n"
-msgstr ""
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/filesdb.c:479
+#: src/filesdb.c:481
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:489
+#: src/filesdb.c:491
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:491
+#: src/filesdb.c:493
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:493
+#: src/filesdb.c:495
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:496
+#: src/filesdb.c:498
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:498
+#: src/filesdb.c:500
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2516,78 +2520,82 @@ msgstr ""
 msgid "'%s' not found in PATH or not executable."
 msgstr ""
 
-#: src/help.c:136
+#: src/help.c:137
 #, c-format
 msgid ""
-"%d expected program(s) not found in PATH or not executable.\n"
+"%d expected program not found in PATH or not executable.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr ""
+msgid_plural ""
+"%d expected programs not found in PATH or not executable.\n"
+"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/help.c:184
+#: src/help.c:187
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:186 dpkg-deb/build.c:395 dpkg-deb/build.c:462
-#: dpkg-deb/build.c:485
+#: src/help.c:189 dpkg-deb/build.c:398 dpkg-deb/build.c:465
+#: dpkg-deb/build.c:488
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:246
+#: src/help.c:249
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:265
+#: src/help.c:268
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:292
 #, c-format
 msgid "installed %s script"
 msgstr ""
 
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:305 src/help.c:371 src/help.c:430
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:354 src/help.c:414
+#: src/help.c:357 src/help.c:417
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:388
+#: src/help.c:391
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:402
+#: src/help.c:405
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr ""
 
-#: src/help.c:411
+#: src/help.c:414
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:425
+#: src/help.c:428
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:431
+#: src/help.c:434
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:582
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr ""
 
-#: src/help.c:584 dpkg-deb/info.c:63
+#: src/help.c:587 dpkg-deb/info.c:63
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
@@ -3747,10 +3755,12 @@ msgstr ""
 
 #: src/update.c:96
 #, c-format
-msgid "Information about %d package(s) was updated.\n"
-msgstr ""
+msgid "Information about %d package was updated.\n"
+msgid_plural "Information about %d packages was updated.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/update.c:103
+#: src/update.c:104
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -3766,8 +3776,8 @@ msgstr ""
 msgid "unable to stat file name '%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
-#: utils/update-alternatives.c:2106
+#: dpkg-deb/build.c:229 utils/update-alternatives.c:2102
+#: utils/update-alternatives.c:2109
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -3887,69 +3897,71 @@ msgstr ""
 
 #: dpkg-deb/build.c:379
 #, c-format
-msgid "ignoring %d warnings about the control file(s)\n"
-msgstr ""
+msgid "ignoring %d warning about the control file(s)\n"
+msgid_plural "ignoring %d warnings about the control file(s)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/build.c:388
+#: dpkg-deb/build.c:391
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:396
+#: dpkg-deb/build.c:399
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:398 dpkg-deb/build.c:464
+#: dpkg-deb/build.c:401 dpkg-deb/build.c:467
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:405
+#: dpkg-deb/build.c:408
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:407
+#: dpkg-deb/build.c:410
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:415 dpkg-deb/build.c:432
+#: dpkg-deb/build.c:418 dpkg-deb/build.c:435
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:422
+#: dpkg-deb/build.c:425
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:432
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:448
+#: dpkg-deb/build.c:451
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:450
+#: dpkg-deb/build.c:453
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:474 dpkg-deb/extract.c:275
+#: dpkg-deb/build.c:477 dpkg-deb/extract.c:275
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/build.c:488
+#: dpkg-deb/build.c:491
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:507
+#: dpkg-deb/build.c:502 dpkg-deb/build.c:510
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:511
+#: dpkg-deb/build.c:514
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:519
+#: dpkg-deb/build.c:522
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
@@ -4170,66 +4182,64 @@ msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
 #: dpkg-deb/info.c:121
-msgid "One requested control component is missing"
-msgstr ""
-
-#: dpkg-deb/info.c:123
 #, c-format
-msgid "%d requested control components are missing"
-msgstr ""
+msgid "%d requested control component is missing"
+msgid_plural "%d requested control components are missing"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/info.c:136
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:144
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159 dpkg-deb/info.c:174 dpkg-deb/info.c:188
+#: dpkg-deb/info.c:158 dpkg-deb/info.c:173 dpkg-deb/info.c:187
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:162
+#: dpkg-deb/info.c:161
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:166
+#: dpkg-deb/info.c:165
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:175
+#: dpkg-deb/info.c:174
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:205
+#: dpkg-deb/info.c:204
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:244
+#: dpkg-deb/info.c:243
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:246
+#: dpkg-deb/info.c:245
 #, c-format
 msgid "error closing the '%s' component"
 msgstr ""
 
-#: dpkg-deb/info.c:257
+#: dpkg-deb/info.c:256
 msgid "Error in format"
 msgstr "Greška u formatu"
 
-#: dpkg-deb/info.c:294
+#: dpkg-deb/info.c:293
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4460,7 +4470,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:237 dpkg-split/join.c:113
+#: dpkg-split/info.c:237 dpkg-split/join.c:115
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
@@ -4472,35 +4482,37 @@ msgstr ""
 
 #: dpkg-split/join.c:45
 #, c-format
-msgid "Putting package %s together from %d parts: "
-msgstr ""
+msgid "Putting package %s together from %d part: "
+msgid_plural "Putting package %s together from %d parts: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-split/join.c:53
+#: dpkg-split/join.c:55
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:57
+#: dpkg-split/join.c:59
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:78
+#: dpkg-split/join.c:80
 #, c-format
 msgid "done\n"
 msgstr "urađeno\n"
 
-#: dpkg-split/join.c:94
+#: dpkg-split/join.c:96
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr ""
 
-#: dpkg-split/join.c:99
+#: dpkg-split/join.c:101
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:136
+#: dpkg-split/join.c:138
 #, c-format
 msgid "part %d is missing"
 msgstr ""
@@ -4763,7 +4775,7 @@ msgstr ""
 
 #: utils/update-alternatives.c:270 utils/update-alternatives.c:594
 #: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
-#: utils/update-alternatives.c:1568
+#: utils/update-alternatives.c:1571
 #, c-format
 msgid "cannot stat %s: %s"
 msgstr ""
@@ -4813,7 +4825,7 @@ msgstr ""
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
+#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1859
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
@@ -4927,13 +4939,13 @@ msgstr ""
 msgid "cannot write %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
-#: utils/update-alternatives.c:2406
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1451
+#: utils/update-alternatives.c:2409
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1457
-#: utils/update-alternatives.c:2407
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1460
+#: utils/update-alternatives.c:2410
 msgid "manual mode"
 msgstr ""
 
@@ -4965,278 +4977,280 @@ msgstr "Debianov `%s' program za rukovanje paketima."
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1432
+#: utils/update-alternatives.c:1435
 #, c-format
-msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr ""
+msgid "There is %d choice for the alternative %s (providing %s)."
+msgid_plural "There are %d choices for the alternative %s (providing %s)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/update-alternatives.c:1439
+#: utils/update-alternatives.c:1442
 #, fuzzy
 msgid "Selection"
 msgstr "Opis"
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1461
+#: utils/update-alternatives.c:1464
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1582
+#: utils/update-alternatives.c:1585
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1595
+#: utils/update-alternatives.c:1598
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1613
+#: utils/update-alternatives.c:1616
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1823 utils/update-alternatives.c:1829
+#: utils/update-alternatives.c:1826 utils/update-alternatives.c:1832
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1833
+#: utils/update-alternatives.c:1836
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1837
+#: utils/update-alternatives.c:1840
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1862
+#: utils/update-alternatives.c:1865
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
-#: utils/update-alternatives.c:1898
+#: utils/update-alternatives.c:1878 utils/update-alternatives.c:1891
+#: utils/update-alternatives.c:1901
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1917
+#: utils/update-alternatives.c:1920
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1948
+#: utils/update-alternatives.c:1951
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1994
+#: utils/update-alternatives.c:1997
 #, c-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2013
+#: utils/update-alternatives.c:2016
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2016 utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2019 utils/update-alternatives.c:2070
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2022
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2032
+#: utils/update-alternatives.c:2035
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2046
+#: utils/update-alternatives.c:2049
 #, c-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2058
+#: utils/update-alternatives.c:2061
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2060
+#: utils/update-alternatives.c:2063
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2072
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2072
+#: utils/update-alternatives.c:2075
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2078
 #, c-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2085
 #, c-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
+#: utils/update-alternatives.c:2095
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2118
+#: utils/update-alternatives.c:2121
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2123
+#: utils/update-alternatives.c:2126
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2166 utils/update-alternatives.c:2210
+#: utils/update-alternatives.c:2169 utils/update-alternatives.c:2213
 #, c-format
 msgid "it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2171
 #, c-format
 msgid "alternative %s can't be master: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
+#: utils/update-alternatives.c:2181 utils/update-alternatives.c:2223
 #, c-format
 msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2183 utils/update-alternatives.c:2226
+#: utils/update-alternatives.c:2186 utils/update-alternatives.c:2229
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2187 utils/update-alternatives.c:2230
+#: utils/update-alternatives.c:2190 utils/update-alternatives.c:2233
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
+#: utils/update-alternatives.c:2194
 #, c-format
 msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2195 utils/update-alternatives.c:2234
+#: utils/update-alternatives.c:2198 utils/update-alternatives.c:2237
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2208
+#: utils/update-alternatives.c:2211
 msgid "it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2212
+#: utils/update-alternatives.c:2215
 #, c-format
 msgid "alternative %s can't be slave of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2258
+#: utils/update-alternatives.c:2261
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
+#: utils/update-alternatives.c:2270 utils/update-alternatives.c:2273
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2296
+#: utils/update-alternatives.c:2299
 #, c-format
 msgid "%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2300
+#: utils/update-alternatives.c:2303
 #, c-format
 msgid ""
 "%s has been changed (manually or by a script). Switching to manual updates "
 "only."
 msgstr ""
 
-#: utils/update-alternatives.c:2309
+#: utils/update-alternatives.c:2312
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2321
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2326
+#: utils/update-alternatives.c:2329
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2328 utils/update-alternatives.c:2338
+#: utils/update-alternatives.c:2331 utils/update-alternatives.c:2341
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2336
+#: utils/update-alternatives.c:2339
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2347
+#: utils/update-alternatives.c:2350
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2355
+#: utils/update-alternatives.c:2358
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2383
+#: utils/update-alternatives.c:2386
 #, c-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2388
 #, c-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2407
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2412
+#: utils/update-alternatives.c:2415
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""

po/dpkg.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.15.8.4\n"
+"Project-Id-Version: dpkg 1.15.8.4-20-gf505\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: lib/dpkg/ar.c:54 lib/dpkg/ar.c:70 lib/dpkg/ar.c:81 lib/dpkg/ar.c:85
 #: lib/dpkg/ar.c:104
@@ -160,7 +161,7 @@ msgstr ""
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:386
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:389
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -759,38 +760,38 @@ msgstr ""
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -1489,14 +1490,14 @@ msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
 #: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
-#: src/enquiry.c:163 src/enquiry.c:268 src/enquiry.c:411 src/enquiry.c:413
-#: src/enquiry.c:422 src/main.c:65 src/main.c:159 src/main.c:257
+#: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
 #: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:381
-#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:192
-#: dpkg-deb/info.c:248 dpkg-deb/main.c:61 dpkg-deb/main.c:124
+#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
+#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:191
+#: dpkg-deb/info.c:247 dpkg-deb/main.c:61 dpkg-deb/main.c:124
 #: dpkg-split/info.c:250 dpkg-split/main.c:53 dpkg-split/main.c:91
 #: dpkg-split/queue.c:141 dpkg-split/queue.c:266
 msgid "<standard output>"
@@ -2094,14 +2095,14 @@ msgstr ""
 msgid "cannot create new %s file"
 msgstr ""
 
-#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
-#: dpkg-split/join.c:73 dpkg-split/queue.c:185
+#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:527
+#: dpkg-split/join.c:75 dpkg-split/queue.c:185
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
-#: dpkg-split/join.c:75 dpkg-split/queue.c:187
+#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:529
+#: dpkg-split/join.c:77 dpkg-split/queue.c:187
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
@@ -2261,9 +2262,9 @@ msgid ""
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:279 src/enquiry.c:342
-#: src/enquiry.c:418 src/select.c:92 src/select.c:149 src/trigcmd.c:199
-#: src/update.c:44 src/update.c:101 dpkg-split/queue.c:225
+#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:281 src/enquiry.c:344
+#: src/enquiry.c:420 src/select.c:92 src/select.c:149 src/trigcmd.c:199
+#: src/update.c:44 src/update.c:102 dpkg-split/queue.c:225
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2285,64 +2286,66 @@ msgstr ""
 
 #: src/enquiry.c:257
 #, c-format
-msgid " %d packages, from the following sections:"
-msgstr ""
+msgid " %d package, from the following section:"
+msgid_plural " %d packages, from the following sections:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/enquiry.c:292
+#: src/enquiry.c:294
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c:297
+#: src/enquiry.c:299
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c:305
+#: src/enquiry.c:307
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:310
+#: src/enquiry.c:312
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:315
+#: src/enquiry.c:317
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:320
+#: src/enquiry.c:322
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:397
+#: src/enquiry.c:399
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: src/enquiry.c:398
+#: src/enquiry.c:400
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:428
+#: src/enquiry.c:430
 #, c-format
 msgid "obsolete option '--%s', please use '--%s' instead."
 msgstr ""
 
-#: src/enquiry.c:469
+#: src/enquiry.c:471
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: src/enquiry.c:474
+#: src/enquiry.c:476
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:479 src/enquiry.c:486
+#: src/enquiry.c:481 src/enquiry.c:488
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2430,35 +2433,37 @@ msgstr ""
 
 #: src/filesdb.c:446
 #, c-format
-msgid "%d files and directories currently installed.)\n"
-msgstr ""
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/filesdb.c:479
+#: src/filesdb.c:481
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:489
+#: src/filesdb.c:491
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:491
+#: src/filesdb.c:493
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:493
+#: src/filesdb.c:495
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:496
+#: src/filesdb.c:498
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:498
+#: src/filesdb.c:500
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2504,78 +2509,82 @@ msgstr ""
 msgid "'%s' not found in PATH or not executable."
 msgstr ""
 
-#: src/help.c:136
+#: src/help.c:137
 #, c-format
 msgid ""
-"%d expected program(s) not found in PATH or not executable.\n"
+"%d expected program not found in PATH or not executable.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr ""
+msgid_plural ""
+"%d expected programs not found in PATH or not executable.\n"
+"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/help.c:184
+#: src/help.c:187
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:186 dpkg-deb/build.c:395 dpkg-deb/build.c:462
-#: dpkg-deb/build.c:485
+#: src/help.c:189 dpkg-deb/build.c:398 dpkg-deb/build.c:465
+#: dpkg-deb/build.c:488
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:246
+#: src/help.c:249
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:265
+#: src/help.c:268
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:292
 #, c-format
 msgid "installed %s script"
 msgstr ""
 
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:305 src/help.c:371 src/help.c:430
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:354 src/help.c:414
+#: src/help.c:357 src/help.c:417
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:388
+#: src/help.c:391
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:402
+#: src/help.c:405
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr ""
 
-#: src/help.c:411
+#: src/help.c:414
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:425
+#: src/help.c:428
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:431
+#: src/help.c:434
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:582
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr ""
 
-#: src/help.c:584 dpkg-deb/info.c:63
+#: src/help.c:587 dpkg-deb/info.c:63
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
@@ -3735,10 +3744,12 @@ msgstr ""
 
 #: src/update.c:96
 #, c-format
-msgid "Information about %d package(s) was updated.\n"
-msgstr ""
+msgid "Information about %d package was updated.\n"
+msgid_plural "Information about %d packages was updated.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/update.c:103
+#: src/update.c:104
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -3754,8 +3765,8 @@ msgstr ""
 msgid "unable to stat file name '%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
-#: utils/update-alternatives.c:2106
+#: dpkg-deb/build.c:229 utils/update-alternatives.c:2102
+#: utils/update-alternatives.c:2109
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -3875,69 +3886,71 @@ msgstr ""
 
 #: dpkg-deb/build.c:379
 #, c-format
-msgid "ignoring %d warnings about the control file(s)\n"
-msgstr ""
+msgid "ignoring %d warning about the control file(s)\n"
+msgid_plural "ignoring %d warnings about the control file(s)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/build.c:388
+#: dpkg-deb/build.c:391
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:396
+#: dpkg-deb/build.c:399
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:398 dpkg-deb/build.c:464
+#: dpkg-deb/build.c:401 dpkg-deb/build.c:467
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:405
+#: dpkg-deb/build.c:408
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:407
+#: dpkg-deb/build.c:410
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:415 dpkg-deb/build.c:432
+#: dpkg-deb/build.c:418 dpkg-deb/build.c:435
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:422
+#: dpkg-deb/build.c:425
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:432
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:448
+#: dpkg-deb/build.c:451
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:450
+#: dpkg-deb/build.c:453
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:474 dpkg-deb/extract.c:275
+#: dpkg-deb/build.c:477 dpkg-deb/extract.c:275
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/build.c:488
+#: dpkg-deb/build.c:491
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:507
+#: dpkg-deb/build.c:502 dpkg-deb/build.c:510
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:511
+#: dpkg-deb/build.c:514
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:519
+#: dpkg-deb/build.c:522
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
@@ -4158,66 +4171,64 @@ msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
 #: dpkg-deb/info.c:121
-msgid "One requested control component is missing"
-msgstr ""
-
-#: dpkg-deb/info.c:123
 #, c-format
-msgid "%d requested control components are missing"
-msgstr ""
+msgid "%d requested control component is missing"
+msgid_plural "%d requested control components are missing"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/info.c:136
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:144
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159 dpkg-deb/info.c:174 dpkg-deb/info.c:188
+#: dpkg-deb/info.c:158 dpkg-deb/info.c:173 dpkg-deb/info.c:187
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:162
+#: dpkg-deb/info.c:161
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:166
+#: dpkg-deb/info.c:165
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:175
+#: dpkg-deb/info.c:174
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:205
+#: dpkg-deb/info.c:204
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:244
+#: dpkg-deb/info.c:243
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:246
+#: dpkg-deb/info.c:245
 #, c-format
 msgid "error closing the '%s' component"
 msgstr ""
 
-#: dpkg-deb/info.c:257
+#: dpkg-deb/info.c:256
 msgid "Error in format"
 msgstr ""
 
-#: dpkg-deb/info.c:294
+#: dpkg-deb/info.c:293
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4444,7 +4455,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:237 dpkg-split/join.c:113
+#: dpkg-split/info.c:237 dpkg-split/join.c:115
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
@@ -4456,35 +4467,37 @@ msgstr ""
 
 #: dpkg-split/join.c:45
 #, c-format
-msgid "Putting package %s together from %d parts: "
-msgstr ""
+msgid "Putting package %s together from %d part: "
+msgid_plural "Putting package %s together from %d parts: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-split/join.c:53
+#: dpkg-split/join.c:55
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:57
+#: dpkg-split/join.c:59
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:78
+#: dpkg-split/join.c:80
 #, c-format
 msgid "done\n"
 msgstr ""
 
-#: dpkg-split/join.c:94
+#: dpkg-split/join.c:96
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr ""
 
-#: dpkg-split/join.c:99
+#: dpkg-split/join.c:101
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:136
+#: dpkg-split/join.c:138
 #, c-format
 msgid "part %d is missing"
 msgstr ""
@@ -4747,7 +4760,7 @@ msgstr ""
 
 #: utils/update-alternatives.c:270 utils/update-alternatives.c:594
 #: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
-#: utils/update-alternatives.c:1568
+#: utils/update-alternatives.c:1571
 #, c-format
 msgid "cannot stat %s: %s"
 msgstr ""
@@ -4797,7 +4810,7 @@ msgstr ""
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
+#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1859
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
@@ -4911,13 +4924,13 @@ msgstr ""
 msgid "cannot write %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
-#: utils/update-alternatives.c:2406
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1451
+#: utils/update-alternatives.c:2409
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1457
-#: utils/update-alternatives.c:2407
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1460
+#: utils/update-alternatives.c:2410
 msgid "manual mode"
 msgstr ""
 
@@ -4949,277 +4962,279 @@ msgstr ""
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1432
+#: utils/update-alternatives.c:1435
 #, c-format
-msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr ""
+msgid "There is %d choice for the alternative %s (providing %s)."
+msgid_plural "There are %d choices for the alternative %s (providing %s)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/update-alternatives.c:1439
+#: utils/update-alternatives.c:1442
 msgid "Selection"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1461
+#: utils/update-alternatives.c:1464
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1582
+#: utils/update-alternatives.c:1585
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1595
+#: utils/update-alternatives.c:1598
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1613
+#: utils/update-alternatives.c:1616
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1823 utils/update-alternatives.c:1829
+#: utils/update-alternatives.c:1826 utils/update-alternatives.c:1832
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1833
+#: utils/update-alternatives.c:1836
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1837
+#: utils/update-alternatives.c:1840
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1862
+#: utils/update-alternatives.c:1865
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
-#: utils/update-alternatives.c:1898
+#: utils/update-alternatives.c:1878 utils/update-alternatives.c:1891
+#: utils/update-alternatives.c:1901
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1917
+#: utils/update-alternatives.c:1920
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1948
+#: utils/update-alternatives.c:1951
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1994
+#: utils/update-alternatives.c:1997
 #, c-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2013
+#: utils/update-alternatives.c:2016
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2016 utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2019 utils/update-alternatives.c:2070
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2022
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2032
+#: utils/update-alternatives.c:2035
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2046
+#: utils/update-alternatives.c:2049
 #, c-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2058
+#: utils/update-alternatives.c:2061
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2060
+#: utils/update-alternatives.c:2063
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2072
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2072
+#: utils/update-alternatives.c:2075
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2078
 #, c-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2085
 #, c-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
+#: utils/update-alternatives.c:2095
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2118
+#: utils/update-alternatives.c:2121
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2123
+#: utils/update-alternatives.c:2126
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2166 utils/update-alternatives.c:2210
+#: utils/update-alternatives.c:2169 utils/update-alternatives.c:2213
 #, c-format
 msgid "it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2171
 #, c-format
 msgid "alternative %s can't be master: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
+#: utils/update-alternatives.c:2181 utils/update-alternatives.c:2223
 #, c-format
 msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2183 utils/update-alternatives.c:2226
+#: utils/update-alternatives.c:2186 utils/update-alternatives.c:2229
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2187 utils/update-alternatives.c:2230
+#: utils/update-alternatives.c:2190 utils/update-alternatives.c:2233
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
+#: utils/update-alternatives.c:2194
 #, c-format
 msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2195 utils/update-alternatives.c:2234
+#: utils/update-alternatives.c:2198 utils/update-alternatives.c:2237
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2208
+#: utils/update-alternatives.c:2211
 msgid "it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2212
+#: utils/update-alternatives.c:2215
 #, c-format
 msgid "alternative %s can't be slave of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2258
+#: utils/update-alternatives.c:2261
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
+#: utils/update-alternatives.c:2270 utils/update-alternatives.c:2273
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2296
+#: utils/update-alternatives.c:2299
 #, c-format
 msgid "%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2300
+#: utils/update-alternatives.c:2303
 #, c-format
 msgid ""
 "%s has been changed (manually or by a script). Switching to manual updates "
 "only."
 msgstr ""
 
-#: utils/update-alternatives.c:2309
+#: utils/update-alternatives.c:2312
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2321
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2326
+#: utils/update-alternatives.c:2329
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2328 utils/update-alternatives.c:2338
+#: utils/update-alternatives.c:2331 utils/update-alternatives.c:2341
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2336
+#: utils/update-alternatives.c:2339
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2347
+#: utils/update-alternatives.c:2350
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2355
+#: utils/update-alternatives.c:2358
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2383
+#: utils/update-alternatives.c:2386
 #, c-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2388
 #, c-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2407
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2412
+#: utils/update-alternatives.c:2415
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""

po/et.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2007-07-12 22:06+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -164,7 +164,7 @@ msgstr "uuenduste kataloogi `%.255s' pole võimalik läbi vaadata"
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:386
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:389
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "faili `%.255s' pole võimalik luua"
@@ -778,38 +778,38 @@ msgstr "korduv kasutaja poolt kirjeldatud välja `%.*s' väärtus"
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr "tõrge sulgemisel pärast lugemist: `%.255s'"
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -1523,14 +1523,14 @@ msgid "--%s needs at least one package archive file argument"
 msgstr "--%s vajab argumendiks vähemalt ühte pakiarhiivi nime"
 
 #: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
-#: src/enquiry.c:163 src/enquiry.c:268 src/enquiry.c:411 src/enquiry.c:413
-#: src/enquiry.c:422 src/main.c:65 src/main.c:159 src/main.c:257
+#: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
 #: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:381
-#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:192
-#: dpkg-deb/info.c:248 dpkg-deb/main.c:61 dpkg-deb/main.c:124
+#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
+#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:191
+#: dpkg-deb/info.c:247 dpkg-deb/main.c:61 dpkg-deb/main.c:124
 #: dpkg-split/info.c:250 dpkg-split/main.c:53 dpkg-split/main.c:91
 #: dpkg-split/queue.c:141 dpkg-split/queue.c:266
 msgid "<standard output>"
@@ -2178,14 +2178,14 @@ msgstr "paki %s diversioonid"
 msgid "cannot create new %s file"
 msgstr "GPL-faili pole võimalik avada"
 
-#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
-#: dpkg-split/join.c:73 dpkg-split/queue.c:185
+#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:527
+#: dpkg-split/join.c:75 dpkg-split/queue.c:185
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "tõrge puhvrite tühjendamisel funktsioonis vsnprintf"
 
-#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
-#: dpkg-split/join.c:75 dpkg-split/queue.c:187
+#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:529
+#: dpkg-split/join.c:77 dpkg-split/queue.c:187
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
@@ -2352,9 +2352,9 @@ msgid ""
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:279 src/enquiry.c:342
-#: src/enquiry.c:418 src/select.c:92 src/select.c:149 src/trigcmd.c:199
-#: src/update.c:44 src/update.c:101 dpkg-split/queue.c:225
+#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:281 src/enquiry.c:344
+#: src/enquiry.c:420 src/select.c:92 src/select.c:149 src/trigcmd.c:199
+#: src/update.c:44 src/update.c:102 dpkg-split/queue.c:225
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s ei vaja argumente"
@@ -2375,65 +2375,68 @@ msgid " %d in %s: "
 msgstr ""
 
 #: src/enquiry.c:257
-#, c-format
-msgid " %d packages, from the following sections:"
-msgstr " %d pakki järgnevatest osadest:"
+#, fuzzy, c-format
+#| msgid " %d packages, from the following sections:"
+msgid " %d package, from the following section:"
+msgid_plural " %d packages, from the following sections:"
+msgstr[0] " %d pakki järgnevatest osadest:"
+msgstr[1] " %d pakki järgnevatest osadest:"
 
-#: src/enquiry.c:292
+#: src/enquiry.c:294
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c:297
+#: src/enquiry.c:299
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c:305
+#: src/enquiry.c:307
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:310
+#: src/enquiry.c:312
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:315
+#: src/enquiry.c:317
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:320
+#: src/enquiry.c:322
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:397
+#: src/enquiry.c:399
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: src/enquiry.c:398
+#: src/enquiry.c:400
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:428
+#: src/enquiry.c:430
 #, fuzzy, c-format
 msgid "obsolete option '--%s', please use '--%s' instead."
 msgstr "Hoiatus: aegunud võti `--%s'\n"
 
-#: src/enquiry.c:469
+#: src/enquiry.c:471
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr "--compare-versions vajab kolme argumenti: <versioon> <suhe> <versioon>"
 
-#: src/enquiry.c:474
+#: src/enquiry.c:476
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions vigane suhe"
 
-#: src/enquiry.c:479 src/enquiry.c:486
+#: src/enquiry.c:481 src/enquiry.c:488
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: versioon '%s' on vigase süntaksiga: %s\n"
@@ -2524,36 +2527,39 @@ msgid "(Reading database ... "
 msgstr "(Andmebaasi lugemine ... "
 
 #: src/filesdb.c:446
-#, c-format
-msgid "%d files and directories currently installed.)\n"
-msgstr "hetkel on paigaldatud %d faili ja kataloogi.)\n"
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
+msgstr[1] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
 
-#: src/filesdb.c:479
+#: src/filesdb.c:481
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:489
+#: src/filesdb.c:491
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:491
+#: src/filesdb.c:493
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:493
+#: src/filesdb.c:495
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:496
+#: src/filesdb.c:498
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:498
+#: src/filesdb.c:500
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2599,79 +2605,83 @@ msgstr ""
 msgid "'%s' not found in PATH or not executable."
 msgstr "dpkg: %s ei leitud.\n"
 
-#: src/help.c:136
+#: src/help.c:137
 #, c-format
 msgid ""
-"%d expected program(s) not found in PATH or not executable.\n"
+"%d expected program not found in PATH or not executable.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr ""
+msgid_plural ""
+"%d expected programs not found in PATH or not executable.\n"
+"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/help.c:184
+#: src/help.c:187
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:186 dpkg-deb/build.c:395 dpkg-deb/build.c:462
-#: dpkg-deb/build.c:485
+#: src/help.c:189 dpkg-deb/build.c:398 dpkg-deb/build.c:465
+#: dpkg-deb/build.c:488
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:246
+#: src/help.c:249
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:265
+#: src/help.c:268
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
 
-#: src/help.c:289
+#: src/help.c:292
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "vana %s skript"
 
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:305 src/help.c:371 src/help.c:430
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:354 src/help.c:414
+#: src/help.c:357 src/help.c:417
 #, c-format
 msgid "new %s script"
 msgstr "uus %s skript"
 
-#: src/help.c:388
+#: src/help.c:391
 #, c-format
 msgid "old %s script"
 msgstr "vana %s skript"
 
-#: src/help.c:402
+#: src/help.c:405
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
 
-#: src/help.c:411
+#: src/help.c:414
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - selle asemel proovitakse uue paki skripti ...\n"
 
-#: src/help.c:425
+#: src/help.c:428
 msgid "there is no script in the new version of the package - giving up"
 msgstr "paki uues versioonis pole skripti - rohkem ei proovita midagi"
 
-#: src/help.c:431
+#: src/help.c:434
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:582
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "faili `%.255s' pole võimalik luua"
 
-#: src/help.c:584 dpkg-deb/info.c:63
+#: src/help.c:587 dpkg-deb/info.c:63
 msgid "failed to exec rm for cleanup"
 msgstr "tõrge rm käivitamisel (puhastamiseks)"
 
@@ -3916,11 +3926,14 @@ msgid "Updating available packages info, using %s.\n"
 msgstr "Saadaolevate pakkide andmete uuendamine failist %s.\n"
 
 #: src/update.c:96
-#, c-format
-msgid "Information about %d package(s) was updated.\n"
-msgstr "%d paki andmed uuendatud.\n"
+#, fuzzy, c-format
+#| msgid "Information about %d package(s) was updated.\n"
+msgid "Information about %d package was updated.\n"
+msgid_plural "Information about %d packages was updated.\n"
+msgstr[0] "%d paki andmed uuendatud.\n"
+msgstr[1] "%d paki andmed uuendatud.\n"
 
-#: src/update.c:103
+#: src/update.c:104
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -3936,8 +3949,8 @@ msgstr "failinimi '%.50s...' on liiga pikk"
 msgid "unable to stat file name '%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
-#: utils/update-alternatives.c:2106
+#: dpkg-deb/build.c:229 utils/update-alternatives.c:2102
+#: utils/update-alternatives.c:2109
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vajab argumenti <kataloog>"
@@ -4059,69 +4072,71 @@ msgstr ""
 
 #: dpkg-deb/build.c:379
 #, c-format
-msgid "ignoring %d warnings about the control file(s)\n"
-msgstr ""
+msgid "ignoring %d warning about the control file(s)\n"
+msgid_plural "ignoring %d warnings about the control file(s)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/build.c:388
+#: dpkg-deb/build.c:391
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:396
+#: dpkg-deb/build.c:399
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:398 dpkg-deb/build.c:464
+#: dpkg-deb/build.c:401 dpkg-deb/build.c:467
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:405
+#: dpkg-deb/build.c:408
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:407
+#: dpkg-deb/build.c:410
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:415 dpkg-deb/build.c:432
+#: dpkg-deb/build.c:418 dpkg-deb/build.c:435
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:422
+#: dpkg-deb/build.c:425
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:432
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:448
+#: dpkg-deb/build.c:451
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:450
+#: dpkg-deb/build.c:453
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:474 dpkg-deb/extract.c:275
+#: dpkg-deb/build.c:477 dpkg-deb/extract.c:275
 msgid "data"
 msgstr "andmed"
 
-#: dpkg-deb/build.c:488
+#: dpkg-deb/build.c:491
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:507
+#: dpkg-deb/build.c:502 dpkg-deb/build.c:510
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:511
+#: dpkg-deb/build.c:514
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:519
+#: dpkg-deb/build.c:522
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
@@ -4354,66 +4369,64 @@ msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
 #: dpkg-deb/info.c:121
-msgid "One requested control component is missing"
-msgstr ""
-
-#: dpkg-deb/info.c:123
 #, c-format
-msgid "%d requested control components are missing"
-msgstr ""
+msgid "%d requested control component is missing"
+msgid_plural "%d requested control components are missing"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/info.c:136
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "kataloogi `%.255s' pole võimalik läbi vaadata"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:144
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159 dpkg-deb/info.c:174 dpkg-deb/info.c:188
+#: dpkg-deb/info.c:158 dpkg-deb/info.c:173 dpkg-deb/info.c:187
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:162
+#: dpkg-deb/info.c:161
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld baiti, %5d rida   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:166
+#: dpkg-deb/info.c:165
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     pole lihtfail             %.255s\n"
 
-#: dpkg-deb/info.c:175
+#: dpkg-deb/info.c:174
 msgid "(no `control' file in control archive!)\n"
 msgstr "(juhtarhiivis puudub fail `control'!)\n"
 
-#: dpkg-deb/info.c:205
+#: dpkg-deb/info.c:204
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:244
+#: dpkg-deb/info.c:243
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:246
+#: dpkg-deb/info.c:245
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "viga find'i toru sulgemisel"
 
-#: dpkg-deb/info.c:257
+#: dpkg-deb/info.c:256
 msgid "Error in format"
 msgstr "Vormingu viga"
 
-#: dpkg-deb/info.c:294
+#: dpkg-deb/info.c:293
 msgid "--contents takes exactly one argument"
 msgstr "--contents vajab täpselt ühte argumenti"
 
@@ -4682,7 +4695,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:237 dpkg-split/join.c:113
+#: dpkg-split/info.c:237 dpkg-split/join.c:115
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--debug võtmel peab olema kaheksandsüsteemi argument"
@@ -4694,35 +4707,37 @@ msgstr "fail `%s' pole arhiivi osa\n"
 
 #: dpkg-split/join.c:45
 #, c-format
-msgid "Putting package %s together from %d parts: "
-msgstr ""
+msgid "Putting package %s together from %d part: "
+msgid_plural "Putting package %s together from %d parts: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-split/join.c:53
+#: dpkg-split/join.c:55
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr "väljundfaili `%.250s' pole võimalik avada"
 
-#: dpkg-split/join.c:57
+#: dpkg-split/join.c:59
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:78
+#: dpkg-split/join.c:80
 #, c-format
 msgid "done\n"
 msgstr "valmis\n"
 
-#: dpkg-split/join.c:94
+#: dpkg-split/join.c:96
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr ""
 
-#: dpkg-split/join.c:99
+#: dpkg-split/join.c:101
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:136
+#: dpkg-split/join.c:138
 #, c-format
 msgid "part %d is missing"
 msgstr ""
@@ -4996,7 +5011,7 @@ msgstr "parsimisviga"
 
 #: utils/update-alternatives.c:270 utils/update-alternatives.c:594
 #: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
-#: utils/update-alternatives.c:1568
+#: utils/update-alternatives.c:1571
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "cannot stat %s: %s"
@@ -5051,7 +5066,7 @@ msgstr "faili %s pole võimalik eemaldada: %s"
 msgid "unexpected end of file while trying to read %s"
 msgstr "ootamatu %s lõpp failis %.255s"
 
-#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
+#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1859
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "faili `%s' pole võimalik lugeda: %s"
@@ -5168,13 +5183,13 @@ msgstr ""
 msgid "cannot write %s: %s"
 msgstr "faili %s pole võimalik kirjutada: %s"
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
-#: utils/update-alternatives.c:2406
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1451
+#: utils/update-alternatives.c:2409
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1457
-#: utils/update-alternatives.c:2407
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1460
+#: utils/update-alternatives.c:2410
 msgid "manual mode"
 msgstr ""
 
@@ -5208,154 +5223,156 @@ msgstr "Käesolevaga on `parim' versioon %s."
 msgid "No versions available."
 msgstr "Versioone pole saadaval."
 
-#: utils/update-alternatives.c:1432
+#: utils/update-alternatives.c:1435
 #, c-format
-msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr ""
+msgid "There is %d choice for the alternative %s (providing %s)."
+msgid_plural "There are %d choices for the alternative %s (providing %s)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/update-alternatives.c:1439
+#: utils/update-alternatives.c:1442
 #, fuzzy
 msgid "Selection"
 msgstr "Kirjeldus"
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1461
+#: utils/update-alternatives.c:1464
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Vaikimisi[*] valiku jaoks vajuta enter, oma valiku tegemiseks sisesta "
 "number: "
 
-#: utils/update-alternatives.c:1582
+#: utils/update-alternatives.c:1585
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1595
+#: utils/update-alternatives.c:1598
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1613
+#: utils/update-alternatives.c:1616
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1823 utils/update-alternatives.c:1829
+#: utils/update-alternatives.c:1826 utils/update-alternatives.c:1832
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1833
+#: utils/update-alternatives.c:1836
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1837
+#: utils/update-alternatives.c:1840
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Alternatiivi `%s' pole võimalik leida."
 
-#: utils/update-alternatives.c:1862
+#: utils/update-alternatives.c:1865
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "ootamatu %s lõpp failis %.255s"
 
-#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
-#: utils/update-alternatives.c:1898
+#: utils/update-alternatives.c:1878 utils/update-alternatives.c:1891
+#: utils/update-alternatives.c:1901
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1917
+#: utils/update-alternatives.c:1920
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Viida %s ümbernimetamine nimest %s nimega %s."
 
-#: utils/update-alternatives.c:1948
+#: utils/update-alternatives.c:1951
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Viida %s ümbernimetamine nimest %s nimega %s."
 
-#: utils/update-alternatives.c:1994
+#: utils/update-alternatives.c:1997
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "tundmatu argument `%s'"
 
-#: utils/update-alternatives.c:2013
+#: utils/update-alternatives.c:2016
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2016 utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2019 utils/update-alternatives.c:2070
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2022
 msgid "priority must be an integer"
 msgstr "tähtsus peab olema määratud täisarvuga"
 
-#: utils/update-alternatives.c:2032
+#: utils/update-alternatives.c:2035
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vajab argumente <nimi> <rada>"
 
-#: utils/update-alternatives.c:2046
+#: utils/update-alternatives.c:2049
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s vajab argumenti <nimi>"
 
-#: utils/update-alternatives.c:2058
+#: utils/update-alternatives.c:2061
 msgid "--slave only allowed with --install"
 msgstr "--slave on lubatud ainult koos võtmega --install"
 
-#: utils/update-alternatives.c:2060
+#: utils/update-alternatives.c:2063
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vajab argumente <viit> <nimi> <rada>"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2072
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2072
+#: utils/update-alternatives.c:2075
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2078
 #, c-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2085
 #, c-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
+#: utils/update-alternatives.c:2095
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s vajab ainult ühte argumenti"
 
-#: utils/update-alternatives.c:2118
+#: utils/update-alternatives.c:2121
 #, c-format
 msgid "unknown option `%s'"
 msgstr "tundmatu võti `%s'"
 
-#: utils/update-alternatives.c:2123
+#: utils/update-alternatives.c:2126
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5364,134 +5381,134 @@ msgstr ""
 "vaja on võtit --display, --config, --set, --install, --remove, --all, --"
 "remove-all või --auto"
 
-#: utils/update-alternatives.c:2166 utils/update-alternatives.c:2210
+#: utils/update-alternatives.c:2169 utils/update-alternatives.c:2213
 #, c-format
 msgid "it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2171
 #, c-format
 msgid "alternative %s can't be master: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
+#: utils/update-alternatives.c:2181 utils/update-alternatives.c:2223
 #, c-format
 msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2183 utils/update-alternatives.c:2226
+#: utils/update-alternatives.c:2186 utils/update-alternatives.c:2229
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2187 utils/update-alternatives.c:2230
+#: utils/update-alternatives.c:2190 utils/update-alternatives.c:2233
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
+#: utils/update-alternatives.c:2194
 #, c-format
 msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2195 utils/update-alternatives.c:2234
+#: utils/update-alternatives.c:2198 utils/update-alternatives.c:2237
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2208
+#: utils/update-alternatives.c:2211
 msgid "it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2212
+#: utils/update-alternatives.c:2215
 #, c-format
 msgid "alternative %s can't be slave of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2258
+#: utils/update-alternatives.c:2261
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "viga standardsisendist lugemisel"
 
-#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
+#: utils/update-alternatives.c:2270 utils/update-alternatives.c:2273
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s jaoks pole alternatiive."
 
-#: utils/update-alternatives.c:2296
+#: utils/update-alternatives.c:2299
 #, c-format
 msgid "%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2300
+#: utils/update-alternatives.c:2303
 #, c-format
 msgid ""
 "%s has been changed (manually or by a script). Switching to manual updates "
 "only."
 msgstr ""
 
-#: utils/update-alternatives.c:2309
+#: utils/update-alternatives.c:2312
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "Automaatse valiku seadmine %s jaoks."
 
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2321
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "Alternatiivi %s pole %s jaoks registreeritud, ei eemalda."
 
-#: utils/update-alternatives.c:2326
+#: utils/update-alternatives.c:2329
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Süsteemis pole ühtegi programmi, mis tagaks %s.\n"
 "Pole midagi seadistada.\n"
 
-#: utils/update-alternatives.c:2328 utils/update-alternatives.c:2338
+#: utils/update-alternatives.c:2331 utils/update-alternatives.c:2341
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2336
+#: utils/update-alternatives.c:2339
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2347
+#: utils/update-alternatives.c:2350
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "Alternatiivi %s pole %s jaoks registreeritud, ei eemalda."
 
-#: utils/update-alternatives.c:2355
+#: utils/update-alternatives.c:2358
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "Käsitsi valitud alternatiivi eemaldamine - lülitumine automaatrežiimile"
 
-#: utils/update-alternatives.c:2383
+#: utils/update-alternatives.c:2386
 #, fuzzy, c-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr "Automaatsed uuendused on %s jaoks keelatud, jätan muutmata."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2388
 #, fuzzy, c-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Automaatsetele uuendustele tagasilülitumiseks kasuta `update-alternatives --"
 "auto %s'."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2407
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "`%s' kasutamine `%s' tagamiseks."
 
-#: utils/update-alternatives.c:2412
+#: utils/update-alternatives.c:2415
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""

po/ku.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2007-04-07 13:50+0100\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:386
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:389
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -763,38 +763,38 @@ msgstr ""
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -1499,14 +1499,14 @@ msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
 #: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
-#: src/enquiry.c:163 src/enquiry.c:268 src/enquiry.c:411 src/enquiry.c:413
-#: src/enquiry.c:422 src/main.c:65 src/main.c:159 src/main.c:257
+#: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
 #: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:381
-#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:192
-#: dpkg-deb/info.c:248 dpkg-deb/main.c:61 dpkg-deb/main.c:124
+#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
+#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:191
+#: dpkg-deb/info.c:247 dpkg-deb/main.c:61 dpkg-deb/main.c:124
 #: dpkg-split/info.c:250 dpkg-split/main.c:53 dpkg-split/main.c:91
 #: dpkg-split/queue.c:141 dpkg-split/queue.c:266
 msgid "<standard output>"
@@ -2130,14 +2130,14 @@ msgstr "  Guhartoya %s di pergalê de %s e.\n"
 msgid "cannot create new %s file"
 msgstr "di xwendina %s de çewtî"
 
-#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
-#: dpkg-split/join.c:73 dpkg-split/queue.c:185
+#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:527
+#: dpkg-split/join.c:75 dpkg-split/queue.c:185
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
-#: dpkg-split/join.c:75 dpkg-split/queue.c:187
+#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:529
+#: dpkg-split/join.c:77 dpkg-split/queue.c:187
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "%s nayê xebitandin"
@@ -2300,9 +2300,9 @@ msgid ""
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:279 src/enquiry.c:342
-#: src/enquiry.c:418 src/select.c:92 src/select.c:149 src/trigcmd.c:199
-#: src/update.c:44 src/update.c:101 dpkg-split/queue.c:225
+#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:281 src/enquiry.c:344
+#: src/enquiry.c:420 src/select.c:92 src/select.c:149 src/trigcmd.c:199
+#: src/update.c:44 src/update.c:102 dpkg-split/queue.c:225
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2324,64 +2324,66 @@ msgstr " %d di %s de: "
 
 #: src/enquiry.c:257
 #, c-format
-msgid " %d packages, from the following sections:"
-msgstr ""
+msgid " %d package, from the following section:"
+msgid_plural " %d packages, from the following sections:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/enquiry.c:292
+#: src/enquiry.c:294
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c:297
+#: src/enquiry.c:299
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c:305
+#: src/enquiry.c:307
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:310
+#: src/enquiry.c:312
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:315
+#: src/enquiry.c:317
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:320
+#: src/enquiry.c:322
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:397
+#: src/enquiry.c:399
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: src/enquiry.c:398
+#: src/enquiry.c:400
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:428
+#: src/enquiry.c:430
 #, c-format
 msgid "obsolete option '--%s', please use '--%s' instead."
 msgstr ""
 
-#: src/enquiry.c:469
+#: src/enquiry.c:471
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: src/enquiry.c:474
+#: src/enquiry.c:476
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:479 src/enquiry.c:486
+#: src/enquiry.c:481 src/enquiry.c:488
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2468,36 +2470,39 @@ msgid "(Reading database ... "
 msgstr "(Danegeh tê xwendin ... "
 
 #: src/filesdb.c:446
-#, c-format
-msgid "%d files and directories currently installed.)\n"
-msgstr "%d pel û peldank niha sazkirî ne.)\n"
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d pel û peldank niha sazkirî ne.)\n"
+msgstr[1] "%d pel û peldank niha sazkirî ne.)\n"
 
-#: src/filesdb.c:479
+#: src/filesdb.c:481
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:489
+#: src/filesdb.c:491
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:491
+#: src/filesdb.c:493
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:493
+#: src/filesdb.c:495
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:496
+#: src/filesdb.c:498
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:498
+#: src/filesdb.c:500
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2543,79 +2548,83 @@ msgstr ""
 msgid "'%s' not found in PATH or not executable."
 msgstr "dpkg: %s nehat dîtin.\n"
 
-#: src/help.c:136
+#: src/help.c:137
 #, c-format
 msgid ""
-"%d expected program(s) not found in PATH or not executable.\n"
+"%d expected program not found in PATH or not executable.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr ""
+msgid_plural ""
+"%d expected programs not found in PATH or not executable.\n"
+"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/help.c:184
+#: src/help.c:187
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:186 dpkg-deb/build.c:395 dpkg-deb/build.c:462
-#: dpkg-deb/build.c:485
+#: src/help.c:189 dpkg-deb/build.c:398 dpkg-deb/build.c:465
+#: dpkg-deb/build.c:488
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:246
+#: src/help.c:249
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:265
+#: src/help.c:268
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
 
-#: src/help.c:289
+#: src/help.c:292
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "sazkirî"
 
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:305 src/help.c:371 src/help.c:430
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:354 src/help.c:414
+#: src/help.c:357 src/help.c:417
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:388
+#: src/help.c:391
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:402
+#: src/help.c:405
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/help.c:411
+#: src/help.c:414
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:425
+#: src/help.c:428
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:431
+#: src/help.c:434
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ...\n"
 
-#: src/help.c:579
+#: src/help.c:582
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "afirandina peldankê biserneket"
 
-#: src/help.c:584 dpkg-deb/info.c:63
+#: src/help.c:587 dpkg-deb/info.c:63
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
@@ -3786,10 +3795,12 @@ msgstr ""
 
 #: src/update.c:96
 #, c-format
-msgid "Information about %d package(s) was updated.\n"
-msgstr ""
+msgid "Information about %d package was updated.\n"
+msgid_plural "Information about %d packages was updated.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/update.c:103
+#: src/update.c:104
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -3805,8 +3816,8 @@ msgstr ""
 msgid "unable to stat file name '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
-#: utils/update-alternatives.c:2106
+#: dpkg-deb/build.c:229 utils/update-alternatives.c:2102
+#: utils/update-alternatives.c:2109
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -3928,69 +3939,71 @@ msgstr ""
 
 #: dpkg-deb/build.c:379
 #, c-format
-msgid "ignoring %d warnings about the control file(s)\n"
-msgstr ""
+msgid "ignoring %d warning about the control file(s)\n"
+msgid_plural "ignoring %d warnings about the control file(s)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/build.c:388
+#: dpkg-deb/build.c:391
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:396
+#: dpkg-deb/build.c:399
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:398 dpkg-deb/build.c:464
+#: dpkg-deb/build.c:401 dpkg-deb/build.c:467
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:405
+#: dpkg-deb/build.c:408
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:407
+#: dpkg-deb/build.c:410
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:415 dpkg-deb/build.c:432
+#: dpkg-deb/build.c:418 dpkg-deb/build.c:435
 msgid "control"
 msgstr "kontrol"
 
-#: dpkg-deb/build.c:422
+#: dpkg-deb/build.c:425
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:432
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:448
+#: dpkg-deb/build.c:451
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:450
+#: dpkg-deb/build.c:453
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:474 dpkg-deb/extract.c:275
+#: dpkg-deb/build.c:477 dpkg-deb/extract.c:275
 msgid "data"
 msgstr "dane"
 
-#: dpkg-deb/build.c:488
+#: dpkg-deb/build.c:491
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:507
+#: dpkg-deb/build.c:502 dpkg-deb/build.c:510
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:511
+#: dpkg-deb/build.c:514
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:519
+#: dpkg-deb/build.c:522
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
@@ -4212,66 +4225,64 @@ msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
 #: dpkg-deb/info.c:121
-msgid "One requested control component is missing"
-msgstr ""
-
-#: dpkg-deb/info.c:123
 #, c-format
-msgid "%d requested control components are missing"
-msgstr ""
+msgid "%d requested control component is missing"
+msgid_plural "%d requested control components are missing"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/info.c:136
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:144
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159 dpkg-deb/info.c:174 dpkg-deb/info.c:188
+#: dpkg-deb/info.c:158 dpkg-deb/info.c:173 dpkg-deb/info.c:187
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:162
+#: dpkg-deb/info.c:161
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:166
+#: dpkg-deb/info.c:165
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:175
+#: dpkg-deb/info.c:174
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:205
+#: dpkg-deb/info.c:204
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:244
+#: dpkg-deb/info.c:243
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:246
+#: dpkg-deb/info.c:245
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "di xwendina %.250s de çewtî"
 
-#: dpkg-deb/info.c:257
+#: dpkg-deb/info.c:256
 msgid "Error in format"
 msgstr "Di formatê de çewtî"
 
-#: dpkg-deb/info.c:294
+#: dpkg-deb/info.c:293
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4503,7 +4514,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:237 dpkg-split/join.c:113
+#: dpkg-split/info.c:237 dpkg-split/join.c:115
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
@@ -4515,35 +4526,37 @@ msgstr ""
 
 #: dpkg-split/join.c:45
 #, c-format
-msgid "Putting package %s together from %d parts: "
-msgstr ""
+msgid "Putting package %s together from %d part: "
+msgid_plural "Putting package %s together from %d parts: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-split/join.c:53
+#: dpkg-split/join.c:55
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:57
+#: dpkg-split/join.c:59
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:78
+#: dpkg-split/join.c:80
 #, c-format
 msgid "done\n"
 msgstr "temam\n"
 
-#: dpkg-split/join.c:94
+#: dpkg-split/join.c:96
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr ""
 
-#: dpkg-split/join.c:99
+#: dpkg-split/join.c:101
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:136
+#: dpkg-split/join.c:138
 #, c-format
 msgid "part %d is missing"
 msgstr "beşa %d kêm e"
@@ -4806,7 +4819,7 @@ msgstr ""
 
 #: utils/update-alternatives.c:270 utils/update-alternatives.c:594
 #: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
-#: utils/update-alternatives.c:1568
+#: utils/update-alternatives.c:1571
 #, fuzzy, c-format
 msgid "cannot stat %s: %s"
 msgstr "di xwendina %s de çewtî"
@@ -4856,7 +4869,7 @@ msgstr ""
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
+#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1859
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "di xwendina %s de çewtî"
@@ -4970,13 +4983,13 @@ msgstr ""
 msgid "cannot write %s: %s"
 msgstr "di xwendina %s de çewtî"
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
-#: utils/update-alternatives.c:2406
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1451
+#: utils/update-alternatives.c:2409
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1457
-#: utils/update-alternatives.c:2407
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1460
+#: utils/update-alternatives.c:2410
 msgid "manual mode"
 msgstr ""
 
@@ -5008,278 +5021,280 @@ msgstr "Debian %s guhartoya %s.\n"
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1432
+#: utils/update-alternatives.c:1435
 #, c-format
-msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr ""
+msgid "There is %d choice for the alternative %s (providing %s)."
+msgid_plural "There are %d choices for the alternative %s (providing %s)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/update-alternatives.c:1439
+#: utils/update-alternatives.c:1442
 #, fuzzy
 msgid "Selection"
 msgstr "Rave"
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1461
+#: utils/update-alternatives.c:1464
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1582
+#: utils/update-alternatives.c:1585
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1595
+#: utils/update-alternatives.c:1598
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1613
+#: utils/update-alternatives.c:1616
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1823 utils/update-alternatives.c:1829
+#: utils/update-alternatives.c:1826 utils/update-alternatives.c:1832
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1833
+#: utils/update-alternatives.c:1836
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1837
+#: utils/update-alternatives.c:1840
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1862
+#: utils/update-alternatives.c:1865
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
-#: utils/update-alternatives.c:1898
+#: utils/update-alternatives.c:1878 utils/update-alternatives.c:1891
+#: utils/update-alternatives.c:1901
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1917
+#: utils/update-alternatives.c:1920
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s tê derxistin (ji %s) ...\n"
 
-#: utils/update-alternatives.c:1948
+#: utils/update-alternatives.c:1951
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1994
+#: utils/update-alternatives.c:1997
 #, c-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2013
+#: utils/update-alternatives.c:2016
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2016 utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2019 utils/update-alternatives.c:2070
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2022
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2032
+#: utils/update-alternatives.c:2035
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2046
+#: utils/update-alternatives.c:2049
 #, c-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2058
+#: utils/update-alternatives.c:2061
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2060
+#: utils/update-alternatives.c:2063
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2072
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2072
+#: utils/update-alternatives.c:2075
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2078
 #, c-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2085
 #, c-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
+#: utils/update-alternatives.c:2095
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2118
+#: utils/update-alternatives.c:2121
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2123
+#: utils/update-alternatives.c:2126
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2166 utils/update-alternatives.c:2210
+#: utils/update-alternatives.c:2169 utils/update-alternatives.c:2213
 #, c-format
 msgid "it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2171
 #, c-format
 msgid "alternative %s can't be master: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
+#: utils/update-alternatives.c:2181 utils/update-alternatives.c:2223
 #, c-format
 msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2183 utils/update-alternatives.c:2226
+#: utils/update-alternatives.c:2186 utils/update-alternatives.c:2229
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2187 utils/update-alternatives.c:2230
+#: utils/update-alternatives.c:2190 utils/update-alternatives.c:2233
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
+#: utils/update-alternatives.c:2194
 #, c-format
 msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2195 utils/update-alternatives.c:2234
+#: utils/update-alternatives.c:2198 utils/update-alternatives.c:2237
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2208
+#: utils/update-alternatives.c:2211
 msgid "it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2212
+#: utils/update-alternatives.c:2215
 #, c-format
 msgid "alternative %s can't be slave of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2258
+#: utils/update-alternatives.c:2261
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
+#: utils/update-alternatives.c:2270 utils/update-alternatives.c:2273
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2296
+#: utils/update-alternatives.c:2299
 #, c-format
 msgid "%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2300
+#: utils/update-alternatives.c:2303
 #, c-format
 msgid ""
 "%s has been changed (manually or by a script). Switching to manual updates "
 "only."
 msgstr ""
 
-#: utils/update-alternatives.c:2309
+#: utils/update-alternatives.c:2312
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2321
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2326
+#: utils/update-alternatives.c:2329
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr "  Pakêta %s ya ku %s tîne hê nehatiye veavakirin.\n"
 
-#: utils/update-alternatives.c:2328 utils/update-alternatives.c:2338
+#: utils/update-alternatives.c:2331 utils/update-alternatives.c:2341
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2336
+#: utils/update-alternatives.c:2339
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2347
+#: utils/update-alternatives.c:2350
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2355
+#: utils/update-alternatives.c:2358
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2383
+#: utils/update-alternatives.c:2386
 #, c-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2388
 #, c-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2407
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2412
+#: utils/update-alternatives.c:2415
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""

po/lt.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2008-08-02 01:08-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -163,7 +163,7 @@ msgstr "nepavyksta patikrinti atnaujinimų aplanko `%.255s' turinio"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "nepavyko pašalinti prijungto atnaujinimo failo %.255s"
 
-#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:386
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:389
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nepavyko sukurti `%.255s'"
@@ -791,38 +791,38 @@ msgid "several package info entries found, only one allowed"
 msgstr ""
 "rasta keletas informacijos apie paketa įrašų, tačiau leidžiamas tik vienas"
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Sukonfigūruota versija paketui su nepriimtina būsena"
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr "po nuskaitymo nepavyko uždaryti `%.255s'"
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' nėra informacijos apie paketą"
@@ -1543,14 +1543,14 @@ msgid "--%s needs at least one package archive file argument"
 msgstr "--%s reikia nors vienos paketo archyvo failo reikšmės"
 
 #: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
-#: src/enquiry.c:163 src/enquiry.c:268 src/enquiry.c:411 src/enquiry.c:413
-#: src/enquiry.c:422 src/main.c:65 src/main.c:159 src/main.c:257
+#: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
 #: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:381
-#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:192
-#: dpkg-deb/info.c:248 dpkg-deb/main.c:61 dpkg-deb/main.c:124
+#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
+#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:191
+#: dpkg-deb/info.c:247 dpkg-deb/main.c:61 dpkg-deb/main.c:124
 #: dpkg-split/info.c:250 dpkg-split/main.c:53 dpkg-split/main.c:91
 #: dpkg-split/queue.c:141 dpkg-split/queue.c:266
 msgid "<standard output>"
@@ -2202,14 +2202,14 @@ msgstr "  Sistemoje esantičio %s paketo versija yra %s.\n"
 msgid "cannot create new %s file"
 msgstr "nepavyko atverti GPL failo"
 
-#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
-#: dpkg-split/join.c:73 dpkg-split/queue.c:185
+#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:527
+#: dpkg-split/join.c:75 dpkg-split/queue.c:185
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "neįmanoma išvalyti vsnprintf"
 
-#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
-#: dpkg-split/join.c:75 dpkg-split/queue.c:187
+#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:529
+#: dpkg-split/join.c:77 dpkg-split/queue.c:187
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "nepavyko užverti %s: %s"
@@ -2389,9 +2389,9 @@ msgid ""
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:279 src/enquiry.c:342
-#: src/enquiry.c:418 src/select.c:92 src/select.c:149 src/trigcmd.c:199
-#: src/update.c:44 src/update.c:101 dpkg-split/queue.c:225
+#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:281 src/enquiry.c:344
+#: src/enquiry.c:420 src/select.c:92 src/select.c:149 src/trigcmd.c:199
+#: src/update.c:44 src/update.c:102 dpkg-split/queue.c:225
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s parametras nereikalauja nurodyti jokių reikšmių"
@@ -2412,11 +2412,14 @@ msgid " %d in %s: "
 msgstr " %d yra (viduje) %s: "
 
 #: src/enquiry.c:257
-#, c-format
-msgid " %d packages, from the following sections:"
-msgstr " %d paketai iš sekančių skyrių:"
+#, fuzzy, c-format
+#| msgid " %d packages, from the following sections:"
+msgid " %d package, from the following section:"
+msgid_plural " %d packages, from the following sections:"
+msgstr[0] " %d paketai iš sekančių skyrių:"
+msgstr[1] " %d paketai iš sekančių skyrių:"
 
-#: src/enquiry.c:292
+#: src/enquiry.c:294
 #, fuzzy, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
@@ -2425,30 +2428,30 @@ msgstr ""
 "dpkg versija, suderinama su epocha, dar nekonfigūruota.\n"
 " Prašome įvykdyti `dpkg --configure dpkg', ir bandyti vėl.\n"
 
-#: src/enquiry.c:297
+#: src/enquiry.c:299
 #, fuzzy, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 "dpkg nėra užfiksuota kaip įdiegta, neįmanoma patikrinti suderinamumo su "
 "epocha!\n"
 
-#: src/enquiry.c:305
+#: src/enquiry.c:307
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:310
+#: src/enquiry.c:312
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:315
+#: src/enquiry.c:317
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:320
+#: src/enquiry.c:322
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:397
+#: src/enquiry.c:399
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
@@ -2457,27 +2460,27 @@ msgstr ""
 "dpkg: nematau kaip galėčiau patenkinti priklausomybę:\n"
 " %s\n"
 
-#: src/enquiry.c:398
+#: src/enquiry.c:400
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr "negaliu patenkinti priklausomybių %.250s (norima dėl %.250s)"
 
-#: src/enquiry.c:428
+#: src/enquiry.c:430
 #, fuzzy, c-format
 msgid "obsolete option '--%s', please use '--%s' instead."
 msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
 
-#: src/enquiry.c:469
+#: src/enquiry.c:471
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "--compare-versions reikalingos trys reikšmės: <versija> <santykiai> <versija>"
 
-#: src/enquiry.c:474
+#: src/enquiry.c:476
 msgid "--compare-versions bad relation"
 msgstr "blogas sąryšis su --compare-versions"
 
-#: src/enquiry.c:479 src/enquiry.c:486
+#: src/enquiry.c:481 src/enquiry.c:488
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: versija '%s' su bloga sintakse: %s\n"
@@ -2573,36 +2576,39 @@ msgid "(Reading database ... "
 msgstr "(Skaitoma duomenų bazė ... "
 
 #: src/filesdb.c:446
-#, c-format
-msgid "%d files and directories currently installed.)\n"
-msgstr "šiuo metu įdiegta %d failų ir aplankų.)\n"
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "šiuo metu įdiegta %d failų ir aplankų.)\n"
+msgstr[1] "šiuo metu įdiegta %d failų ir aplankų.)\n"
 
-#: src/filesdb.c:479
+#: src/filesdb.c:481
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "nepavyko sukurti atnaujinto failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:489
+#: src/filesdb.c:491
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "nepavyko įrašyti atnaujintų failų sąrašo paketui %s"
 
-#: src/filesdb.c:491
+#: src/filesdb.c:493
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "nepavyko išvalyti atnaujintų failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:493
+#: src/filesdb.c:495
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "nepavyko sinchronizuoti atnaujinto failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:496
+#: src/filesdb.c:498
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "nepavyko uždaryti atnaujintų failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:498
+#: src/filesdb.c:500
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "nepavyko įdiegti atnaujintų failų sąrašo failo paketui %s"
@@ -2650,82 +2656,89 @@ msgstr "dpkg - klaida: nenustatytas PATH.\n"
 msgid "'%s' not found in PATH or not executable."
 msgstr "dpkg: „%s“ nerastas kelyje PATH.\n"
 
-#: src/help.c:136
+#: src/help.c:137
 #, fuzzy, c-format
 msgid ""
-"%d expected program(s) not found in PATH or not executable.\n"
+"%d expected program not found in PATH or not executable.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr ""
+msgid_plural ""
+"%d expected programs not found in PATH or not executable.\n"
+"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
+msgstr[0] ""
+"%d programos nerastos aplinkos kintamajame PATH.\n"
+"NB: root naudotojo kintamajame PATH turėtų būti /usr/local/sbin, /usr/sbin "
+"ir /sbin."
+msgstr[1] ""
 "%d programos nerastos aplinkos kintamajame PATH.\n"
 "NB: root naudotojo kintamajame PATH turėtų būti /usr/local/sbin, /usr/sbin "
 "ir /sbin."
 
-#: src/help.c:184
+#: src/help.c:187
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr "nepavyko pakeisti šakninio aplanko į „%.250s“"
 
-#: src/help.c:186 dpkg-deb/build.c:395 dpkg-deb/build.c:462
-#: dpkg-deb/build.c:485
+#: src/help.c:189 dpkg-deb/build.c:398 dpkg-deb/build.c:465
+#: dpkg-deb/build.c:488
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nepavyko atverti aplanko `%.255s'"
 
-#: src/help.c:246
+#: src/help.c:249
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nepavyko nustatyti vykdymo teisių „%.250s“"
 
-#: src/help.c:265
+#: src/help.c:268
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "nepavyko gauti vsnprintf būsenos"
 
-#: src/help.c:289
+#: src/help.c:292
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "senas %s scenarijus"
 
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:305 src/help.c:371 src/help.c:430
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nepavyksta patikrinti %s `%.250s'"
 
-#: src/help.c:354 src/help.c:414
+#: src/help.c:357 src/help.c:417
 #, c-format
 msgid "new %s script"
 msgstr "naujas %s scenarijus"
 
-#: src/help.c:388
+#: src/help.c:391
 #, c-format
 msgid "old %s script"
 msgstr "senas %s scenarijus"
 
-#: src/help.c:402
+#: src/help.c:405
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nepavyksta patikrinti %s `%.250s'"
 
-#: src/help.c:411
+#: src/help.c:414
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - bandomas scenarijus iš naujos paketo versijos ...\n"
 
-#: src/help.c:425
+#: src/help.c:428
 msgid "there is no script in the new version of the package - giving up"
 msgstr "naujo paketo versijoje nėra scenarijaus - paliekama taip"
 
-#: src/help.c:431
+#: src/help.c:434
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... atrodo viskas praėjo GERAI.\n"
 
-#: src/help.c:579
+#: src/help.c:582
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nepavyko sukurti `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:63
+#: src/help.c:587 dpkg-deb/info.c:63
 msgid "failed to exec rm for cleanup"
 msgstr "nepavyko įvykdyti rm išvalymui"
 
@@ -4090,11 +4103,14 @@ msgid "Updating available packages info, using %s.\n"
 msgstr "Atnaujinama prieinamų paketų informacija, naudojant %s.\n"
 
 #: src/update.c:96
-#, c-format
-msgid "Information about %d package(s) was updated.\n"
-msgstr "Atnaujinta informacija apie %d paketų.\n"
+#, fuzzy, c-format
+#| msgid "Information about %d package(s) was updated.\n"
+msgid "Information about %d package was updated.\n"
+msgid_plural "Information about %d packages was updated.\n"
+msgstr[0] "Atnaujinta informacija apie %d paketų.\n"
+msgstr[1] "Atnaujinta informacija apie %d paketų.\n"
 
-#: src/update.c:103
+#: src/update.c:104
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4110,8 +4126,8 @@ msgstr ""
 msgid "unable to stat file name '%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
-#: utils/update-alternatives.c:2106
+#: dpkg-deb/build.c:229 utils/update-alternatives.c:2102
+#: utils/update-alternatives.c:2109
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4242,69 +4258,71 @@ msgstr ""
 
 #: dpkg-deb/build.c:379
 #, fuzzy, c-format
-msgid "ignoring %d warnings about the control file(s)\n"
-msgstr "dpkg-deb: ignoruojami %d perspėjimai apie valdymo failus\n"
+msgid "ignoring %d warning about the control file(s)\n"
+msgid_plural "ignoring %d warnings about the control file(s)\n"
+msgstr[0] "dpkg-deb: ignoruojami %d perspėjimai apie valdymo failus\n"
+msgstr[1] "dpkg-deb: ignoruojami %d perspėjimai apie valdymo failus\n"
 
-#: dpkg-deb/build.c:388
+#: dpkg-deb/build.c:391
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:396
+#: dpkg-deb/build.c:399
 msgid "failed to chdir to .../DEBIAN"
 msgstr "nepavyko atverti aplanko .../DEBIAN"
 
-#: dpkg-deb/build.c:398 dpkg-deb/build.c:464
+#: dpkg-deb/build.c:401 dpkg-deb/build.c:467
 msgid "failed to exec tar -cf"
 msgstr "nepavyko įvykdyti tar -cf"
 
-#: dpkg-deb/build.c:405
+#: dpkg-deb/build.c:408
 msgid "failed to make tmpfile (control)"
 msgstr "nepavyko sukurti laikino failo (valdymo)"
 
-#: dpkg-deb/build.c:407
+#: dpkg-deb/build.c:410
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "nepavyko atsieti laikino failo (valdymo), %s"
 
-#: dpkg-deb/build.c:415 dpkg-deb/build.c:432
+#: dpkg-deb/build.c:418 dpkg-deb/build.c:435
 msgid "control"
 msgstr "valdymas"
 
-#: dpkg-deb/build.c:422
+#: dpkg-deb/build.c:425
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:432
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:448
+#: dpkg-deb/build.c:451
 msgid "failed to make tmpfile (data)"
 msgstr "nepavyko sukurti laikino failo (duomenys)"
 
-#: dpkg-deb/build.c:450
+#: dpkg-deb/build.c:453
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "nepavyko atsieti laikinos failo (duomenys), %s"
 
-#: dpkg-deb/build.c:474 dpkg-deb/extract.c:275
+#: dpkg-deb/build.c:477 dpkg-deb/extract.c:275
 msgid "data"
 msgstr "duomenys"
 
-#: dpkg-deb/build.c:488
+#: dpkg-deb/build.c:491
 msgid "failed to exec find"
 msgstr "nepavyko įvykdyti find"
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:507
+#: dpkg-deb/build.c:502 dpkg-deb/build.c:510
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:511
+#: dpkg-deb/build.c:514
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:519
+#: dpkg-deb/build.c:522
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
@@ -4538,66 +4556,64 @@ msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
 #: dpkg-deb/info.c:121
-msgid "One requested control component is missing"
-msgstr ""
-
-#: dpkg-deb/info.c:123
 #, c-format
-msgid "%d requested control components are missing"
-msgstr ""
+msgid "%d requested control component is missing"
+msgid_plural "%d requested control components are missing"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/info.c:136
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:144
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159 dpkg-deb/info.c:174 dpkg-deb/info.c:188
+#: dpkg-deb/info.c:158 dpkg-deb/info.c:173 dpkg-deb/info.c:187
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:162
+#: dpkg-deb/info.c:161
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld baitai, %5d eilutės %c %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:166
+#: dpkg-deb/info.c:165
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ne paprastas %.255s failas\n"
 
-#: dpkg-deb/info.c:175
+#: dpkg-deb/info.c:174
 msgid "(no `control' file in control archive!)\n"
 msgstr "(valdymo archyve nėra „control“ failo!)\n"
 
-#: dpkg-deb/info.c:205
+#: dpkg-deb/info.c:204
 msgid "could not open the `control' component"
 msgstr "nepavyko atverti `control' komponento"
 
-#: dpkg-deb/info.c:244
+#: dpkg-deb/info.c:243
 msgid "failed during read of `control' component"
 msgstr "nepavyko nuskaityti `control' komponento"
 
-#: dpkg-deb/info.c:246
+#: dpkg-deb/info.c:245
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "klaida uždarant paieškos srautą"
 
-#: dpkg-deb/info.c:257
+#: dpkg-deb/info.c:256
 msgid "Error in format"
 msgstr "Klaida formate"
 
-#: dpkg-deb/info.c:294
+#: dpkg-deb/info.c:293
 msgid "--contents takes exactly one argument"
 msgstr "--control nustatymui reikia tik vieno parametro"
 
@@ -4843,7 +4859,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:237 dpkg-split/join.c:113
+#: dpkg-split/info.c:237 dpkg-split/join.c:115
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--debug reikia šešioliktainės reikšmės"
@@ -4855,35 +4871,37 @@ msgstr ""
 
 #: dpkg-split/join.c:45
 #, c-format
-msgid "Putting package %s together from %d parts: "
-msgstr ""
+msgid "Putting package %s together from %d part: "
+msgid_plural "Putting package %s together from %d parts: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-split/join.c:53
+#: dpkg-split/join.c:55
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:57
+#: dpkg-split/join.c:59
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:78
+#: dpkg-split/join.c:80
 #, c-format
 msgid "done\n"
 msgstr "baigta\n"
 
-#: dpkg-split/join.c:94
+#: dpkg-split/join.c:96
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr ""
 
-#: dpkg-split/join.c:99
+#: dpkg-split/join.c:101
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:136
+#: dpkg-split/join.c:138
 #, c-format
 msgid "part %d is missing"
 msgstr "trūksta %d dalies"
@@ -5150,7 +5168,7 @@ msgstr ""
 
 #: utils/update-alternatives.c:270 utils/update-alternatives.c:594
 #: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
-#: utils/update-alternatives.c:1568
+#: utils/update-alternatives.c:1571
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "cannot stat %s: %s"
@@ -5203,7 +5221,7 @@ msgstr ""
 msgid "unexpected end of file while trying to read %s"
 msgstr "netikėta %.250s failo pabaiga"
 
-#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
+#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1859
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "nepavyko nuskaityti %s: %s"
@@ -5319,13 +5337,13 @@ msgstr ""
 msgid "cannot write %s: %s"
 msgstr "nepavyko rašyti %s: %s"
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
-#: utils/update-alternatives.c:2406
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1451
+#: utils/update-alternatives.c:2409
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1457
-#: utils/update-alternatives.c:2407
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1460
+#: utils/update-alternatives.c:2410
 msgid "manual mode"
 msgstr ""
 
@@ -5358,280 +5376,282 @@ msgstr "Debian %s versija %s.\n"
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1432
+#: utils/update-alternatives.c:1435
 #, c-format
-msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr ""
+msgid "There is %d choice for the alternative %s (providing %s)."
+msgid_plural "There are %d choices for the alternative %s (providing %s)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/update-alternatives.c:1439
+#: utils/update-alternatives.c:1442
 #, fuzzy
 msgid "Selection"
 msgstr "Aprašymas"
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1461
+#: utils/update-alternatives.c:1464
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1582
+#: utils/update-alternatives.c:1585
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1595
+#: utils/update-alternatives.c:1598
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1613
+#: utils/update-alternatives.c:1616
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1823 utils/update-alternatives.c:1829
+#: utils/update-alternatives.c:1826 utils/update-alternatives.c:1832
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1833
+#: utils/update-alternatives.c:1836
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1837
+#: utils/update-alternatives.c:1840
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1862
+#: utils/update-alternatives.c:1865
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "netikėta %.250s failo pabaiga"
 
-#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
-#: utils/update-alternatives.c:1898
+#: utils/update-alternatives.c:1878 utils/update-alternatives.c:1891
+#: utils/update-alternatives.c:1901
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1917
+#: utils/update-alternatives.c:1920
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Išpakuojamas archyvas %s (iš %s) ...\n"
 
-#: utils/update-alternatives.c:1948
+#: utils/update-alternatives.c:1951
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1994
+#: utils/update-alternatives.c:1997
 #, c-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2013
+#: utils/update-alternatives.c:2016
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2016 utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2019 utils/update-alternatives.c:2070
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2022
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2032
+#: utils/update-alternatives.c:2035
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2046
+#: utils/update-alternatives.c:2049
 #, c-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2058
+#: utils/update-alternatives.c:2061
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2060
+#: utils/update-alternatives.c:2063
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2072
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2072
+#: utils/update-alternatives.c:2075
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2078
 #, c-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2085
 #, c-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
+#: utils/update-alternatives.c:2095
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s reikia .deb failo parametro"
 
-#: utils/update-alternatives.c:2118
+#: utils/update-alternatives.c:2121
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2123
+#: utils/update-alternatives.c:2126
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2166 utils/update-alternatives.c:2210
+#: utils/update-alternatives.c:2169 utils/update-alternatives.c:2213
 #, c-format
 msgid "it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2171
 #, c-format
 msgid "alternative %s can't be master: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
+#: utils/update-alternatives.c:2181 utils/update-alternatives.c:2223
 #, c-format
 msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2183 utils/update-alternatives.c:2226
+#: utils/update-alternatives.c:2186 utils/update-alternatives.c:2229
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2187 utils/update-alternatives.c:2230
+#: utils/update-alternatives.c:2190 utils/update-alternatives.c:2233
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
+#: utils/update-alternatives.c:2194
 #, c-format
 msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2195 utils/update-alternatives.c:2234
+#: utils/update-alternatives.c:2198 utils/update-alternatives.c:2237
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2208
+#: utils/update-alternatives.c:2211
 msgid "it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2212
+#: utils/update-alternatives.c:2215
 #, c-format
 msgid "alternative %s can't be slave of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2258
+#: utils/update-alternatives.c:2261
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "skaitymo klaida standartinėje įvestyje"
 
-#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
+#: utils/update-alternatives.c:2270 utils/update-alternatives.c:2273
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2296
+#: utils/update-alternatives.c:2299
 #, c-format
 msgid "%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2300
+#: utils/update-alternatives.c:2303
 #, c-format
 msgid ""
 "%s has been changed (manually or by a script). Switching to manual updates "
 "only."
 msgstr ""
 
-#: utils/update-alternatives.c:2309
+#: utils/update-alternatives.c:2312
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2321
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2326
+#: utils/update-alternatives.c:2329
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2328 utils/update-alternatives.c:2338
+#: utils/update-alternatives.c:2331 utils/update-alternatives.c:2341
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2336
+#: utils/update-alternatives.c:2339
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2347
+#: utils/update-alternatives.c:2350
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2355
+#: utils/update-alternatives.c:2358
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2383
+#: utils/update-alternatives.c:2386
 #, c-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2388
 #, c-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2407
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "  %.250s teikia %.250s, bet yra %s.\n"
 
-#: utils/update-alternatives.c:2412
+#: utils/update-alternatives.c:2415
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""

po/pa.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2006-12-25 08:23+0530\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:386
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:389
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -768,38 +768,38 @@ msgstr ""
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -1504,14 +1504,14 @@ msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
 #: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
-#: src/enquiry.c:163 src/enquiry.c:268 src/enquiry.c:411 src/enquiry.c:413
-#: src/enquiry.c:422 src/main.c:65 src/main.c:159 src/main.c:257
+#: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
 #: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:381
-#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:192
-#: dpkg-deb/info.c:248 dpkg-deb/main.c:61 dpkg-deb/main.c:124
+#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
+#: dpkg-deb/extract.c:212 dpkg-deb/extract.c:241 dpkg-deb/info.c:191
+#: dpkg-deb/info.c:247 dpkg-deb/main.c:61 dpkg-deb/main.c:124
 #: dpkg-split/info.c:250 dpkg-split/main.c:53 dpkg-split/main.c:91
 #: dpkg-split/queue.c:141 dpkg-split/queue.c:266
 msgid "<standard output>"
@@ -2154,14 +2154,14 @@ msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 msgid "cannot create new %s file"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
-#: dpkg-split/join.c:73 dpkg-split/queue.c:185
+#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:527
+#: dpkg-split/join.c:75 dpkg-split/queue.c:185
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
-#: dpkg-split/join.c:75 dpkg-split/queue.c:187
+#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:529
+#: dpkg-split/join.c:77 dpkg-split/queue.c:187
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
@@ -2326,9 +2326,9 @@ msgid ""
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:279 src/enquiry.c:342
-#: src/enquiry.c:418 src/select.c:92 src/select.c:149 src/trigcmd.c:199
-#: src/update.c:44 src/update.c:101 dpkg-split/queue.c:225
+#: src/enquiry.c:134 src/enquiry.c:203 src/enquiry.c:281 src/enquiry.c:344
+#: src/enquiry.c:420 src/select.c:92 src/select.c:149 src/trigcmd.c:199
+#: src/update.c:44 src/update.c:102 dpkg-split/queue.c:225
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2350,64 +2350,66 @@ msgstr " %2$s %1$d ਵਿੱਚ:"
 
 #: src/enquiry.c:257
 #, c-format
-msgid " %d packages, from the following sections:"
-msgstr ""
+msgid " %d package, from the following section:"
+msgid_plural " %d packages, from the following sections:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/enquiry.c:292
+#: src/enquiry.c:294
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c:297
+#: src/enquiry.c:299
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c:305
+#: src/enquiry.c:307
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:310
+#: src/enquiry.c:312
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:315
+#: src/enquiry.c:317
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:320
+#: src/enquiry.c:322
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:397
+#: src/enquiry.c:399
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: src/enquiry.c:398
+#: src/enquiry.c:400
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:428
+#: src/enquiry.c:430
 #, fuzzy, c-format
 msgid "obsolete option '--%s', please use '--%s' instead."
 msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
 
-#: src/enquiry.c:469
+#: src/enquiry.c:471
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: src/enquiry.c:474
+#: src/enquiry.c:476
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:479 src/enquiry.c:486
+#: src/enquiry.c:481 src/enquiry.c:488
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2494,36 +2496,39 @@ msgid "(Reading database ... "
 msgstr "(ਡਾਟਾਬੇਸ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ... "
 
 #: src/filesdb.c:446
-#, c-format
-msgid "%d files and directories currently installed.)\n"
-msgstr "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
+msgstr[1] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
 
-#: src/filesdb.c:479
+#: src/filesdb.c:481
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:489
+#: src/filesdb.c:491
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:491
+#: src/filesdb.c:493
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:493
+#: src/filesdb.c:495
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:496
+#: src/filesdb.c:498
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:498
+#: src/filesdb.c:500
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2569,78 +2574,82 @@ msgstr ""
 msgid "'%s' not found in PATH or not executable."
 msgstr "dpkg: %s ਨਹੀਂ ਲੱਭਿਆ ਹੈ।\n"
 
-#: src/help.c:136
+#: src/help.c:137
 #, c-format
 msgid ""
-"%d expected program(s) not found in PATH or not executable.\n"
+"%d expected program not found in PATH or not executable.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr ""
+msgid_plural ""
+"%d expected programs not found in PATH or not executable.\n"
+"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/help.c:184
+#: src/help.c:187
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:186 dpkg-deb/build.c:395 dpkg-deb/build.c:462
-#: dpkg-deb/build.c:485
+#: src/help.c:189 dpkg-deb/build.c:398 dpkg-deb/build.c:465
+#: dpkg-deb/build.c:488
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:246
+#: src/help.c:249
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:265
+#: src/help.c:268
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:292
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "ਪੁਰਾਣੀ %s ਸਕ੍ਰਿਪਟ"
 
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:305 src/help.c:371 src/help.c:430
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:354 src/help.c:414
+#: src/help.c:357 src/help.c:417
 #, c-format
 msgid "new %s script"
 msgstr "ਨਵੀਂ %s ਸਕ੍ਰਿਪਟ"
 
-#: src/help.c:388
+#: src/help.c:391
 #, c-format
 msgid "old %s script"
 msgstr "ਪੁਰਾਣੀ %s ਸਕ੍ਰਿਪਟ"
 
-#: src/help.c:402
+#: src/help.c:405
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/help.c:411
+#: src/help.c:414
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:425
+#: src/help.c:428
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:431
+#: src/help.c:434
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:582
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/help.c:584 dpkg-deb/info.c:63
+#: src/help.c:587 dpkg-deb/info.c:63
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
@@ -3952,10 +3961,12 @@ msgstr ""
 
 #: src/update.c:96
 #, c-format
-msgid "Information about %d package(s) was updated.\n"
-msgstr ""
+msgid "Information about %d package was updated.\n"
+msgid_plural "Information about %d packages was updated.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/update.c:103
+#: src/update.c:104
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -3971,8 +3982,8 @@ msgstr ""
 msgid "unable to stat file name '%.250s'"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
-#: utils/update-alternatives.c:2106
+#: dpkg-deb/build.c:229 utils/update-alternatives.c:2102
+#: utils/update-alternatives.c:2109
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4094,69 +4105,71 @@ msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਖੋਲ੍ਹਣ ਦੌਰਾ
 
 #: dpkg-deb/build.c:379
 #, c-format
-msgid "ignoring %d warnings about the control file(s)\n"
-msgstr ""
+msgid "ignoring %d warning about the control file(s)\n"
+msgid_plural "ignoring %d warnings about the control file(s)\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/build.c:388
+#: dpkg-deb/build.c:391
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:396
+#: dpkg-deb/build.c:399
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:398 dpkg-deb/build.c:464
+#: dpkg-deb/build.c:401 dpkg-deb/build.c:467
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:405
+#: dpkg-deb/build.c:408
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:407
+#: dpkg-deb/build.c:410
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:415 dpkg-deb/build.c:432
+#: dpkg-deb/build.c:418 dpkg-deb/build.c:435
 msgid "control"
 msgstr "ਕੰਟਰੋਲ"
 
-#: dpkg-deb/build.c:422
+#: dpkg-deb/build.c:425
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:432
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:448
+#: dpkg-deb/build.c:451
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:450
+#: dpkg-deb/build.c:453
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:474 dpkg-deb/extract.c:275
+#: dpkg-deb/build.c:477 dpkg-deb/extract.c:275
 msgid "data"
 msgstr "ਡਾਟਾ"
 
-#: dpkg-deb/build.c:488
+#: dpkg-deb/build.c:491
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:507
+#: dpkg-deb/build.c:502 dpkg-deb/build.c:510
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:511
+#: dpkg-deb/build.c:514
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:519
+#: dpkg-deb/build.c:522
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
@@ -4383,66 +4396,64 @@ msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
 #: dpkg-deb/info.c:121
-msgid "One requested control component is missing"
-msgstr ""
-
-#: dpkg-deb/info.c:123
 #, c-format
-msgid "%d requested control components are missing"
-msgstr ""
+msgid "%d requested control component is missing"
+msgid_plural "%d requested control components are missing"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-deb/info.c:136
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:144
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159 dpkg-deb/info.c:174 dpkg-deb/info.c:188
+#: dpkg-deb/info.c:158 dpkg-deb/info.c:173 dpkg-deb/info.c:187
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:162
+#: dpkg-deb/info.c:161
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:166
+#: dpkg-deb/info.c:165
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     not a plain file          %.255s\n"
 
-#: dpkg-deb/info.c:175
+#: dpkg-deb/info.c:174
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:205
+#: dpkg-deb/info.c:204
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:244
+#: dpkg-deb/info.c:243
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:246
+#: dpkg-deb/info.c:245
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: dpkg-deb/info.c:257
+#: dpkg-deb/info.c:256
 msgid "Error in format"
 msgstr "ਫਾਰਮੈਟ 'ਚ ਗਲਤੀ"
 
-#: dpkg-deb/info.c:294
+#: dpkg-deb/info.c:293
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4708,7 +4719,7 @@ msgstr ""
 "    Part file size (used portion):  %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:237 dpkg-split/join.c:113
+#: dpkg-split/info.c:237 dpkg-split/join.c:115
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
@@ -4720,35 +4731,37 @@ msgstr ""
 
 #: dpkg-split/join.c:45
 #, c-format
-msgid "Putting package %s together from %d parts: "
-msgstr ""
+msgid "Putting package %s together from %d part: "
+msgid_plural "Putting package %s together from %d parts: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: dpkg-split/join.c:53
+#: dpkg-split/join.c:55
 #, c-format
 msgid "unable to open output file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:57
+#: dpkg-split/join.c:59
 #, c-format
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:78
+#: dpkg-split/join.c:80
 #, c-format
 msgid "done\n"
 msgstr "ਮੁਕੰਮਲ\n"
 
-#: dpkg-split/join.c:94
+#: dpkg-split/join.c:96
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
 msgstr ""
 
-#: dpkg-split/join.c:99
+#: dpkg-split/join.c:101
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:136
+#: dpkg-split/join.c:138
 #, c-format
 msgid "part %d is missing"
 msgstr "%d ਭਾਗ ਗੁੰਮ ਹੈ"
@@ -5073,7 +5086,7 @@ msgstr "ਪਾਰਸ ਗਲਤੀ"
 
 #: utils/update-alternatives.c:270 utils/update-alternatives.c:594
 #: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
-#: utils/update-alternatives.c:1568
+#: utils/update-alternatives.c:1571
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "cannot stat %s: %s"
@@ -5125,7 +5138,7 @@ msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
+#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1859
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
@@ -5242,13 +5255,13 @@ msgstr ""
 msgid "cannot write %s: %s"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
-#: utils/update-alternatives.c:2406
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1451
+#: utils/update-alternatives.c:2409
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1457
-#: utils/update-alternatives.c:2407
+#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1460
+#: utils/update-alternatives.c:2410
 msgid "manual mode"
 msgstr ""
 
@@ -5282,153 +5295,155 @@ msgstr "%s ਦਾ ਮੌਜੂਦਾ`best' ਵਰਜਨ ਹੈ।"
 msgid "No versions available."
 msgstr "ਕੋਈ ਵਰਜਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:1432
+#: utils/update-alternatives.c:1435
 #, c-format
-msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr ""
+msgid "There is %d choice for the alternative %s (providing %s)."
+msgid_plural "There are %d choices for the alternative %s (providing %s)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/update-alternatives.c:1439
+#: utils/update-alternatives.c:1442
 #, fuzzy
 msgid "Selection"
 msgstr "ਵੇਰਵਾ"
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 #, fuzzy
 msgid "Priority"
 msgstr "ਤਰਜੀਹ %s %s"
 
-#: utils/update-alternatives.c:1440
+#: utils/update-alternatives.c:1443
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1461
+#: utils/update-alternatives.c:1464
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1582
+#: utils/update-alternatives.c:1585
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1595
+#: utils/update-alternatives.c:1598
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1613
+#: utils/update-alternatives.c:1616
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1823 utils/update-alternatives.c:1829
+#: utils/update-alternatives.c:1826 utils/update-alternatives.c:1832
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1833
+#: utils/update-alternatives.c:1836
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1837
+#: utils/update-alternatives.c:1840
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:1862
+#: utils/update-alternatives.c:1865
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
-#: utils/update-alternatives.c:1898
+#: utils/update-alternatives.c:1878 utils/update-alternatives.c:1891
+#: utils/update-alternatives.c:1901
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1917
+#: utils/update-alternatives.c:1920
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1948
+#: utils/update-alternatives.c:1951
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1994
+#: utils/update-alternatives.c:1997
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
 
-#: utils/update-alternatives.c:2013
+#: utils/update-alternatives.c:2016
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install needs <link> <name> <path> <priority>"
 
-#: utils/update-alternatives.c:2016 utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2019 utils/update-alternatives.c:2070
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2022
 msgid "priority must be an integer"
 msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:2032
+#: utils/update-alternatives.c:2035
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s needs <name> <path>"
 
-#: utils/update-alternatives.c:2046
+#: utils/update-alternatives.c:2049
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s needs <name>"
 
-#: utils/update-alternatives.c:2058
+#: utils/update-alternatives.c:2061
 msgid "--slave only allowed with --install"
 msgstr "--slave only allowed with --install"
 
-#: utils/update-alternatives.c:2060
+#: utils/update-alternatives.c:2063
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave needs <link> <name> <path>"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2072
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2072
+#: utils/update-alternatives.c:2075
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2078
 #, c-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2085
 #, c-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
+#: utils/update-alternatives.c:2095
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s needs <name>"
 
-#: utils/update-alternatives.c:2118
+#: utils/update-alternatives.c:2121
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
 
-#: utils/update-alternatives.c:2123
+#: utils/update-alternatives.c:2126
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5437,127 +5452,127 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: utils/update-alternatives.c:2166 utils/update-alternatives.c:2210
+#: utils/update-alternatives.c:2169 utils/update-alternatives.c:2213
 #, fuzzy, c-format
 msgid "it is a slave of %s"
 msgstr " ਸਲੇਵ %s: %s"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2171
 #, c-format
 msgid "alternative %s can't be master: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
+#: utils/update-alternatives.c:2181 utils/update-alternatives.c:2223
 #, c-format
 msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2183 utils/update-alternatives.c:2226
+#: utils/update-alternatives.c:2186 utils/update-alternatives.c:2229
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2187 utils/update-alternatives.c:2230
+#: utils/update-alternatives.c:2190 utils/update-alternatives.c:2233
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
+#: utils/update-alternatives.c:2194
 #, c-format
 msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2195 utils/update-alternatives.c:2234
+#: utils/update-alternatives.c:2198 utils/update-alternatives.c:2237
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2208
+#: utils/update-alternatives.c:2211
 msgid "it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2212
+#: utils/update-alternatives.c:2215
 #, c-format
 msgid "alternative %s can't be slave of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2258
+#: utils/update-alternatives.c:2261
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
+#: utils/update-alternatives.c:2270 utils/update-alternatives.c:2273
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:2296
+#: utils/update-alternatives.c:2299
 #, c-format
 msgid "%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2300
+#: utils/update-alternatives.c:2303
 #, c-format
 msgid ""
 "%s has been changed (manually or by a script). Switching to manual updates "
 "only."
 msgstr ""
 
-#: utils/update-alternatives.c:2309
+#: utils/update-alternatives.c:2312
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਚੋਣ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2321
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2326
+#: utils/update-alternatives.c:2329
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2328 utils/update-alternatives.c:2338
+#: utils/update-alternatives.c:2331 utils/update-alternatives.c:2341
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2336
+#: utils/update-alternatives.c:2339
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2347
+#: utils/update-alternatives.c:2350
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2355
+#: utils/update-alternatives.c:2358
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2383
+#: utils/update-alternatives.c:2386
 #, fuzzy, c-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਯੋਗ ਹੈ, ਇਸ ਨੂੰ ਇੱਕਲਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2388
 #, c-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2407
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "  %.250s %s ਹੈ।\n"
 
-#: utils/update-alternatives.c:2412
+#: utils/update-alternatives.c:2415
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""

scripts/Dpkg/Gettext.pm

@@ -44,17 +44,23 @@ BEGIN {
 					return $_[1];
 				}
 			}
+			sub P_ {
+				return ngettext(@_);
+			}
 		};
 	} else {
 		eval q{
 			sub _g {
 				return gettext(shift);
 			}
+			sub P_ {
+				return ngettext(@_);
+			}
 		};
 	}
 }
 
 use base qw(Exporter);
-our @EXPORT=qw(_g textdomain ngettext);
+our @EXPORT=qw(_g P_ textdomain ngettext);
 
 1;

scripts/Dpkg/Source/Archive.pm

@@ -124,7 +124,7 @@ sub extract {
     # Call tar extraction process
     $spawn_opts{"delete_env"} = [ "TAR_OPTIONS" ];
     $spawn_opts{'exec'} = [ 'tar', '--no-same-owner', '--no-same-permissions',
-                            @{$opts{"options"}}, '-xkf', '-' ];
+                            @{$opts{"options"}}, '-xf', '-' ];
     spawn(%spawn_opts);
     $self->close();
 

scripts/Dpkg/Source/Package/V2.pm

@@ -414,9 +414,12 @@ sub do_build {
     };
     find({ wanted => $check_binary, preprocess => $filter_ignore,
            no_chdir => 1 }, File::Spec->catdir($dir, "debian"));
-    error(_g("detected %d unwanted binary file(s) " .
-        "(add them in debian/source/include-binaries to allow their " .
-        "inclusion)."), $unwanted_binaries) if $unwanted_binaries;
+    error(P_("detected %d unwanted binary file (add it in " .
+             "debian/source/include-binaries to allow its inclusion).",
+             "detected %d unwanted binary files (add them in " .
+             "debian/source/include-binaries to allow their inclusion).",
+             $unwanted_binaries), $unwanted_binaries)
+         if $unwanted_binaries;
 
     # Create a patch
     my $autopatch = File::Spec->catfile($dir, "debian", "patches",

scripts/dpkg-genchanges.pl

@@ -18,6 +18,7 @@
 use strict;
 use warnings;
 
+use Encode;
 use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
@@ -286,7 +287,7 @@ foreach my $pkg ($control->get_packages()) {
     push @f, @{$p2f{$p}} if defined $p2f{$p};
 
     # Add description of all binary packages
-    my $desc = sprintf("%-10s - %-.65s", $p, $d);
+    my $desc = encode_utf8(sprintf("%-10s - %-.65s", $p, decode_utf8($d)));
     $desc .= " (udeb)" if $pkg_type eq "udeb";
     push @descriptions, $desc;
 

scripts/dpkg-shlibdeps.pl

@@ -376,8 +376,10 @@ foreach my $file (keys %exec) {
 	    }
 	}
     }
-    warning(_g("%d other similar warnings have been skipped (use -v to see " .
-	    "them all)."), $nb_skipped_warnings) if $nb_skipped_warnings;
+    warning(P_("%d similar warning has been skipped (use -v to see it).",
+               "%d other similar warnings have been skipped (use -v to see " .
+               "them all).", $nb_skipped_warnings), $nb_skipped_warnings)
+        if $nb_skipped_warnings;
     foreach my $soname (@sonames) {
 	# Adjust minimal version of dependencies with information
 	# extracted from build-dependencies

scripts/po/Makevars

@@ -8,7 +8,7 @@ subdir = scripts/po
 top_builddir = ../..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=iso-8859-1 --keyword=_g
+XGETTEXT_OPTIONS = --from-code=iso-8859-1 --keyword=_g --keyword=P_:1,2
 
 MSGMERGE_OPTIONS = --previous
 

scripts/po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-31 20:58+0200\n"
 "PO-Revision-Date: 2010-03-11 03:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -19,11 +19,11 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
 #: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
-#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
-#: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:518
+#: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:520
 #: scripts/dpkg-source.pl:416 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
@@ -41,9 +41,9 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
 #: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
-#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:423
+#: scripts/dpkg-shlibdeps.pl:529 scripts/dpkg-source.pl:423
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:84
-#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
 #, perl-format
@@ -226,9 +226,9 @@ msgstr ""
 
 #: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
 #: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:142
-#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
-#: scripts/dpkg-genchanges.pl:153
+#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
+#: scripts/dpkg-genchanges.pl:154
 #, fuzzy, perl-format
 msgid "cannot combine %s and %s"
 msgstr "no es pot combinar -b o -B amb -S"
@@ -456,7 +456,7 @@ msgstr ""
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:97
+#: scripts/dpkg-genchanges.pl:98
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -466,7 +466,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:109
+#: scripts/dpkg-genchanges.pl:110
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -498,113 +498,113 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:147
+#: scripts/dpkg-genchanges.pl:148
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:151
+#: scripts/dpkg-genchanges.pl:152
 #, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:218
+#: scripts/dpkg-genchanges.pl:219
 #, perl-format
 msgid "the current version (%s) is earlier than the previous one (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:225
+#: scripts/dpkg-genchanges.pl:226
 msgid "cannot read files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:229
+#: scripts/dpkg-genchanges.pl:230
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:237 scripts/dpkg-genchanges.pl:251
+#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-genchanges.pl:252
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:257
+#: scripts/dpkg-genchanges.pl:258
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:298
+#: scripts/dpkg-genchanges.pl:299
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:342
+#: scripts/dpkg-genchanges.pl:343
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:362
+#: scripts/dpkg-genchanges.pl:363
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:364
+#: scripts/dpkg-genchanges.pl:365
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:371
+#: scripts/dpkg-genchanges.pl:372
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:373
+#: scripts/dpkg-genchanges.pl:374
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:385
+#: scripts/dpkg-genchanges.pl:386
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:390
+#: scripts/dpkg-genchanges.pl:391
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:397 scripts/Dpkg/Vendor.pm:71
+#: scripts/dpkg-genchanges.pl:398 scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:423
+#: scripts/dpkg-genchanges.pl:424
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:430
+#: scripts/dpkg-genchanges.pl:431
 msgid "ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:432
+#: scripts/dpkg-genchanges.pl:433
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:435
+#: scripts/dpkg-genchanges.pl:436
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:439
+#: scripts/dpkg-genchanges.pl:440
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:492 scripts/Dpkg/Source/Package.pm:426
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
+#: scripts/dpkg-genchanges.pl:497 scripts/dpkg-gencontrol.pl:272
 #: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
 #, perl-format
 msgid "missing information for output field %s"
@@ -698,7 +698,7 @@ msgid "%s package with udeb specific field %s"
 msgstr ""
 
 #: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
-#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
+#: scripts/dpkg-shlibdeps.pl:821 scripts/Dpkg/Changelog/Parse.pm:138
 #: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:181
 #, fuzzy, perl-format
 msgid "cannot fork for %s"
@@ -860,7 +860,7 @@ msgstr ""
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:347
 #: scripts/Dpkg/Source/Package.pm:444 scripts/Dpkg/Source/Package/V2.pm:206
-#: scripts/Dpkg/Source/Package/V2.pm:468 scripts/Dpkg/Source/Package/V2.pm:513
+#: scripts/Dpkg/Source/Package/V2.pm:471 scripts/Dpkg/Source/Package/V2.pm:516
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:141
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:150
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:156
@@ -1246,47 +1246,50 @@ msgstr ""
 
 #: scripts/dpkg-shlibdeps.pl:379
 #, perl-format
-msgid "%d other similar warnings have been skipped (use -v to see them all)."
-msgstr ""
+msgid "%d similar warning has been skipped (use -v to see it)."
+msgid_plural ""
+"%d other similar warnings have been skipped (use -v to see them all)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: scripts/dpkg-shlibdeps.pl:404
+#: scripts/dpkg-shlibdeps.pl:406
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:417
+#: scripts/dpkg-shlibdeps.pl:419
 #, perl-format
 msgid ""
 "dependency on %s could be avoided if \"%s\" were not uselessly linked "
 "against it (they use none of its symbols)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:430
+#: scripts/dpkg-shlibdeps.pl:432
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:433
+#: scripts/dpkg-shlibdeps.pl:435
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:436
+#: scripts/dpkg-shlibdeps.pl:438
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:500
+#: scripts/dpkg-shlibdeps.pl:502
 #, perl-format
 msgid "invalid dependency got generated: %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:510
+#: scripts/dpkg-shlibdeps.pl:512
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:520
+#: scripts/dpkg-shlibdeps.pl:522
 #, fuzzy
 msgid ""
 "\n"
@@ -1299,7 +1302,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert Akkerman."
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:537
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1331,27 +1334,27 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:661
+#: scripts/dpkg-shlibdeps.pl:663
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:668
+#: scripts/dpkg-shlibdeps.pl:670
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:674
+#: scripts/dpkg-shlibdeps.pl:676
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:732
+#: scripts/dpkg-shlibdeps.pl:734
 #, fuzzy, perl-format
 msgid "cannot open file %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-shlibdeps.pl:766
+#: scripts/dpkg-shlibdeps.pl:768
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1359,19 +1362,19 @@ msgid ""
 "build tree"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:826
+#: scripts/dpkg-shlibdeps.pl:828
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:831
+#: scripts/dpkg-shlibdeps.pl:833
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:833
+#: scripts/dpkg-shlibdeps.pl:835
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:837
+#: scripts/dpkg-shlibdeps.pl:839
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
@@ -1424,7 +1427,7 @@ msgstr ""
 #: scripts/dpkg-source.pl:309 scripts/Dpkg/BuildFlags.pm:190
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:355 scripts/Dpkg/Source/Package/V2.pm:496
+#: scripts/Dpkg/Source/Package/V2.pm:355 scripts/Dpkg/Source/Package/V2.pm:499
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:111
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:272
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:326
@@ -1449,7 +1452,7 @@ msgid "using source format `%s'"
 msgstr ""
 
 #: scripts/dpkg-source.pl:349 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:479
+#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:482
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:83
 #, fuzzy, perl-format
@@ -2583,7 +2586,7 @@ msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:452
+#: scripts/Dpkg/Source/Package/V2.pm:455
 #: scripts/Dpkg/Source/Package/V3/native.pm:99
 #, perl-format
 msgid "unable to change permission of `%s'"
@@ -2617,7 +2620,7 @@ msgid ""
 "upstream files, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:456
+#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:459
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr ""
 
@@ -2689,31 +2692,35 @@ msgstr "no es pot combinar -b o -B amb -S"
 #: scripts/Dpkg/Source/Package/V2.pm:417
 #, perl-format
 msgid ""
-"detected %d unwanted binary file(s) (add them in debian/source/include-"
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
 "binaries to allow their inclusion)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:433
+#: scripts/Dpkg/Source/Package/V2.pm:436
 #, fuzzy
 msgid "unrepresentable changes to source"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/Dpkg/Source/Package/V2.pm:437 scripts/Dpkg/Source/Package/V2.pm:441
+#: scripts/Dpkg/Source/Package/V2.pm:440 scripts/Dpkg/Source/Package/V2.pm:444
 #, fuzzy, perl-format
 msgid "cannot remove %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V2.pm:444
+#: scripts/Dpkg/Source/Package/V2.pm:447
 #, perl-format
 msgid "local changes stored in %s, the modified files are:"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:453
 #, fuzzy, perl-format
 msgid "cannot rename %s to %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V2.pm:475
 #, fuzzy, perl-format
 msgid "adding %s to %s"
 msgstr "%s: s'està construint %s a %s"