summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2010-04-21 04:03:24 +0200
committerGuillem Jover <guillem@debian.org>2010-04-21 04:28:56 +0200
commitce35feb718b5213ea9fb49065d262ef2c0bd1d95 (patch)
tree943c6c192772f9436672654b62d743e43a4b0599
parent0958a9f9b28fb818863092346bbecb584655d8aa (diff)
downloaddpkg-ce35feb718b5213ea9fb49065d262ef2c0bd1d95.tar.gz
Regenerate .pot files and merge .po files with them
-rw-r--r--dselect/po/bs.po16
-rw-r--r--dselect/po/ca.po16
-rw-r--r--dselect/po/cs.po16
-rw-r--r--dselect/po/da.po16
-rw-r--r--dselect/po/de.po16
-rw-r--r--dselect/po/dselect.pot16
-rw-r--r--dselect/po/el.po16
-rw-r--r--dselect/po/es.po16
-rw-r--r--dselect/po/et.po16
-rw-r--r--dselect/po/eu.po16
-rw-r--r--dselect/po/fr.po19
-rw-r--r--dselect/po/gl.po16
-rw-r--r--dselect/po/hu.po16
-rw-r--r--dselect/po/id.po16
-rw-r--r--dselect/po/it.po16
-rw-r--r--dselect/po/ja.po16
-rw-r--r--dselect/po/ko.po16
-rw-r--r--dselect/po/nb.po16
-rw-r--r--dselect/po/nl.po16
-rw-r--r--dselect/po/nn.po16
-rw-r--r--dselect/po/pl.po16
-rw-r--r--dselect/po/pt.po16
-rw-r--r--dselect/po/pt_BR.po16
-rw-r--r--dselect/po/ro.po16
-rw-r--r--dselect/po/ru.po16
-rw-r--r--dselect/po/sk.po16
-rw-r--r--dselect/po/sv.po16
-rw-r--r--dselect/po/tl.po16
-rw-r--r--dselect/po/vi.po16
-rw-r--r--dselect/po/zh_CN.po16
-rw-r--r--dselect/po/zh_TW.po16
-rw-r--r--man/po/de.po702
-rw-r--r--man/po/dpkg-man.pot1348
-rw-r--r--man/po/es.po1498
-rw-r--r--man/po/fr.po1697
-rw-r--r--man/po/hu.po1483
-rw-r--r--man/po/ja.po1491
-rw-r--r--man/po/pl.po1667
-rw-r--r--man/po/pt_BR.po1480
-rw-r--r--man/po/ru.po1487
-rw-r--r--man/po/sv.po1696
-rw-r--r--po/ast.po316
-rw-r--r--po/bs.po310
-rw-r--r--po/ca.po314
-rw-r--r--po/cs.po314
-rw-r--r--po/da.po312
-rw-r--r--po/de.po314
-rw-r--r--po/dpkg.pot310
-rw-r--r--po/dz.po314
-rw-r--r--po/el.po314
-rw-r--r--po/eo.po314
-rw-r--r--po/es.po316
-rw-r--r--po/et.po310
-rw-r--r--po/eu.po312
-rw-r--r--po/fr.po382
-rw-r--r--po/gl.po314
-rw-r--r--po/hu.po310
-rw-r--r--po/id.po314
-rw-r--r--po/it.po314
-rw-r--r--po/ja.po314
-rw-r--r--po/km.po312
-rw-r--r--po/ko.po310
-rw-r--r--po/ku.po310
-rw-r--r--po/lt.po312
-rw-r--r--po/mr.po314
-rw-r--r--po/nb.po312
-rw-r--r--po/ne.po314
-rw-r--r--po/nl.po314
-rw-r--r--po/nn.po312
-rw-r--r--po/pa.po310
-rw-r--r--po/pl.po312
-rw-r--r--po/pt.po314
-rw-r--r--po/pt_BR.po314
-rw-r--r--po/ro.po314
-rw-r--r--po/ru.po314
-rw-r--r--po/sk.po314
-rw-r--r--po/sv.po314
-rw-r--r--po/th.po310
-rw-r--r--po/tl.po314
-rw-r--r--po/vi.po314
-rw-r--r--po/zh_CN.po312
-rw-r--r--po/zh_TW.po310
-rw-r--r--scripts/po/ca.po404
-rw-r--r--scripts/po/de.po1315
-rw-r--r--scripts/po/dpkg-dev.pot400
-rw-r--r--scripts/po/fr.po427
-rw-r--r--scripts/po/pl.po426
-rw-r--r--scripts/po/ru.po425
-rw-r--r--scripts/po/sv.po426
89 files changed, 19356 insertions, 12409 deletions
diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 5840a54b6..5d40985f1 100644
--- a/dselect/po/bs.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -787,19 +787,19 @@ msgstr ""
msgid "Description"
msgstr "Opis"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr ""
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr ""
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr ""
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr ""
@@ -1319,15 +1319,15 @@ msgstr ""
msgid "Available control file information"
msgstr ""
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr ""
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr ""
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 563523ea0..c9aa0b8ae 100644
--- a/dselect/po/ca.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1013,19 +1013,19 @@ msgstr "Abreujament"
msgid "Description"
msgstr "Descripció"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "«doupdate» ha fallat"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "no s'ha pogut desblocar SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "no s'ha pogut tornar a blocar SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch ha fallat"
@@ -1561,15 +1561,15 @@ msgstr "Informació del fitxer de control instal·lada"
msgid "Available control file information"
msgstr "Informació del fitxer de control disponible"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "No hi ha paquets."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "s'ha donat una opció de recerca invàlida"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "error en l'expressió regular"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index 55ec81846..2fdd42c72 100644
--- a/dselect/po/cs.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -998,19 +998,19 @@ msgstr "Zkratka"
msgid "Description"
msgstr "Popis"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "nepovedlo se doupdate"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "nepovedlo se odblokovat SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "nepovedlo se znovu zablokovat SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "nepovedlo se getch"
@@ -1543,15 +1543,15 @@ msgstr "Stav instalace podle souboru control"
msgid "Available control file information"
msgstr "Dostupné informace ze souboru control"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Nejsou zde žádné balíky."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "zadána neplatná volba"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "chyba v regulárním výrazu"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 30a9f9d65..4bafa01db 100644
--- a/dselect/po/da.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1010,19 +1010,19 @@ msgstr "Forkort."
msgid "Description"
msgstr "Beskrivelse"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate mislykkedes"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "kunne ikke afblokere SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "kunne ikke genblokere SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "'getch' mislykkedes"
@@ -1561,15 +1561,15 @@ msgstr "installeret kontrolinformation for"
msgid "Available control file information"
msgstr "tilgngelig version af kontrolinformation for fil"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "ugyldigt sgetilvalg angivet"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "fejl i regulrt udtryk"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index e55c5bf9a..0447d307f 100644
--- a/dselect/po/de.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1032,19 +1032,19 @@ msgstr "Abkürz."
msgid "Description"
msgstr "Beschreibung"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate fehlgeschlagen"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "Konnte SIGWINCH nicht entblockieren"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "Konnte SIGWINCH nicht erneut blockieren"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch fehlgeschlagen"
@@ -1594,15 +1594,15 @@ msgstr "Installierte Control-Datei-Informationen"
msgid "Available control file information"
msgstr "Verfügbare Control-Datei-Informationen"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Es gibt keine Pakete."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "ungültige Suchoption angegeben"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "Fehler in regulärem Ausdruck"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index f67d1887d..4f74eab87 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -780,19 +780,19 @@ msgstr ""
msgid "Description"
msgstr ""
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr ""
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr ""
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr ""
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr ""
@@ -1312,15 +1312,15 @@ msgstr ""
msgid "Available control file information"
msgstr ""
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr ""
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr ""
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 96ab2f2ea..372896693 100644
--- a/dselect/po/el.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1021,19 +1021,19 @@ msgstr "Σύντμηση"
msgid "Description"
msgstr "Περιγραφή"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "η doupdate απέτυχε"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "απέτυχε η απεμπλοκή του SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "απέτυχε η επανεμπλοκή του SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "η getch απέτυχε"
@@ -1572,15 +1572,15 @@ msgstr "εγκατεστημένη πληροφορία ελέγχου για τ
msgid "Available control file information"
msgstr "διαθέσιμη έκδοση πληροφορίας ελέγχου αρχείου"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "δόθηκε άκυρη παράμετρος αναζήτησης"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "σφάλμα στην κανονική έκφραση"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 402b48408..3f0d194ff 100644
--- a/dselect/po/es.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-03-07 09:18+0100\n"
"Last-Translator: Javier Fernndez-Sanguino <jfs@debian.org>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1042,19 +1042,19 @@ msgstr "Abrev."
msgid "Description"
msgstr "Descripcin"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "`doupdate' fall"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "fallo al desbloquear SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "fallo al rebloquear SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch fall"
@@ -1600,15 +1600,15 @@ msgstr "Iinformacin de control instalada"
msgid "Available control file information"
msgstr "Informacin disponible de control"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "se ha dado una opcin de bsqueda invlida"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "error en la expresin regular"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index 83c148260..c317d9aa5 100644
--- a/dselect/po/et.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -865,19 +865,19 @@ msgstr "Lühend"
msgid "Description"
msgstr "Kirjeldus"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "tõrge funktsioonis doupdate"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "tõrge SIGWINCH signaalilt blokeeringu eemaldamisel"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "tõrge SIGWINCH signaali uuesti blokkimisel"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "tõrge funktsioonis getch"
@@ -1403,15 +1403,15 @@ msgstr "Paigaldatud juhtfaili andmed"
msgid "Available control file information"
msgstr "Saadaoleva juhtfaili andmed"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "määrati lubamatu otsinguvalik"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "viga regulaaravaldises"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index 1410c241e..6e9723554 100644
--- a/dselect/po/eu.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1021,19 +1021,19 @@ msgstr "Laburd."
msgid "Description"
msgstr "Azalpena"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate: huts egin du"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "huts egin du SIGWINCH desblokeatzean"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "huts egin du SIGWINCH birblokeatzean"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch: huts egin du"
@@ -1567,15 +1567,15 @@ msgstr "instalatutako kontrol fitxategiaren informazioa"
msgid "Available control file information"
msgstr "Kontrol fitxategiaren informazio erabilgarria"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "bilaketa-aukera baliogabea eman da"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "errorea adierazpen erregularrean"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index c5abcc1a0..ff9b5a821 100644
--- a/dselect/po/fr.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -639,7 +639,8 @@ msgstr ""
#: dselect/helpmsgs.cc:152
msgid "Display, part 2: list highlight; information display"
-msgstr "Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
+msgstr ""
+"Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
#: dselect/helpmsgs.cc:152
msgid ""
@@ -1077,19 +1078,19 @@ msgstr "Abrév."
msgid "Description"
msgstr "Description"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "échec de doupdate"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "échec du déblocage de SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "échec du reblocage de SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "échec de « getch »"
@@ -1633,15 +1634,15 @@ msgstr "information de contrôle installée"
msgid "Available control file information"
msgstr "Informations disponibles du fichier de contrôle"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Il n'existe pas de paquets."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "Option de recherche donnée invalide"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "Erreur dans l'expression rationnelle"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 3a9e275dd..1fa644763 100644
--- a/dselect/po/gl.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1023,19 +1023,19 @@ msgstr "Abrev."
msgid "Description"
msgstr "Descrición"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "a chamada a doupdate fallou"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "non foi posíbel desbloquear SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "non foi posíbel volver bloquear SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "a chamada a getch fallou"
@@ -1570,15 +1570,15 @@ msgstr "Información do ficheiro de control instalado"
msgid "Available control file information"
msgstr "Versión dispoñíbel da información do ficheiro de control"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "forneceuse unha opción de procura non válida"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "erro na expresión regular"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index 95a2b7136..b369e674d 100644
--- a/dselect/po/hu.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -841,19 +841,19 @@ msgstr "Röv."
msgid "Description"
msgstr "Leírás"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "frissítés sikertelen"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr ""
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr ""
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr ""
@@ -1384,15 +1384,15 @@ msgstr "telepített ellenőrző adatok ehhez:"
msgid "Available control file information"
msgstr "ellenőrző fájl elérhető verziója ehhez:"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "érvénytelen keresési lehetőség"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "hiba a szabályos kifejezésben"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 2470f5304..8e4f5b923 100644
--- a/dselect/po/id.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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."
@@ -1059,19 +1059,19 @@ msgstr "Singkatan"
msgid "Description"
msgstr "Keterangan"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate gagal"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "gagal melakukan 'unblock' SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "gagal melakukan 're-block' SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch gagal"
@@ -1610,15 +1610,15 @@ msgstr " Info 'control' yang terpasang untuk"
msgid "Available control file information"
msgstr "versi info berkas 'control' yang tersedia"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "pilihan pencarian tidak sah"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "ada kesalahan dalam ekspresi regular"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index acbfe4dd4..b6445e80e 100644
--- a/dselect/po/it.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1076,19 +1076,19 @@ msgstr "Abbrev."
msgid "Description"
msgstr "Descrizione"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate fallita"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "impossibile sbloccare SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "impossibile ribloccare SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch fallita"
@@ -1629,15 +1629,15 @@ msgstr "info di controllo installate di "
msgid "Available control file information"
msgstr "info di controllo della versione disponibile"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "specificata opzione di ricerca errata"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "errore nell'espressione regolare"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index 3fc148581..4b551a017 100644
--- a/dselect/po/ja.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1007,19 +1007,19 @@ msgstr "頭文字"
msgid "Description"
msgstr "説明"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate 失敗"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "SIGWINCH のアンブロックに失敗しました"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "SIGWINCH のリブロックに失敗しました"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch 失敗"
@@ -1557,15 +1557,15 @@ msgstr "導入済みバージョンの制御情報 "
msgid "Available control file information"
msgstr "利用可能バージョンの制御情報"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "無効な検索オプションが指定されました"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "正規表現エラー"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index d14976e22..f502eb5a3 100644
--- a/dselect/po/ko.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -997,19 +997,19 @@ msgstr "약어"
msgid "Description"
msgstr "설명"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate가 실패했습니다"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "SIGWINCH 시그널의 블록을 해제하는 데 실패했습니다"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "SIGWINCH 시그널을 블록을 다시 설정하는 데 실패했습니다"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch가 실패했습니다"
@@ -1545,15 +1545,15 @@ msgstr "설치된 제어 파일 정보 "
msgid "Available control file information"
msgstr "현재 있는 제어 파일 정보"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "주어진 찾기 옵션이 올바르지 않습니다"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "정규식에 오류"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index aeaea5460..62b62699c 100644
--- a/dselect/po/nb.po
+++ b/dselect/po/nb.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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-02-01 20:24+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -1001,19 +1001,19 @@ msgstr "Forkort."
msgid "Description"
msgstr "Beskrivelse"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "«doupdate» mislyktes"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "klarte ikke avblokkere SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "klarte ikke reblokkere SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "«getch» mislyktes"
@@ -1547,15 +1547,15 @@ msgstr "Installert kontrollfilinformasjon"
msgid "Available control file information"
msgstr "Tilgjengelig kontrollfilinformasjon"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "ugyldig søkevalg oppgitt"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "feil i regulært uttrykk"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 10bd5b9cb..2e47ebc6f 100644
--- a/dselect/po/nl.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1019,19 +1019,19 @@ msgstr "Afkorting"
msgid "Description"
msgstr "Omschrijving"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate is mislukt"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "kon SIGWINCH niet deblokkeren"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "kon SIGWINCH niet opnieuw blokkeren"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch is mislukt"
@@ -1566,15 +1566,15 @@ msgstr "Geïnstalleerde informatie uit 'control'-bestanden"
msgid "Available control file information"
msgstr "Beschikbare informatie uit 'control'-bestanden"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "ongeldige zoekoptie opgegeven"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "fout in reguliere expressie"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 7905fa248..a291c09cd 100644
--- a/dselect/po/nn.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -988,19 +988,19 @@ msgstr "Forkort."
msgid "Description"
msgstr "Skildring"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "«doupdate» feila"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "klarte ikkje avblokkera SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "klarte ikkje reblokkera SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "«getch» feila"
@@ -1539,15 +1539,15 @@ msgstr "installert kontrollinformasjon for "
msgid "Available control file information"
msgstr "tilgjengeleg versjon av kontrollfilinformasjon"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "ugyldig søkjeval oppgjeve"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "feil i regulært uttrykk"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 426c84506..86bbf62c9 100644
--- a/dselect/po/pl.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1019,19 +1019,19 @@ msgstr "Oznaczenie"
msgid "Description"
msgstr "Opis"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "nie można wykonać funkcji \"doupdate\""
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "nie można odblokować SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "nie można ponownie zablokować SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "nie można wykonać funkcji \"getch\""
@@ -1564,15 +1564,15 @@ msgstr "Informacje o zainstalowanej wersji pakietu"
msgid "Available control file information"
msgstr "Informacje o dostępnej wersji pakietu"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Nie ma żadnych pakietów."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "nieprawidłowa opcja wyszukiwania"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "błąd w wyrażeniu regularnym"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index aa1cc63e1..73f8affe5 100644
--- a/dselect/po/pt.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1008,19 +1008,19 @@ msgstr "Abrev."
msgid "Description"
msgstr "Descrição"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "falhou doupdate"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "falha ao desbloquear SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "falhou re-bloquear SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "falhou getch"
@@ -1556,15 +1556,15 @@ msgstr "Informação do ficheiro controle de 'Installed'"
msgid "Available control file information"
msgstr "informação 'Available' do ficheiro de controle"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "fornecida opção de busca inválida"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "erro em expressão regular"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index 35b1336aa..91f925b90 100644
--- a/dselect/po/pt_BR.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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."
@@ -1024,19 +1024,19 @@ msgstr "Abrev."
msgid "Description"
msgstr "Descrição"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate falhou"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "falhou ao desbloquear SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "falhou ao re-bloquear SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "\"getch\" falhou"
@@ -1570,15 +1570,15 @@ msgstr "Informação do arquivo de controle instalado"
msgid "Available control file information"
msgstr "Informação do arquivo de controle disponível"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "fornecida opção de busca inválida"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "erro na expressão regular"
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 896b9eb78..46b550453 100644
--- a/dselect/po/ro.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1044,19 +1044,19 @@ msgstr "Presc."
msgid "Description"
msgstr "Descriere"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate a eșuat"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "eșec la deblocarea lui SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "eșec la reblocarea lui SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "eșec getch"
@@ -1590,15 +1590,15 @@ msgstr "Informația de control instalată"
msgid "Available control file information"
msgstr "Informația de control disponibilă"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "opțiunea de căutare dată este invalidă"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "eroare în expresia regulată"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 41bb031ba..52997801c 100644
--- a/dselect/po/ru.po
+++ b/dselect/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.3.1\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-08-18 21:20+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1028,19 +1028,19 @@ msgstr "Сокр."
msgid "Description"
msgstr "Описание"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "работа функции doupdate завершилась неудачно"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "не удалось разблокировать сигнал SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "не удалось заново блокировать сигнал SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "ожидание нажатия клавиши завершилось неудачно"
@@ -1581,15 +1581,15 @@ msgstr "Установлена информация из файла control"
msgid "Available control file information"
msgstr "Доступна информация из файла control"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Пакетов нет."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "заданы неверные параметры поиска"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "некорректное регулярное выражение"
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index 697b70cb7..35e7eb11c 100644
--- a/dselect/po/sk.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1027,19 +1027,19 @@ msgstr "Skrát."
msgid "Description"
msgstr "Popis"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "funkcia doupdate zlyhala"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "zlyhalo odblokovanie premennej SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "zlyhalo opätovné zablokovanie premennej SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "funkcia getch zlyhala"
@@ -1573,15 +1573,15 @@ msgstr "Informácie nainštalovaného riadiaceho súboru"
msgid "Available control file information"
msgstr "Dostupné informácie o riadiacom súbore"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Žiadne balíky."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "zadaná nesprávna podmienka vyhľadávania"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "chyba v regulárnom výraze"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 271743b7c..7e44e23cc 100644
--- a/dselect/po/sv.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1004,19 +1004,19 @@ msgstr "Förk."
msgid "Description"
msgstr "Beskrivning"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate misslyckades"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "kunde inte avblockera fönsteruppdatering"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "kunde inte åter blockera fönsteruppdatering"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch misslyckades"
@@ -1549,15 +1549,15 @@ msgstr "Installerad kontrollfilsinformation för "
msgid "Available control file information"
msgstr "Tillgänglig kontrollfilsinformation för"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr "Det finns inte några paket."
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "ogiltigt sökflagga given"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "fel i reguljärt uttryck"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 301d94902..703cdc54d 100644
--- a/dselect/po/tl.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1039,19 +1039,19 @@ msgstr "Daglat"
msgid "Description"
msgstr "Paglalarawan"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "bigo ang doupdate"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "bigo sa pag-unblock ng SIGWINCH"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "bigo sa pag-re-block ng SIGWINCH"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "bigo ang getch"
@@ -1595,15 +1595,15 @@ msgstr "naka-luklok na impormasyong control para sa "
msgid "Available control file information"
msgstr "magagamit na bersyon ng impormasyon ng talaksang control"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "di tanggap na opsyon sa paghahanap ay ibinigay"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "error sa regular expression"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index f8b3cba3f..3e53f0e89 100644
--- a/dselect/po/vi.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1015,19 +1015,19 @@ msgstr "Viết tắt"
msgid "Description"
msgstr "Mô tả"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "việc doupdate (chạy tiến trình cập nhật) bị lỗi"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "việc bỏ ngăn chặn SIGWINCH bị lỗi"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "việc ngăn chặn lại SIGWINCH bị lỗi"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "việc getch (đọc từng ký tự khi gõ) bị lỗi"
@@ -1565,15 +1565,15 @@ msgstr "thông tin điều khiển đã cài đặt cho "
msgid "Available control file information"
msgstr "phiên bản có sẵn của thông tin tập tin điều khiển"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "đưa ra tuỳ chọn tìm kiếm không hợp lệ"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "gặp lỗi trong biểu thức chính quy"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 797afb158..73f952517 100644
--- a/dselect/po/zh_CN.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -992,19 +992,19 @@ msgstr "缩写"
msgid "Description"
msgstr "简介"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate 失败"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "无法取消阻塞 SIGWINCH 信号"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "重新阻塞 SIGWINCH 信号失败"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch 失败"
@@ -1542,15 +1542,15 @@ msgstr "为下面软件包安装的控制信息"
msgid "Available control file information"
msgstr "可用的控制信息的版本"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "指定了无效的搜索选项"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "正则表达式有误"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 7985e6461..78d6f9a2a 100644
--- a/dselect/po/zh_TW.po
+++ b/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-03-08 12:15+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -966,19 +966,19 @@ msgstr "縮寫"
msgid "Description"
msgstr "簡介"
-#: dselect/methlist.cc:165 dselect/pkglist.cc:572
+#: dselect/methlist.cc:165 dselect/pkglist.cc:574
msgid "doupdate failed"
msgstr "doupdate 失敗"
-#: dselect/methlist.cc:167 dselect/pkglist.cc:575
+#: dselect/methlist.cc:167 dselect/pkglist.cc:577
msgid "failed to unblock SIGWINCH"
msgstr "無法解除阻塞 SIGWINCH 信號"
-#: dselect/methlist.cc:171 dselect/pkglist.cc:580
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
msgid "failed to re-block SIGWINCH"
msgstr "重新阻塞 SIGWINCH 信號失敗"
-#: dselect/methlist.cc:172 dselect/pkglist.cc:582
+#: dselect/methlist.cc:172 dselect/pkglist.cc:584
msgid "getch failed"
msgstr "getch 失敗"
@@ -1516,15 +1516,15 @@ msgstr "為下面套件安裝的控制訊息"
msgid "Available control file information"
msgstr "可用的控制訊息的版本"
-#: dselect/pkglist.cc:423
+#: dselect/pkglist.cc:424
msgid "There are no packages."
msgstr ""
-#: dselect/pkglist.cc:510
+#: dselect/pkglist.cc:512
msgid "invalid search option given"
msgstr "指定了無效的搜尋選項"
-#: dselect/pkglist.cc:524
+#: dselect/pkglist.cc:526
msgid "error in regular expression"
msgstr "正規表示法有誤"
diff --git a/man/po/de.po b/man/po/de.po
index 379eaad48..9389e1953 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2010-03-07 21:33+0000\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-04-20 22:29+0200\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -32,12 +32,13 @@ msgstr "2009-02-27"
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
-#: maintscript-helper.1:1 start-stop-daemon.8:1 update-alternatives.8:8
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
+#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
msgstr "Debian-Projekt"
@@ -54,13 +55,13 @@ msgstr "Debian"
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
-#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 maintscript-helper.1:2 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "NAME"
@@ -75,7 +76,8 @@ msgstr "deb - Debian-Binrpaketformat"
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
-#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
@@ -93,9 +95,10 @@ msgstr "I<Dateiname>B<.deb>"
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
@@ -258,7 +261,7 @@ msgstr ""
#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -1222,7 +1225,7 @@ msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
#. type: SH
#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:582
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
#: update-alternatives.8:487
#, no-wrap
@@ -1242,12 +1245,12 @@ msgstr "Copyright \\(co 2007 Frank Lichtenheld"
#. type: Plain text
#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
-#: dpkg-buildpackage.1:329 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53
-#: maintscript-helper.1:117
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
#: update-alternatives.8:494
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
@@ -1577,11 +1580,6 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
-msgstr "[I<Markierung:>] I<Bibliothek> I<Version> I<Abhngigkeiten>"
-
-#. type: Plain text
-#: deb-shlibs.5:34
msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr "[I<Typ:>] I<Bibliothek> I<Version> I<Abhngigkeiten>"
@@ -1945,8 +1943,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
-#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
@@ -1965,14 +1963,14 @@ msgstr "Liste von Substitutionsvariablen und -werten."
#. type: SH
#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1991,7 +1989,7 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
@@ -2002,7 +2000,7 @@ msgstr "AUTOR"
#. type: Plain text
#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Copyright \\(co 1995-1996 Ian Jackson"
@@ -2010,7 +2008,7 @@ msgstr "Copyright \\(co 1995-1996 Ian Jackson"
#. type: Plain text
#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Copyright \\(co 2000 Wichert Akkerman"
@@ -2315,8 +2313,8 @@ msgid "2010-03-07"
msgstr "2010-03-07"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
@@ -3063,8 +3061,8 @@ msgstr ""
#. type: TP
#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3098,12 +3096,13 @@ msgstr "Gib Hilfe ber Debugging-Optionen."
#. type: TP
#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
-#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3211,11 +3210,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONEN"
@@ -4467,8 +4466,8 @@ msgstr ""
#. type: SH
#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
@@ -4594,26 +4593,24 @@ msgstr "Zeige eine Liste von gltigen Architekturnamen."
#. type: Plain text
#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
-#: dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
+#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr "Zeige den Bedienungshinweis und beende."
#. type: Plain text
#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
-#: dpkg-split.1:133
-#: dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
+#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
msgid "Show the version and exit."
msgstr "Gebe die Version aus und beende sich."
@@ -6380,7 +6377,7 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-h>, B<--help>"
@@ -6422,125 +6419,6 @@ msgid "Compiler flags"
msgstr "Compiler-Schalter"
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-"Einige Umgebungsvariablen fr Einstellungen der Optionen des Compilers und "
-"Linkers werden auf Standardwerte gesetzt, falls sie noch nicht in der "
-"Umgebung gesetzt wurden. Beachten Sie, dass dieser Mechanismus erst in dpkg-"
-"dev Version 1.14.17 eingefhrt wurde und noch nicht alle I<rules>-Dateien "
-"und Bauwerkzeuge diese Variablen bercksichtigen."
-
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-"Optimierungs-Optionen, die an das Debian-Bausystem weitergegeben und vom "
-"Paketbausystem bei Bedarf berschrieben werden knnen/sollten (Vorgabewert: "
-"B<-g -O2> oder B<-g\\ -O0> falls B<noopt> in DEB_BUILD_OPTIONS angegeben "
-"ist). Das berschreiben der Optionen kann dazu verwendet werden, explizit "
-"eine hhere Optimierungsstufe zu setzen oder um Compiler-Fehler zu umgehen, "
-"die nur bei einigen Optimierungsstufen auftreten (die letzte "
-"Optimierungsstufe gewinnt)."
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr "B<CFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Optimierungsoptionen, die an die Compiler-Schalter angehngt werden, die "
-"nicht vom Paket berschrieben werden drfen (hauptschlich zum Testen). "
-"Standardmig leer."
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr "Identisch zu B<CFLAGS> fr C++-Quellen."
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr "B<CXXFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr "Identisch zu B<CFLAGS_APPEND> fr C++-Quellen."
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr "Identisch zu B<CFLAGS> fr Fortran-Quellen."
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr "B<FFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr "Identisch zu B<CFLAGS_APPEND> fr Fortran-Quellen."
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-"Prprozessor-Schalter, die an das Debian-Bausystem weitergegeben und vom "
-"Paketbausystem bei Bedarf berschrieben werden knnen/sollten (Vorgabewert: "
-"leer). Dieses Makro wird selten benutzt (die meisten Bausysteme verwenden "
-"einfach B<CFLAGS> statt B<CPPFLAGS>)."
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr "B<CPPFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
-msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Prprozessor-Schalter, die an die Prprozessor-Schalter angehngt werden, "
-"die nicht vom Paket berschrieben werden drfen (hauptschlich zum Testen). "
-"Standardmig leer."
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr "B<LDFLAGS_APPEND>"
-
#: dpkg-buildpackage.1:244
msgid ""
"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
@@ -6552,17 +6430,6 @@ msgstr ""
"zurckliefert. Lesen Sie die Handbuchseite fr weitere Informationen."
#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-"Optimierungs-Optionen, die an den Compiler beim Linken von Code angehngt "
-"werden und die nicht vom Paket berschrieben werden drfen (hauptschlich "
-"zum Testen). Standardmig leer."
-
-#. type: Plain text
#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
@@ -6585,11 +6452,6 @@ msgstr ""
msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr "Copyright \\(co 2007-2010 Rapha\\[:e]l Hertzog"
-#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
-
#. type: TH
#: dpkg-checkbuilddeps.1:1
#, no-wrap
@@ -7695,13 +7557,13 @@ msgstr ""
"zu verwenden."
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr "B<-V>I<Name>B<=>I<Wert>"
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -7711,7 +7573,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<-T>I<substvardatei>"
@@ -7732,29 +7594,29 @@ msgstr ""
"Substitutionsvariablen aus mehreren Dateien einzulesen."
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<Feld>B<=>I<Wert>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr "berschreibe oder ergnze ein Ausgabe-Steuerdatei-Feld."
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, no-wrap
msgid "B<-U>I<field>"
msgstr "B<-U>I<field>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr "Entferne ein Ausgabe-Steuerdatei-Feld."
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "B<-c>I<Steuerdatei>"
@@ -7770,7 +7632,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr "B<-l>I<Changelog-Datei>"
@@ -7795,14 +7657,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr "B<-F>I<Changelog-Format>"
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -9931,11 +9793,6 @@ msgstr ""
"wenn diese verwandt wird."
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
-msgstr "fge alle nderungen hinzu."
-
-#. type: Plain text
#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
@@ -11722,21 +11579,6 @@ msgstr ""
"Quellpaketformat knnten zustzliche Parameter akzeptiert werden."
#. type: Plain text
-#: dpkg-source.1:65
-msgid ""
-"B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
-msgstr ""
-"B<dpkg-source> wird das Quellpaket mit dem ersten gefundenen Format aus der "
-"folgenden geordneten Liste bauen: dem mit der Kommandozeilenoption(en) I<--"
-"format> angegeben Format, dem in B<debian/source/format> angegebenen Format, "
-"1.0. Die verschiedenen Quellpaketformate werden im Abschnitt B<QUELLPAKET-"
-"FORMATE> ausfhrlich beschrieben."
-
-#. type: Plain text
#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
@@ -11756,14 +11598,14 @@ msgstr ""
"werden im Abschnitt B<QUELLPAKET-FORMATE> ausfhrlich beschrieben."
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--print-format> I<Verzeichnis>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -11774,13 +11616,13 @@ msgstr ""
"Bedingungen und mit den gleichen Parametern)."
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr "GENERISCHE BAUOPTIONEN"
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -11792,7 +11634,7 @@ msgstr ""
"interpretiert."
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -11804,13 +11646,13 @@ msgstr ""
"interpretiert."
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--format=>I<Wert>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
@@ -11819,7 +11661,7 @@ msgstr ""
"jedes in B<debian/source/format> angegebene Format."
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -11830,13 +11672,13 @@ msgstr ""
"Substitutionsvariablen aus mehreren Dateien einzulesen."
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr "B<-Z>I<Komprimierung>, B<--compression>=I<Komprimierung>"
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -11851,13 +11693,13 @@ msgstr ""
"I<gzip> ist voreingestellt. I<xz> wird erst seit Dpkg-dev 1.15.5 untersttzt."
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr "B<-z>I<Stufe>, B<--compression-level>=I<Stufe>"
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -11868,13 +11710,13 @@ msgstr ""
"besten) und I<fast> (schnell). I<9> ist voreingestellt."
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -11899,7 +11741,7 @@ msgstr ""
"wird nur die letzte bercksichtigt."
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -11923,13 +11765,13 @@ msgstr ""
"die notwendigen Anker (z.B. (^|/), ($|/)) selbst bereitstellen."
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr "B<--extend-diff-ignore>=I<regexp>"
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -11945,13 +11787,13 @@ msgstr ""
"auszuschlieen."
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr "B<-I>[I<Dateimuster>], B<--tar-ignore>[=I<Dateimuster>]"
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -11967,7 +11809,7 @@ msgstr ""
"ausgeschlossen werden sollen."
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -11978,7 +11820,7 @@ msgstr ""
"Backups, Swap-Dateien und Bau-Ausgabeverzeichnisse von Libtool herausfiltern."
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -12000,7 +11842,7 @@ msgstr ""
"html#wildcards fr eine komplette Dokumentation."
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
@@ -12009,42 +11851,42 @@ msgstr ""
"in der Ausgabe des Befehls B<--help> gesehen werden."
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "GENERISCHE EXTRAHIERUNGSOPTIONEN"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, no-wrap
msgid "B<--no-copy>"
msgstr "B<--no-copy>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
"Kopiere die Original-Tarblle in die Nhe des extrahierten Quellpakets."
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, no-wrap
msgid "B<--no-check>"
msgstr "B<--no-check>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr "Prfe Signaturen und Prfsummen vor dem Entpacken nicht."
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr "B<--require-valid-signature>"
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -12059,28 +11901,13 @@ msgstr ""
"share/keyrings/debian-maintainers.gpg>) berprft werden kann."
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "QUELLPAKET-FORMATE"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:212
-msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
-"DebSrc3.0 for information on the deployment of those formats within Debian."
-msgstr ""
-"Falls Sie nicht wissen, welches Quellformat Sie verwenden sollen, verwenden "
-"Sie wahrscheinlich am besten entweder 3.0 (quilt) oder 3.0 (native). Sie "
-"werden in der nahen Zukunft die Standardformate werden. Lesen Sie http://"
-"wiki.debian.org/Projects/DebSrc3.0 fr Informationen ber den Einsatz dieser "
-"Formate innerhalb von Debian."
-
-# type: Plain text
-#. type: Plain text
#: dpkg-source.1:213
msgid ""
"If you don't know what source format to use, you should probably pick either "
@@ -12093,13 +11920,13 @@ msgstr ""
"Einsatz dieser Formate innerhalb von Debian."
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr "Format: 1.0"
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -12110,12 +11937,12 @@ msgstr ""
"wird das Paket als I<nativ> bezeichnet)."
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr "B<Extrahieren>"
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -12137,12 +11964,12 @@ msgstr ""
"aber keine Dateien entfernen (leere Dateien bleiben zurck)."
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr "B<Bauen>"
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -12156,13 +11983,13 @@ msgstr ""
"I<Verzeichnisses> mit dem Verzeichnis .orig ein."
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr "B<Bau-Optionen (mit -b):>"
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -12181,7 +12008,7 @@ msgstr ""
"sX>-Argumenten."
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -12193,13 +12020,13 @@ msgstr ""
"werden."
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, no-wrap
msgid "B<-sk>"
msgstr "B<-sk>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -12214,24 +12041,24 @@ msgstr ""
"wird nach I<Verzeichnis>B<.orig> fr die Erstellung des Diffs entpackt."
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, no-wrap
msgid "B<-sp>"
msgstr "B<-sp>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr "Wie B<-sk>, aber das Verzeichnis wird danach entfernt."
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, no-wrap
msgid "B<-su>"
msgstr "B<-su>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -12242,24 +12069,24 @@ msgstr ""
"daraus ein neues Original-Quellarchiv erstellen."
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, no-wrap
msgid "B<-sr>"
msgstr "B<-sr>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr "Wie B<-su>, aber das Verzeichnis wird nach der Verwendung entfernt."
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, no-wrap
msgid "B<-ss>"
msgstr "B<-ss>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -12273,13 +12100,13 @@ msgstr ""
"zusammen passen, wird ein fehlerhaftes Quellarchiv erstellt."
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, no-wrap
msgid "B<-sn>"
msgstr "B<-sn>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -12292,13 +12119,13 @@ msgstr ""
"keine Quellen von Originalautoren und somit kein Debianisierungs-Diff haben."
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<-sa> oder B<-sA>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -12328,18 +12155,18 @@ msgstr ""
"die Voreinstellung."
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr "B<Extrahierungs-Optionen (mit -x):>"
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr "In allen Fllen werden die Originalquellbume entfernt."
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -12352,12 +12179,12 @@ msgstr ""
"vorhanden ist, wird sie dort hin kopiert. (B<Dies ist die Voreinstellung.>)"
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr "Entpackt den Originalquellbaum."
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -12368,7 +12195,7 @@ msgstr ""
"Verzeichnis war, wird dennoch entfernt."
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
@@ -12377,26 +12204,26 @@ msgstr ""
"eine angeben, wird nur die letzte verwendet."
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<--skip-debianization>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
"berspringt die Anwendung des Debian-Diffs auf die Quellen der "
"Originalautoren."
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr "Format: 2.0"
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -12407,7 +12234,7 @@ msgstr ""
"erste Spezifikation eines Paketformats der nchsten Generation."
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -12421,7 +12248,7 @@ msgstr ""
"Extrahierung angewandt."
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
@@ -12431,13 +12258,13 @@ msgstr ""
"gespeichert."
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr "Format: 3.0 (native)"
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -12451,13 +12278,13 @@ msgstr ""
"Ausgabe von B<--help>)."
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr "Format: 3.0 (quilt)"
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -12473,7 +12300,7 @@ msgstr ""
"Gedankenstriche (-) enthalten."
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -12494,7 +12321,7 @@ msgstr ""
"B<--include-binaries>)."
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -12521,13 +12348,13 @@ msgstr ""
"solche Optionen trifft, und der Bau wird wahrscheinlich fehlschlagen."
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr "hnlich wie bei Quilt knnen Patches auch Dateien entfernen."
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -12536,7 +12363,7 @@ msgstr ""
"der Extrahierung angewandt wurden."
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -12559,7 +12386,7 @@ msgstr ""
"hinzugefgt bzw. aus diesen gelscht."
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -12577,7 +12404,7 @@ msgstr ""
"freigegeben wurden."
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
@@ -12586,7 +12413,7 @@ msgstr ""
"wird dann zur Erstellung des Debian-Tarballs verwandt."
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -12600,7 +12427,7 @@ msgstr ""
"automatischen Patches ignoriert."
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -12626,19 +12453,19 @@ msgstr ""
"preparation> kann zum Abschalten dieses Verhaltens verwandt werden."
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
msgid "B<Build options>"
msgstr "B<Bau-Optionen>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<--allow-version-of-quilt-db=>I<Version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -12653,13 +12480,13 @@ msgstr ""
"ist. Die Version der Quilt-Metadaten wird in B<.pc/.version> gespeichert."
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, no-wrap
msgid "B<--include-removal>"
msgstr "B<--include-removal>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
@@ -12668,24 +12495,24 @@ msgstr ""
"generierten Patch hinzu."
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr "B<--include-timestamp>"
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr "Fge Zeitstempel zu dem automatisch generierten Patch hinzu."
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, no-wrap
msgid "B<--include-binaries>"
msgstr "B<--include-binaries>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -12697,13 +12524,13 @@ msgstr ""
"bentigt."
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--no-preparation>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
@@ -12712,14 +12539,14 @@ msgstr ""
"Patches vorzubreiten."
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<--single-debian-patch>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -12740,13 +12567,13 @@ msgstr ""
"begutachtet werden knnen, beispielsweise im eingesetzten VCS."
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr "B<--create-empty-orig>"
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -12759,36 +12586,36 @@ msgstr ""
"Originalautoren ist und es keine Haupt-Software gibt."
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr "B<Extrahierungs-Optionen>"
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
"berspringt das Entpacken des Debian-Tarballs auf die Quellen der "
"Originalautoren."
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--skip-patches>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr "Wende am Ende der Extrahierung keine Patches an."
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr "Format: 3.0 (custom)"
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
@@ -12797,7 +12624,7 @@ msgstr ""
"zur Erstellung eines Quellpakets mit beliebigen Dateien verwandt werden."
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -12809,13 +12636,13 @@ msgstr ""
"muss angegeben werden."
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--target-format=>I<Wert>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -12826,13 +12653,13 @@ msgstr ""
"I<Format>-Feld enthalten."
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr "Format: 3.0 (git) und 3.0 (bzr)"
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
@@ -12841,7 +12668,7 @@ msgstr ""
"das korrespondierende VCS-Depot enthlt."
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
@@ -12850,7 +12677,7 @@ msgstr ""
"Zweig auszuchecken."
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
@@ -12860,7 +12687,7 @@ msgstr ""
"(uncommitted) nderungen vorliegen."
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -13010,19 +12837,19 @@ msgstr ""
"an diese Tatsache."
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr "DATEIFORMATE"
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr "debian/source/format"
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -13033,13 +12860,13 @@ msgstr ""
"Leerzeichen am Zeilenanfang oder -ende sind nicht erlaubt."
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, no-wrap
msgid "debian/source/include-binaries"
msgstr "debian/source/include-binaries"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -13052,14 +12879,14 @@ msgstr ""
"werden bersprungen. Leere Zeilen werden ignoriert."
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, no-wrap
msgid "debian/source/options"
msgstr "debian/source/options"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -13073,7 +12900,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -13088,7 +12915,7 @@ msgstr ""
"ist ein Beispiel fr so eine Datei:"
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -13106,7 +12933,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
@@ -13135,14 +12962,14 @@ msgstr ""
"bestimmtes VCS, in dem das Paket gewartet wird, gebunden sind."
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:602
#, no-wrap
msgid "debian/source/patch-header"
msgstr "debian/source/patch-header"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
@@ -13151,13 +12978,13 @@ msgstr ""
"generierten automatischen Patches gestellt wird."
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr "debian/patches/series"
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -13179,15 +13006,10 @@ msgstr ""
"bis zum Zeilenende geht) knnen optionale Quilt-Befehle folgen."
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
-
#. type: TH
#: dpkg-split.1:2
#, no-wrap
@@ -17314,6 +17136,138 @@ msgstr ""
"B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
"Standard)."
+#~ msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+#~ msgstr "[I<Markierung:>] I<Bibliothek> I<Version> I<Abhngigkeiten>"
+
+#~ msgid ""
+#~ "Some environment variables defining compiler and linker options are set "
+#~ "to default values unless already present in the environment. Note that "
+#~ "this mechanism was only introduced in version 1.14.17 of dpkg-dev and not "
+#~ "all I<rules> files and build tools will honour these variables, yet."
+#~ msgstr ""
+#~ "Einige Umgebungsvariablen fr Einstellungen der Optionen des Compilers "
+#~ "und Linkers werden auf Standardwerte gesetzt, falls sie noch nicht in der "
+#~ "Umgebung gesetzt wurden. Beachten Sie, dass dieser Mechanismus erst in "
+#~ "dpkg-dev Version 1.14.17 eingefhrt wurde und noch nicht alle I<rules>-"
+#~ "Dateien und Bauwerkzeuge diese Variablen bercksichtigen."
+
+#~ msgid ""
+#~ "Optimization options which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default value: B<-g -"
+#~ "O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
+#~ "Overriding options can be used to explicitly set a higher optimization "
+#~ "level, or work around compiler bugs, which only can be seen with some "
+#~ "optimization levels (the last opt level \"wins\")."
+#~ msgstr ""
+#~ "Optimierungs-Optionen, die an das Debian-Bausystem weitergegeben und vom "
+#~ "Paketbausystem bei Bedarf berschrieben werden knnen/sollten "
+#~ "(Vorgabewert: B<-g -O2> oder B<-g\\ -O0> falls B<noopt> in "
+#~ "DEB_BUILD_OPTIONS angegeben ist). Das berschreiben der Optionen kann "
+#~ "dazu verwendet werden, explizit eine hhere Optimierungsstufe zu setzen "
+#~ "oder um Compiler-Fehler zu umgehen, die nur bei einigen "
+#~ "Optimierungsstufen auftreten (die letzte Optimierungsstufe gewinnt)."
+
+#~ msgid "B<CFLAGS_APPEND>"
+#~ msgstr "B<CFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Optimierungsoptionen, die an die Compiler-Schalter angehngt werden, die "
+#~ "nicht vom Paket berschrieben werden drfen (hauptschlich zum Testen). "
+#~ "Standardmig leer."
+
+#~ msgid "Same as B<CFLAGS> for C++ sources."
+#~ msgstr "Identisch zu B<CFLAGS> fr C++-Quellen."
+
+#~ msgid "B<CXXFLAGS_APPEND>"
+#~ msgstr "B<CXXFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for C++ sources."
+#~ msgstr "Identisch zu B<CFLAGS_APPEND> fr C++-Quellen."
+
+#~ msgid "Same as B<CFLAGS> for Fortran sources."
+#~ msgstr "Identisch zu B<CFLAGS> fr Fortran-Quellen."
+
+#~ msgid "B<FFLAGS_APPEND>"
+#~ msgstr "B<FFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
+#~ msgstr "Identisch zu B<CFLAGS_APPEND> fr Fortran-Quellen."
+
+#~ msgid ""
+#~ "Preprocessor flags which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default: empty). "
+#~ "This macro is seldom used (most build systems just use B<CFLAGS> instead "
+#~ "of B<CPPFLAGS>)."
+#~ msgstr ""
+#~ "Prprozessor-Schalter, die an das Debian-Bausystem weitergegeben und vom "
+#~ "Paketbausystem bei Bedarf berschrieben werden knnen/sollten "
+#~ "(Vorgabewert: leer). Dieses Makro wird selten benutzt (die meisten "
+#~ "Bausysteme verwenden einfach B<CFLAGS> statt B<CPPFLAGS>)."
+
+#~ msgid "B<CPPFLAGS_APPEND>"
+#~ msgstr "B<CPPFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Preprocessor flags appended to the preprocessor flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Prprozessor-Schalter, die an die Prprozessor-Schalter angehngt werden, "
+#~ "die nicht vom Paket berschrieben werden drfen (hauptschlich zum "
+#~ "Testen). Standardmig leer."
+
+#~ msgid "B<LDFLAGS_APPEND>"
+#~ msgstr "B<LDFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags when linking code, "
+#~ "which must not be overwritten by the package (mostly used to for test "
+#~ "builds). Default value: empty."
+#~ msgstr ""
+#~ "Optimierungs-Optionen, die an den Compiler beim Linken von Code angehngt "
+#~ "werden und die nicht vom Paket berschrieben werden drfen (hauptschlich "
+#~ "zum Testen). Standardmig leer."
+
+#~ msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#~ msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+
+#~ msgid "include all changes."
+#~ msgstr "fge alle nderungen hinzu."
+
+#~ msgid ""
+#~ "B<dpkg-source> will build the source package with the first format found "
+#~ "in this ordered list: the format indicated with the I<--format> command-"
+#~ "line option, the format indicated in B<debian/source/format>, \"1.0\". "
+#~ "See section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
+#~ "various source package formats."
+#~ msgstr ""
+#~ "B<dpkg-source> wird das Quellpaket mit dem ersten gefundenen Format aus "
+#~ "der folgenden geordneten Liste bauen: dem mit der Kommandozeilenoption"
+#~ "(en) I<--format> angegeben Format, dem in B<debian/source/format> "
+#~ "angegebenen Format, 1.0. Die verschiedenen Quellpaketformate werden im "
+#~ "Abschnitt B<QUELLPAKET-FORMATE> ausfhrlich beschrieben."
+
+# type: Plain text
+#~ msgid ""
+#~ "If you don't know what source format you should use, you should probably "
+#~ "pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
+#~ "default formats in the near future. See http://wiki.debian.org/Projects/"
+#~ "DebSrc3.0 for information on the deployment of those formats within "
+#~ "Debian."
+#~ msgstr ""
+#~ "Falls Sie nicht wissen, welches Quellformat Sie verwenden sollen, "
+#~ "verwenden Sie wahrscheinlich am besten entweder 3.0 (quilt) oder 3.0 "
+#~ "(native). Sie werden in der nahen Zukunft die Standardformate werden. "
+#~ "Lesen Sie http://wiki.debian.org/Projects/DebSrc3.0 fr Informationen "
+#~ "ber den Einsatz dieser Formate innerhalb von Debian."
+
+#~ msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+#~ msgstr "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
+
#~ msgid "2010-02-20"
#~ msgstr "2010-02-20"
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index a27db36fa..6f9eebb64 100644
--- a/man/po/dpkg-man.pot
+++ b/man/po/dpkg-man.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-12 00:13+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\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"
@@ -28,7 +28,7 @@ msgid "2009-02-27"
msgstr ""
#. type: TH
-#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1 deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6 dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 start-stop-daemon.8:1 update-alternatives.8:8
+#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1 deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1 start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
msgstr ""
@@ -40,7 +40,7 @@ msgid "Debian"
msgstr ""
#. type: SH
-#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2 deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3 deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7 dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2 deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3 deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2 maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr ""
@@ -51,7 +51,7 @@ msgid "deb - Debian binary package format"
msgstr ""
#. type: SH
-#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5 deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6 deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19 dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6 dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5 start-stop-daemon.8:5 update-alternatives.8:12
+#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5 deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6 deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19 dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6 dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5 maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
@@ -62,7 +62,7 @@ msgid "I<filename>B<.deb>"
msgstr ""
#. type: SH
-#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10 update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -167,7 +167,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51 deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61 deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709 dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312 dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95 dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72 dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223 dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23 update-alternatives.8:501
+#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51 deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61 deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717 dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250 dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95 dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72 dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223 dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23 update-alternatives.8:501
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr ""
@@ -893,7 +893,7 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr ""
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47 dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455 dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582 dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47 dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455 dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622 dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294 update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr ""
@@ -904,12 +904,12 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr ""
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr ""
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130 dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233 dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116 dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233 dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117 update-alternatives.8:494
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
"for copying conditions. There is NO WARRANTY."
@@ -1168,14 +1168,14 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr ""
#. type: Plain text
#: deb-shlibs.5:38
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
@@ -1185,7 +1185,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr ""
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257 dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257 dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
msgstr ""
@@ -1463,7 +1463,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12 dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12 dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115 dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr ""
@@ -1480,13 +1480,13 @@ msgid "List of substitution variables and values."
msgstr ""
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225 dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436 update-alternatives.8:479
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225 dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436 update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1500,18 +1500,18 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103 dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229 dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19 dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103 dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229 dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49 dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144 dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584 dpkg-split.1:231
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49 dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144 dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624 dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr ""
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51 dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126 dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51 dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127 dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr ""
@@ -1762,7 +1762,7 @@ msgid "2010-03-07"
msgstr ""
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr ""
@@ -2368,7 +2368,7 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67 dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71 dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
msgstr ""
@@ -2401,7 +2401,7 @@ msgid "Give help about debugging options."
msgstr ""
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr ""
@@ -2476,7 +2476,7 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170 dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37 dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170 dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37 dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29 dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -3125,7 +3125,7 @@ msgid "I<postrm>"
msgstr ""
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
@@ -3246,82 +3246,108 @@ msgstr ""
#. type: TP
#: dpkg.1:646
#, no-wrap
-msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
+msgid "B<DPKG_LIBDIR>"
msgstr ""
#. type: Plain text
#: dpkg.1:650
msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+
+#. type: TP
+#: dpkg.1:650
+#, no-wrap
+msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:654
+msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
msgstr ""
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr ""
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
msgstr ""
+#. type: TP
+#: dpkg.1:658
+#, no-wrap
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr ""
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:662
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:665
msgid "To list packages related to the editor B<vi>(1):"
msgstr ""
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr ""
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr ""
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr ""
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
msgstr ""
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -3329,23 +3355,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr ""
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid "You might transfer this file to another computer, and install it there with:"
msgstr ""
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -3353,7 +3379,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
msgid ""
"Note that this will not actually install or remove anything, but just set "
"the selection state on the requested packages. You will need some other "
@@ -3362,39 +3388,39 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
msgstr ""
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr ""
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
msgid ""
"Additional functionality can be gained by installing any of the following "
"packages: B<apt>, B<aptitude> and B<debsums>."
msgstr ""
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
msgstr ""
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr ""
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
"contributed to B<dpkg>."
@@ -3449,7 +3475,7 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -3557,12 +3583,12 @@ msgid "Print a list of valid architecture names."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60 dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 update-alternatives.8:320
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60 dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63 dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103 dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78 dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34 update-alternatives.8:323
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63 dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103 dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79 dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34 update-alternatives.8:323
msgid "Show the version and exit."
msgstr ""
@@ -4218,6 +4244,313 @@ msgid "B<dpkg>(1)."
msgstr ""
#. type: TH
+#: dpkg-buildflags.1:1
+#, no-wrap
+msgid "dpkg-buildflags"
+msgstr ""
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, no-wrap
+msgid "2010-04-11"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be "
+"extended/overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, no-wrap
+msgid "2."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, no-wrap
+msgid "B<--list>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, no-wrap
+msgid "B<--get>I< flag>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, no-wrap
+msgid "B<--origin>I< flag>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, no-wrap
+msgid "B<vendor>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, no-wrap
+msgid "B<system>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, no-wrap
+msgid "B<user>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, no-wrap
+msgid "B<env>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, no-wrap
+msgid "B<CFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes "
+"I<-g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, no-wrap
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+msgid "System wide configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+msgid "User configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid "This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, no-wrap
msgid "dpkg-buildpackage"
@@ -4743,19 +5076,27 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-buildpackage.1:224 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32 dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121 dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33 dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217 dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-buildpackage.1:224 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32 dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121 dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33 dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217 dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, no-wrap
msgid "B<-h>, B<--help>"
msgstr ""
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -4763,169 +5104,36 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, no-wrap
-msgid "B<CFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and "
-"can/should be overridden by the package build if needed (default value: B<-g "
-"-O2>, or B<-g\\ -O0> if B<noopt> is specified in "
-"DEB_BUILD_OPTIONS). Overriding options can be used to explicitly set a "
-"higher optimization level, or work around compiler bugs, which only can be "
-"seen with some optimization levels (the last opt level \"wins\")."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and "
-"can/should be overridden by the package build if needed (default: "
-"empty). This macro is seldom used (most build systems just use B<CFLAGS> "
-"instead of B<CPPFLAGS>)."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
+#: dpkg-buildpackage.1:244
msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test "
-"builds). Default value: empty."
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
"B<fakeroot>(1), B<gpg>(1)."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr ""
#. type: TH
@@ -5824,20 +6032,20 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171 dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr ""
@@ -5853,29 +6061,29 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, no-wrap
msgid "B<-U>I<field>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, no-wrap
msgid "B<-c>I<controlfile>"
msgstr ""
@@ -5888,7 +6096,7 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16 dpkg-source.1:87
+#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16 dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr ""
@@ -5908,13 +6116,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21 dpkg-source.1:94
+#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21 dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26 dpkg-source.1:99
+#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26 dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -7006,6 +7214,128 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr ""
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr ""
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, no-wrap
+msgid "2010-04-18"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+msgid "B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and "
+"1.0-1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, "
+"2.3-1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, no-wrap
+msgid "LIMITATIONS"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in "
+"B<.git/info/attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -7414,12 +7744,12 @@ msgid "B<--all>"
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
+#: dpkg-parsechangelog.1:108
+msgid "include all changes. Note: other options have no effect when this is in use."
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -7427,13 +7757,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -7442,7 +7772,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr ""
@@ -8770,23 +9100,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in "
+"B<debian/source/format>. See section B<SOURCE PACKAGE FORMATS> for an "
+"extensive description of the various source package formats."
msgstr ""
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, no-wrap
msgid "B<--print-format> I<directory>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -8794,13 +9126,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -8808,7 +9140,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -8816,20 +9148,20 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, no-wrap
msgid "B<--format=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -8837,13 +9169,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -8853,13 +9185,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created "
"files. Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is "
@@ -8867,13 +9199,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -8887,7 +9219,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -8901,13 +9233,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -8917,13 +9249,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s "
"--exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -8933,7 +9265,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -8941,7 +9273,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -8955,48 +9287,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
msgstr ""
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr ""
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, no-wrap
msgid "B<--no-copy>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, no-wrap
msgid "B<--no-check>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -9006,29 +9338,28 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See "
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See "
"http://wiki.debian.org/Projects/DebSrc3.0 for information on the deployment "
"of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -9036,12 +9367,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -9054,12 +9385,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -9068,13 +9399,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -9085,7 +9416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, "
@@ -9093,13 +9424,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, no-wrap
msgid "B<-sk>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -9109,24 +9440,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, no-wrap
msgid "B<-sp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr ""
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, no-wrap
msgid "B<-su>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -9134,24 +9465,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, no-wrap
msgid "B<-sr>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr ""
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, no-wrap
msgid "B<-ss>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -9160,13 +9491,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, no-wrap
msgid "B<-sn>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -9175,13 +9506,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -9197,18 +9528,18 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -9217,12 +9548,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -9230,31 +9561,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
msgstr ""
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, no-wrap
msgid "B<--skip-debianization>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -9262,7 +9593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -9271,20 +9602,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
msgstr ""
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -9293,13 +9624,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball "
"(B<.orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) "
@@ -9309,7 +9640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -9321,7 +9652,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or "
"B<debian/patches/series> are then applied. If the former file is used and "
@@ -9336,19 +9667,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid "Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -9362,7 +9693,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -9373,14 +9704,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -9389,7 +9720,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -9404,18 +9735,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
msgid "B<Build options>"
msgstr ""
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about "
@@ -9425,37 +9756,37 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, no-wrap
msgid "B<--include-removal>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, no-wrap
msgid "B<--include-binaries>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to "
"B<debian/source/include-binaries>: they will be added by default in "
@@ -9463,26 +9794,26 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, no-wrap
msgid "B<--no-preparation>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
msgstr ""
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, no-wrap
msgid "B<--single-debian-patch>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of "
"B<debian/patches/debian-changes->I<version> for the name of the automatic "
@@ -9495,13 +9826,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -9510,41 +9841,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, no-wrap
msgid "B<--skip-patches>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr ""
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -9552,13 +9883,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, no-wrap
msgid "B<--target-format=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -9566,34 +9897,34 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -9601,19 +9932,115 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the "
+".diff.gz file. Instead you should store your changes as patches in the "
+"debian directory and apply them at build-time. To avoid this complexity you "
+"can also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr ""
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -9621,13 +10048,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, no-wrap
msgid "debian/source/include-binaries"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -9636,13 +10063,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, no-wrap
msgid "debian/source/options"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -9651,7 +10078,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -9661,7 +10088,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -9672,33 +10099,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, no-wrap
+msgid "debian/source/local-options"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, no-wrap
msgid "debian/source/patch-header"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -9711,15 +10153,10 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr ""
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr ""
-
#. type: TH
#: dpkg-split.1:2
#, no-wrap
@@ -11378,6 +11815,221 @@ msgid "B<dselect>(1)."
msgstr ""
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "2010-04-16"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- "
+"I<maint-script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid "B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- "
+"\"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:112
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:114
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr ""
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
diff --git a/man/po/es.po b/man/po/es.po
index 73976ca16..6e926ca73 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:17+0100\n"
"Last-Translator: Rubn Porras <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -29,12 +29,13 @@ msgstr ""
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, fuzzy, no-wrap
msgid "Debian Project"
@@ -57,13 +58,14 @@ msgstr ""
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, fuzzy, no-wrap
msgid "NAME"
msgstr "NOMBRE"
@@ -77,13 +79,14 @@ msgstr "deb - Formato de paquetes binarios de Debian"
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, fuzzy, no-wrap
msgid "SYNOPSIS"
msgstr "SINOPSIS"
@@ -102,13 +105,15 @@ msgstr ""
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, fuzzy, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIPCIN"
@@ -257,11 +262,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, fuzzy, no-wrap
@@ -1158,7 +1163,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr ""
@@ -1178,10 +1183,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(8)"
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, fuzzy, no-wrap
msgid "AUTHORS"
msgstr "AUTORES"
@@ -1193,18 +1199,20 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr "Copyright (C) 1995-1996 Ian Jackson"
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
#, fuzzy
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Copyright (C) 2000 Wichert Akkerman"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
#, fuzzy
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
@@ -1555,14 +1563,14 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr ""
#. type: Plain text
#: deb-shlibs.5:38
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
@@ -1572,7 +1580,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr ""
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, fuzzy, no-wrap
msgid "EXAMPLES"
@@ -1914,9 +1922,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, fuzzy, no-wrap
msgid "FILES"
msgstr ""
@@ -1938,8 +1947,8 @@ msgid "List of substitution variables and values."
msgstr "Lista de variables de sustitucin y sus valores."
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, fuzzy, no-wrap
msgid "BUGS"
@@ -1956,7 +1965,7 @@ msgstr ""
"ERRORES"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
#, fuzzy
msgid ""
"The point at which field overriding occurs compared to certain standard "
@@ -1975,7 +1984,8 @@ msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, fuzzy, no-wrap
@@ -1983,18 +1993,18 @@ msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
#, fuzzy
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Copyright (C) 1995-1996 Ian Jackson"
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
#, fuzzy
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Copyright (C) 2000 Wichert Akkerman"
@@ -2254,8 +2264,9 @@ msgid "2010-03-07"
msgstr "08-07-1996"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, fuzzy, no-wrap
msgid "dpkg suite"
msgstr "herramientas dpkg"
@@ -3005,9 +3016,9 @@ msgstr ""
"subsiguientes llamadas efectuadas en la misma ejecucin."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, fuzzy, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3043,13 +3054,14 @@ msgid "Give help about debugging options."
msgstr "Muestra la ayuda de las opciones de depuracin."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, fuzzy, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3157,11 +3169,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, fuzzy, no-wrap
msgid "OPTIONS"
msgstr "OPCIONES"
@@ -3972,8 +3984,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, fuzzy, no-wrap
msgid "ENVIRONMENT"
msgstr "VARIABLES DE ENTORNO"
@@ -4099,82 +4111,109 @@ msgstr ""
#. type: TP
#: dpkg.1:646
+#, no-wrap
+msgid "B<DPKG_LIBDIR>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:650
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+
+#. type: TP
+#: dpkg.1:650
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
msgstr ""
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
msgstr ""
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_NO_TSTP>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_NO_TSTP>"
+
+#. type: Plain text
+#: dpkg.1:662
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:665
#, fuzzy
msgid "To list packages related to the editor B<vi>(1):"
msgstr "Para listar los paquetes con vi en su nombre:"
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, fuzzy, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr "B< dpkg -l '*vi*'>"
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
#, fuzzy
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr ""
"Para ver las entradas en I</var/lib/dpkg/available> de varios paquetes:"
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, fuzzy, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr "B< dpkg --print-avail elvis vim | less>"
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr ""
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, fuzzy, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr "B< less /var/lib/dpkg/available>"
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
#, fuzzy
msgid "To remove an installed elvis package:"
msgstr "Para borrar un paquete instalado llamado elvis:"
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, fuzzy, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr "B< dpkg -r elvis>"
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
#, fuzzy
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
@@ -4185,7 +4224,7 @@ msgstr ""
"est en el apartado editors:"
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, fuzzy, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -4193,26 +4232,26 @@ msgid ""
msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
#, fuzzy
msgid "To make a local copy of the package selection states:"
msgstr "Para hacer una copia local de los estados de la seleccin de paquetes:"
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, fuzzy, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr "B< dpkg --get-selections E<gt>mis_selecciones>"
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
#, fuzzy
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr "Se podra copiar este fichero a otra mquina e instalarlo all con:"
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, fuzzy, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -4220,7 +4259,7 @@ msgid ""
msgstr "B< dpkg --set-selections E<lt>mis_selecciones>"
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
#, fuzzy
msgid ""
"Note that this will not actually install or remove anything, but just set "
@@ -4234,7 +4273,7 @@ msgstr ""
"B<dselect> y elija Instalar."
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
#, fuzzy
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
@@ -4244,13 +4283,13 @@ msgstr ""
"modificar los estados de seleccin de los paquetes."
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, fuzzy, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr "FUNCIONALIDAD ADICIONAL"
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
#, fuzzy
msgid ""
"Additional functionality can be gained by installing any of the following "
@@ -4260,7 +4299,7 @@ msgstr ""
"paquetes: I<apt>, I<aptitude> and I<debsums>."
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
#, fuzzy
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -4270,14 +4309,14 @@ msgstr ""
"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
#, fuzzy
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr ""
"Normalmente, la opcin B<--no-act> da menos informacin de la que necesita."
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
#, fuzzy
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
@@ -4338,9 +4377,10 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -4448,11 +4488,12 @@ msgid "Print a list of valid architecture names."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
#, fuzzy
@@ -4460,11 +4501,12 @@ msgid "Show the usage message and exit."
msgstr "Muestra el modo de uso y termina."
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
#, fuzzy
@@ -5121,6 +5163,321 @@ msgid "B<dpkg>(1)."
msgstr "B<dpkg>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildflags"
+msgstr "dpkg-scanpackages"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-11"
+msgstr "08-07-1996"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<accin>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+#, fuzzy
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+"B<dpkg-buildpackage> es un script de control que puede ser usado para "
+"automatizar la construccin de un paquete."
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, fuzzy, no-wrap
+#| msgid "2"
+msgid "2."
+msgstr "2"
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+msgid "B<--list>"
+msgstr "B<list>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+msgid "B<--get>I< flag>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+msgid "B<--origin>I< flag>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+msgid "B<vendor>"
+msgstr "B<--admindir> I<directorio>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+msgid "B<system>"
+msgstr "I<-B>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+msgid "B<user>"
+msgstr "B<query>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+msgid "B<env>"
+msgstr "B<-G>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, fuzzy, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<COLUMNS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+msgid "System wide configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+msgid "User configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+#, fuzzy
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, fuzzy, no-wrap
msgid "dpkg-buildpackage"
@@ -5705,19 +6062,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, fuzzy, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-us>, B<-uc>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, fuzzy, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "B<dpkg --print-architecture>"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -5725,155 +6090,21 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, fuzzy, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<COLUMNS>"
-
-# type: Plain text
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
+#: dpkg-buildpackage.1:244
msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
#, fuzzy
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
@@ -5884,7 +6115,7 @@ msgstr ""
"root> y I<orden-para-firmar>."
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
#, fuzzy
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
@@ -5892,9 +6123,9 @@ msgid ""
msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
#, fuzzy
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr "Copyright 2001 Joey Hess"
#. type: TH
@@ -7021,13 +7252,13 @@ msgstr ""
"rbol de fuentes. Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, fuzzy, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr "B<-V>I<nombre>B<=>I<valor>"
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
#, fuzzy
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
@@ -7039,7 +7270,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, fuzzy, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<-T>I<fichvarsust>"
@@ -7055,29 +7286,29 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, fuzzy, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<campo>B<=>I<valor>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, fuzzy, no-wrap
msgid "B<-U>I<field>"
msgstr "B<-U>I<campo>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, fuzzy, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "B<-c>I<ficherocontrol>"
@@ -7095,7 +7326,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, fuzzy, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr "B<-l>I<ficherocambios>"
@@ -7124,14 +7355,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, fuzzy, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr "B<-F>I<formatocambios>"
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, fuzzy
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
@@ -8306,6 +8537,132 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Copyright 2001 Joey Hess"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr "B<dpkg-parsechangelog> [I<opciones>]"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-18"
+msgstr "08-07-1996"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+#, fuzzy
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr "dpkg-scanpackages - Crea ficheros Packages."
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg> [I<opciones>] I<accin>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+msgid "LIMITATIONS"
+msgstr "ACCIONES"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+#, fuzzy
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -8771,12 +9128,13 @@ msgid "B<--all>"
msgstr "B<--all>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -8784,13 +9142,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, fuzzy, no-wrap
msgid "B<debian/changelog>"
msgstr "B<debian/changelog>"
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
#, fuzzy
msgid ""
"The changelog file, used to obtain version-dependent information about the "
@@ -8804,7 +9162,7 @@ msgstr ""
"nmero de versin de la fuente."
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
#, fuzzy
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr "Copyright (C) 2000 Wichert Akkerman"
@@ -10281,23 +10639,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, fuzzy, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--admindir> I<directorio>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -10305,13 +10665,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, fuzzy
msgid ""
"Specifies the main source control file to read information from. The default "
@@ -10322,7 +10682,7 @@ msgstr ""
"se interpretan empezando en el directorio superior del rbol de fuentes."
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, fuzzy
msgid ""
"Specifies the change log file to read information from. The default is "
@@ -10333,20 +10693,20 @@ msgstr ""
"se interpretan empezando en el directorio superior del rbol de fuentes."
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, fuzzy, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--abort-after=>I<nmero>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -10354,13 +10714,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -10370,13 +10730,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -10384,13 +10744,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
#, fuzzy
msgid ""
"You may specify a perl regular expression to match files you want filtered "
@@ -10412,7 +10772,7 @@ msgstr ""
"operaciones de Libtool."
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -10426,13 +10786,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -10442,13 +10802,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
#, fuzzy
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
@@ -10464,7 +10824,7 @@ msgstr ""
"para permitir la expulsin de varios nombres de fichero."
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
#, fuzzy
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
@@ -10480,7 +10840,7 @@ msgstr ""
"operaciones de Libtool."
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -10493,49 +10853,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
msgstr ""
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, fuzzy, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "OPCIONES DE DPKG-GENCONTROL"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, fuzzy, no-wrap
msgid "B<--no-copy>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy
msgid "Do not copy original tarballs near the extracted source package."
msgstr "No firma el paquete ni el fichero .changes, respectivamente."
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy, no-wrap
msgid "B<--no-check>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -10545,28 +10905,27 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, fuzzy, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "INDICADORES DE LOS PAQUETES"
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, fuzzy, no-wrap
msgid "Format: 1.0"
msgstr "B<Format>"
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -10574,13 +10933,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
#, fuzzy
msgid "B<Extracting>"
msgstr "B<Extra-Size>"
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -10593,12 +10952,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -10607,13 +10966,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
#, fuzzy
msgid ""
"If a second non-option argument is supplied it should be the name of the "
@@ -10635,7 +10994,7 @@ msgstr ""
"originales y por tanto sin diff), en funcin de los argumentos."
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, fuzzy
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
@@ -10647,13 +11006,13 @@ msgstr ""
"B<-sP>, B<-sK>, B<-sU> y B<-sR> en su lugar."
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, fuzzy, no-wrap
msgid "B<-sk>"
msgstr "I<-B>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
#, fuzzy
msgid ""
"Specifies to expect the original source as a tarfile, by default "
@@ -10669,24 +11028,24 @@ msgstr ""
"se usa B<-sp> en lugar de B<-sk>, se eliminar de nuevo posteriormente."
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, fuzzy, no-wrap
msgid "B<-sp>"
msgstr "I<-B>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr ""
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, fuzzy, no-wrap
msgid "B<-su>"
msgstr "I<-B>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, fuzzy
msgid ""
"Specifies that the original source is expected as a directory, by default "
@@ -10699,24 +11058,24 @@ msgstr ""
"usa B<-sr ,> B<dpkg-source eliminar dicho directorio tras la operacin .>"
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, fuzzy, no-wrap
msgid "B<-sr>"
msgstr "I<-B>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr ""
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, fuzzy, no-wrap
msgid "B<-ss>"
msgstr "I<-B>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
#, fuzzy
msgid ""
"Specifies that the original source is available both as a directory and as a "
@@ -10731,13 +11090,13 @@ msgstr ""
"generar un fichero fuente invlido."
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, fuzzy, no-wrap
msgid "B<-sn>"
msgstr "I<-B>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, fuzzy
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
@@ -10752,13 +11111,13 @@ msgstr ""
"\"debianizantes\"."
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, fuzzy, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<--split>, B<-s>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, fuzzy
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
@@ -10787,19 +11146,19 @@ msgstr ""
"es la opcin predeterminada."
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
#, fuzzy
msgid "In all cases any existing original source tree will be removed."
msgstr "En todos los casos cualquier rbol de fuentes original ser eliminado."
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
#, fuzzy
msgid ""
"Used when extracting then the original source (if any) will be left as a "
@@ -10813,13 +11172,13 @@ msgstr ""
"omisin."
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
#, fuzzy
msgid "Unpacks the original source tree."
msgstr "B<-su> desempaqueta el archivo de fuentes original."
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
#, fuzzy
msgid ""
"Ensures that the original source is neither copied to the current directory "
@@ -10831,31 +11190,31 @@ msgstr ""
"directorio actual es eliminado."
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
msgstr ""
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, fuzzy, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<dpkg-deb-actions>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, fuzzy, no-wrap
msgid "Format: 2.0"
msgstr "B<Format>"
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -10863,7 +11222,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -10872,20 +11231,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
msgstr ""
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -10894,13 +11253,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -10910,7 +11269,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -10922,7 +11281,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -10937,14 +11296,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -10952,7 +11311,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -10966,7 +11325,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -10977,14 +11336,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -10994,7 +11353,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -11009,20 +11368,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
#, fuzzy
msgid "B<Build options>"
msgstr "B<dpkg-buildpackage> [I<opciones>]"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<-v, --version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11032,37 +11391,37 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, fuzzy, no-wrap
msgid "B<--include-removal>"
msgstr "B<dpkg --clear-avail>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, fuzzy, no-wrap
msgid "B<--include-binaries>"
msgstr "B<debian/files>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -11070,27 +11429,27 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, fuzzy, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--version>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
msgstr ""
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<dpkg-deb-actions>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -11102,13 +11461,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -11117,41 +11476,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, fuzzy, no-wrap
msgid "B<--skip-patches>"
msgstr "I<--update>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr ""
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -11159,13 +11518,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, fuzzy, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--abort-after=>I<nmero>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -11173,34 +11532,34 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -11208,19 +11567,115 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, fuzzy, no-wrap
msgid "FILE FORMATS"
msgstr "FORMATO"
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -11228,13 +11683,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, fuzzy, no-wrap
msgid "debian/source/include-binaries"
msgstr "B<debian/files>"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -11243,13 +11698,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, fuzzy, no-wrap
msgid "debian/source/options"
msgstr "B<debian/files>"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -11258,7 +11713,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -11269,7 +11724,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -11280,34 +11735,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+msgid "debian/source/local-options"
+msgstr "B<debian/files>"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
msgid "debian/source/patch-header"
msgstr "B<debian/files>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -11320,17 +11790,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
#, fuzzy
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-#, fuzzy
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Copyright 2001 Joey Hess"
-
#. type: TH
#: dpkg-split.1:2
#, fuzzy, no-wrap
@@ -13540,6 +14004,224 @@ msgid "B<dselect>(1)."
msgstr "B<date>(1)."
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-16"
+msgstr "08-07-1996"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+#, fuzzy
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:112
+#, fuzzy
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:114
+#, fuzzy
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
+
+#. type: TH
#: start-stop-daemon.8:1
#, fuzzy, no-wrap
msgid "start-stop-daemon"
@@ -15425,14 +16107,6 @@ msgstr "B<ln>(1), FHS, el estndar sobre la jerarqua del sistema de ficheros."
#, fuzzy
#~ msgid ""
-#~ "B<dpkg-buildpackage> is a control script which can be used to help "
-#~ "automate the building of a package."
-#~ msgstr ""
-#~ "B<dpkg-buildpackage> es un script de control que puede ser usado para "
-#~ "automatizar la construccin de un paquete."
-
-#, fuzzy
-#~ msgid ""
#~ "The B<-s>I<x> options control whether the original source archive is "
#~ "included in the upload if any source is being generated (i.e. B<-b>, B<-"
#~ "B> or B<-A> haven't been used)."
diff --git a/man/po/fr.po b/man/po/fr.po
index 254a92eee..649719356 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:17+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -34,12 +34,13 @@ msgstr "27-02-2009"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -56,13 +57,14 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "NOM"
@@ -75,13 +77,14 @@ msgstr "deb - Format des paquets binaires Debian"
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
@@ -95,13 +98,15 @@ msgstr "I<nom-du-fichier.deb>"
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
@@ -263,11 +268,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -1237,7 +1242,7 @@ msgstr ""
"d'autres choses stupides."
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr "CAVEATS"
@@ -1260,10 +1265,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)."
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr "AUTEURS"
@@ -1274,17 +1280,19 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr "Copyright \\(co 1996,1997,1998 Ian Jackson et Christian Schwarz"
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Copyright \\(co 2007 Frank Lichtenheld"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
"for copying conditions. There is NO WARRANTY."
@@ -1616,14 +1624,21 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+#, fuzzy
+#| msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr "[I<tag:>] I<bibliothèque> I<version> I<dépendances>"
#. type: Plain text
#: deb-shlibs.5:38
+#, fuzzy
+#| msgid ""
+#| "The I<library> and I<version> fields are whitespace-delimited, but the "
+#| "I<dependencies> field extends to the end of the line. The I<tag> field "
+#| "is optional and normally not needed."
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
"Les champs I<bibliothèque> et I<version> sont séparés par des espaces. Le le "
@@ -1636,7 +1651,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr "Lire la charte Debian pour plus d'informations."
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
@@ -1976,9 +1991,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "FICHIERS"
@@ -1995,15 +2011,15 @@ msgid "List of substitution variables and values."
msgstr "La liste des variables de substitution et leurs valeurs."
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "BOGUES"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -2023,7 +2039,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
@@ -2031,17 +2048,17 @@ msgid "AUTHOR"
msgstr "AUTEUR"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Copyright \\(co 1995-1996 Ian Jackson"
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Copyright \\(co 2000 Wichert Akkerman"
@@ -2347,8 +2364,9 @@ msgid "2010-03-07"
msgstr "07-03-2007"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "suite dpkg"
@@ -3087,9 +3105,9 @@ msgstr ""
"pour les commandes suivantes qui sont exécutées pendant la même séquence."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3122,13 +3140,14 @@ msgid "Give help about debugging options."
msgstr "donne des renseignements sur les options de débogage."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3237,11 +3256,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONS"
@@ -4067,8 +4086,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr "ENVIRONNEMENT"
@@ -4202,11 +4221,30 @@ msgstr ""
#. type: TP
#: dpkg.1:646
#, no-wrap
+msgid "B<DPKG_LIBDIR>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:650
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the version of "
+#| "the currently running B<dpkg> instance."
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+"Définie par B<dpkg> dans l'environnement du script du responsable, cette "
+"variable contient la version de l'instance de B<dpkg> en cours d'exécution."
+
+#. type: TP
+#: dpkg.1:650
+#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
@@ -4215,13 +4253,13 @@ msgstr ""
"variable contient le nom du paquet en cours de traitement."
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
@@ -4229,53 +4267,73 @@ msgstr ""
"Définie par B<dpkg> dans l'environnement du script du responsable, cette "
"variable contient l'architecture pour laquelle le paquet a été construit."
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:662
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the version of "
+#| "the currently running B<dpkg> instance."
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+"Définie par B<dpkg> dans l'environnement du script du responsable, cette "
+"variable contient la version de l'instance de B<dpkg> en cours d'exécution."
+
+#. type: Plain text
+#: dpkg.1:665
msgid "To list packages related to the editor B<vi>(1):"
msgstr "Pour afficher les paquets liés au programme B<vi>(1) :"
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr " B<dpkg -l \\(aq*vi*\\(aq>\n"
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr ""
"Pour voir les entrées de I</var/lib/dpkg/available> concernant deux paquets :"
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr " B<dpkg --print-avail elvis vim | less>\n"
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr "Pour rechercher vous-même dans la liste des paquets :"
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr " B<less /var/lib/dpkg/available>\n"
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr "Pour supprimer le paquet installé elvis :"
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr " B<dpkg -r elvis>\n"
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
@@ -4285,7 +4343,7 @@ msgstr ""
"la section « editors » :"
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -4295,18 +4353,18 @@ msgstr ""
" B<dpkg -i vim_4.5-3.deb>\n"
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr "Pour faire une copie locale des états de sélection des paquets :"
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr " B<dpkg --get-selections E<gt>myselections>\n"
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr ""
@@ -4314,7 +4372,7 @@ msgstr ""
"de cette manière :"
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -4324,7 +4382,7 @@ msgstr ""
" B<dpkg --set-selections E<lt>myselections>\n"
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
msgid ""
"Note that this will not actually install or remove anything, but just set "
"the selection state on the requested packages. You will need some other "
@@ -4337,7 +4395,7 @@ msgstr ""
"exemple, exécutez B<apt-get dselect-upgrade>."
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
@@ -4346,13 +4404,13 @@ msgstr ""
"aisée de modifier les états de sélection des paquets."
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr "FONCTIONNALITÉS SUPPLÉMENTAIRES"
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
msgid ""
"Additional functionality can be gained by installing any of the following "
"packages: B<apt>, B<aptitude> and B<debsums>."
@@ -4361,7 +4419,7 @@ msgstr ""
"B<apt>, B<aptitude> et B<debsums>."
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -4370,12 +4428,12 @@ msgstr ""
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5) et B<dpkg-reconfigure>(8)."
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr "L'option B<--no-act> ne donne pas assez d'informations utiles."
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
"contributed to B<dpkg>."
@@ -4447,9 +4505,10 @@ msgstr ""
"pas à la valeur par défaut."
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr "COMMANDES"
@@ -4573,22 +4632,24 @@ msgid "Print a list of valid architecture names."
msgstr "Affiche une liste des architectures valables."
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr "Affiche un message d'aide puis quitte."
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
msgid "Show the version and exit."
@@ -5348,6 +5409,348 @@ msgid "B<dpkg>(1)."
msgstr "B<dpkg>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "dpkg-buildpackage"
+msgid "dpkg-buildflags"
+msgstr "dpkg-buildpackage"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2009-04-13"
+msgid "2010-04-11"
+msgstr "13-04-2009"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+#| msgid "B<dpkg-trigger> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg-trigger> [I<option>...] I<commande>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-buildpackage> is a control script which can be used to help "
+#| "automate the building of a package."
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+"B<dpkg-buildpackage> est un script de contrôle qui peut faciliter la "
+"construction automatique d'un paquet."
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, fuzzy, no-wrap
+#| msgid "2"
+msgid "2."
+msgstr "2"
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+#, fuzzy
+#| msgid ""
+#| "It prepares the build environment by setting various environment "
+#| "variables (see B<ENVIRONMENT VARIABLES>)."
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+"Préparation de l'environnement de compilation par positionnement de diverses "
+"variables d'environnement (voir B<VARIABLES D'ENVIRONNEMENT>)."
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+#| msgid "B<list>"
+msgid "B<--list>"
+msgstr "B<list>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+#| msgid "B<--log>I< file>"
+msgid "B<--get>I< flag>"
+msgstr "B<--log>I< fichier>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+#| msgid "B<--log>I< file>"
+msgid "B<--origin>I< flag>"
+msgstr "B<--log>I< fichier>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--is>I< vendor>"
+msgid "B<vendor>"
+msgstr "B<--is>I< éditeur>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+#| msgid "B<-sr>"
+msgid "B<system>"
+msgstr "B<-sr>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+#| msgid "B<query>"
+msgid "B<user>"
+msgstr "B<query>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+#| msgid "B<-v>"
+msgid "B<env>"
+msgstr "B<-v>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<CFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr "B<CPPFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr "B<CXXFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr "B<FFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr "B<LDFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+"Options passées au compilateur lors du processus de liaison des exécutables "
+"ou des objets partagés (si le linker est appelé directement, alors B<-Wl> et "
+"B<,> doivent être retirés de ces options). Valeur par défaut: aucune."
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "System wide configuration file."
+msgstr "dselect.cfg - Fichier de configuration de dselect"
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "User configuration file."
+msgstr "dselect.cfg - Fichier de configuration de dselect"
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+#, fuzzy
+#| msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, no-wrap
msgid "dpkg-buildpackage"
@@ -5987,19 +6390,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-h>, B<--help>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "Variables positionnées par B<dpkg-architecture>"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -6010,185 +6421,21 @@ msgstr ""
"construction."
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr "Drapeaux de compilation"
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-"Certaines variables d'environnement qui définissent les options du "
-"compilateur et de l'éditeur de lien sont réglés par défaut sauf si elles ont "
-"déjà été fixées dans l'environnement. Veuillez noter que ce mécanisme n'a "
-"été mis en place qu'à partir de la version 1.14.17 de dpkg-dev et que tous "
-"les fichiers I<rules> et les outils de construction n'utilisent pas encore "
-"ces variables."
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<CFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-"Les options d'optimisation qui sont passées au système de construction "
-"Debian et qui peuvent être remplacées par le générateur de paquet si besoin "
-"(valeur par défaut : B<-g\\ -O2>, ou B<-g\\ -O0> si B<noopt> est indiqué "
-"dans DEB_BUILD_OPTIONS). Remplacer ces options peut être utilisé pour fixer "
-"un niveau d'optimisation plus élevé, ou plus de travail dans la recherche de "
-"bogues, qui ne peuvent être détectés qu'avec certains niveaux d'optimisation "
-"(le dernier niveau d'optimisation \"gagne\")."
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr "B<CFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Les options d'optimisation passées sur les drapeaux du compilateur, qui ne "
-"doivent pas être remplacé par ceux du paquet (le plus souvent utilisé pour "
-"faire des tests de construction). Valeur par défaut : aucune."
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr "B<CXXFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr "Identique à B<CFLAGS> pour des sources en C++."
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr "B<CXXFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr "Identique à B<CFLAGS_APPEND> pour des sources en C++."
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr "B<FFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr "Identique à B<CFLAGS> pour des sources en Fortran."
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr "B<FFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr "identique à B<CFLAGS_APPEND> pour des sources en Fortran."
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr "B<CPPFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-"Les drapeaux du préprocesseur qui sont passés au système de construction "
-"Debian peuvent être remplacés par ceux du paquet en construction si besoin "
-"(par défaut : aucun). Cette macro est rarement utilisée (la plupart des "
-"systèmes de construction utilisent simplement B<CFLAGS> au lieu de "
-"B<CPPFLAGS>)."
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr "B<CPPFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
-msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Drapeaux du préprocesseur liés à ceux de ce dernier, qui ne doivent pas être "
-"remplacés par ceux du paquet (le plus souvent utilisé pour des tests de "
-"construction). Valeur par défaut : aucuns."
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
-msgstr "B<LDFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:301
+#: dpkg-buildpackage.1:244
msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
-"Options passées au compilateur lors du processus de liaison des exécutables "
-"ou des objets partagés (si le linker est appelé directement, alors B<-Wl> et "
-"B<,> doivent être retirés de ces options). Valeur par défaut: aucune."
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr "B<LDFLAGS_APPEND>"
#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-"Options d'optimisation passées par les drapeaux du compilateur durant la "
-"phase de liaison, qui ne doivent pas être remplacés par ceux du paquet (le "
-"plus souvent utilisé pour des tests de construction). Valeur par défaut : "
-"aucunes."
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
@@ -6198,7 +6445,7 @@ msgstr ""
"I<commande-de-signature>."
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
"B<fakeroot>(1), B<gpg>(1)."
@@ -6207,9 +6454,11 @@ msgstr ""
"B<fakeroot>(1), B<gpg>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
#. type: TH
#: dpkg-checkbuilddeps.1:1
@@ -7310,13 +7559,13 @@ msgstr ""
"informations contenues dans le fichier « changelog » de l'arborescence source."
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr "B<-V>I<nom>B<=>I<valeur>"
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -7326,7 +7575,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<-T>I<fichier/substvars>"
@@ -7352,29 +7601,29 @@ msgstr ""
"remplacera le champs qui porte le même nom."
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<champ>B<=>I<valeur>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr "Remplace ou ajoute en sortie un champ dans le fichier de contrôle."
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, no-wrap
msgid "B<-U>I<field>"
msgstr "B<-U>I<champ>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr "Supprime en sortie un champ dans le fichier de contrôle."
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "B<-c>I<fichier/control>"
@@ -7390,7 +7639,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr "B<-l>I<fichier/changelog>"
@@ -7415,14 +7664,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr "B<-F>I<format-du-changelog>"
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -8635,6 +8884,138 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "dpkg-parsechangelog"
+msgid "dpkg-mergechangelogs"
+msgstr "dpkg-parsechangelog"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "2006-02-28"
+msgid "2010-04-18"
+msgstr "28-02-2006"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+#, fuzzy
+#| msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr "dpkg-parsechangelog - Analyser un fichier changelog Debian."
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+#| msgid "B<dpkg-trigger> [I<option>...] I<command>"
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg-trigger> [I<option>...] I<commande>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+#| msgid "ACTIONS"
+msgid "LIMITATIONS"
+msgstr "ACTIONS"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+#, fuzzy
+#| msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -9112,12 +9493,13 @@ msgid "B<--all>"
msgstr "B<--all>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
-msgstr "inclut tous les changements."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
+msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -9129,13 +9511,13 @@ msgstr ""
"options."
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr "B<debian/changelog>"
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -9149,7 +9531,7 @@ msgstr ""
"lui-même."
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr "Copyright \\(co 2007, 2008 Frank Lichtenheld"
@@ -10877,7 +11259,7 @@ msgstr ""
"construire le paquet, d'autres paramètres peuvent être acceptés."
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
#, fuzzy
#| msgid ""
#| "B<dpkg-source> will build the source package with the first format that "
@@ -10889,9 +11271,11 @@ msgstr ""
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
"B<dpkg-source> va construire le paquet source dans le premier format qui "
"fonctionnera dans la liste suivante : le(s) format(s) indiqué(s) avec le "
@@ -10901,13 +11285,13 @@ msgstr ""
"différents formats de paquet source."
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--print-format> I<répertoire>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
#, fuzzy
#| msgid ""
#| "Print the source format that would be used to build the source package if "
@@ -10923,13 +11307,13 @@ msgstr ""
"et avec les mêmes options)."
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr "OPTIONS DE CONSTRUCTION GENERIQUES"
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -10941,7 +11325,7 @@ msgstr ""
"plus élevé de l'arborescence source."
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -10953,13 +11337,13 @@ msgstr ""
"plus élevé de l'arborescence source."
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--format=>I<valeur>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
#, fuzzy
#| msgid ""
#| "Try first the given format for building the source package. If used "
@@ -10975,7 +11359,7 @@ msgstr ""
"dans B<debian/source/format>."
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
#, fuzzy
#| msgid ""
#| "Read substitution variables in I<substvarsfile>; the default is to not "
@@ -10989,13 +11373,13 @@ msgstr ""
"aucun fichier n'est lu."
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr "B<-Z>I<compression>, B<--compression>=I<compression>"
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -11011,13 +11395,13 @@ msgstr ""
"depuis dpkg-dev 1.15.5."
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr "B<-z>I<niveau>, B<--compression-level>=I<niveau>"
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -11028,13 +11412,13 @@ msgstr ""
"suivantes : I<1> à I<9>, I<best>, et I<fast>. I<9> est la valeur par défaut."
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -11058,7 +11442,7 @@ msgstr ""
"rationnelle active ; seule la dernière mentionnée sera prise en compte."
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -11082,13 +11466,13 @@ msgstr ""
"exemple'(^|/)', '($|/)')."
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -11098,13 +11482,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -11118,7 +11502,7 @@ msgstr ""
"peut répéter cette option pour exclure plusieurs fichiers."
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -11130,7 +11514,7 @@ msgstr ""
"répertoires utilisés par Libtool."
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -11153,7 +11537,7 @@ msgstr ""
"complète."
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
@@ -11162,43 +11546,43 @@ msgstr ""
"être trouvés dans la sortie de la commande B<--help>."
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "LES OPTIONS GENERIQUES POUR EXTRACTION"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, no-wrap
msgid "B<--no-copy>"
msgstr "B<--no-copy>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
"Ne pas copier l'archive d'origine près de l'extraction du paquet source."
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, no-wrap
msgid "B<--no-check>"
msgstr "B<--no-check>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
"Ne vérifie pas les signatures et les sommes de contrôle avant de dépaqueter."
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr "B<--require-valid-signature>"
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -11213,17 +11597,23 @@ msgstr ""
"keyring.gpg> et I</usr/share/keyrings/debian-maintainers.gpg>)."
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "FORMATS DE PAQUET SOURCE"
#. type: Plain text
-#: dpkg-source.1:212
-msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+#: dpkg-source.1:213
+#, fuzzy
+#| msgid ""
+#| "If you don't know what source format you should use, you should probably "
+#| "pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
+#| "default formats in the near future. See http://wiki.debian.org/Projects/"
+#| "DebSrc3.0 for information on the deployment of those formats within "
+#| "Debian."
+msgid ""
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
"Si vous ne savez pas quel format source utiliser, il est conseillé de "
@@ -11233,13 +11623,13 @@ msgstr ""
"formats dans Debian."
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr "Format: 1.0"
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -11250,12 +11640,12 @@ msgstr ""
"natif I<\"native\">)."
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr "B<Extracting>"
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -11277,12 +11667,12 @@ msgstr ""
"supprimer de fichiers (les fichiers vides seront laissé là)."
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr "B<Construction>"
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -11296,13 +11686,13 @@ msgstr ""
"répertoire \".orig\"."
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr "B<Options de construction (avec -b):>"
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -11321,7 +11711,7 @@ msgstr ""
"sX>."
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -11332,13 +11722,13 @@ msgstr ""
"les options B<-sA>, B<-sP>, B<-sK>, B<-sU> et B<-sR.>"
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, no-wrap
msgid "B<-sk>"
msgstr "B<-sk>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -11353,24 +11743,24 @@ msgstr ""
"orig> pour la génération du fichier diff."
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, no-wrap
msgid "B<-sp>"
msgstr "B<-sp>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr "Comme B<-sk> mais supprimera le répertoire à nouveau par la suite."
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, no-wrap
msgid "B<-su>"
msgstr "B<-su>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -11381,24 +11771,24 @@ msgstr ""
"source> crée une nouvelle archive du source d'origine."
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, no-wrap
msgid "B<-sr>"
msgstr "B<-sr>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr "Comme B<-su> mais supprimera ce répertoire après utilisation."
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, no-wrap
msgid "B<-ss>"
msgstr "B<-ss>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -11412,13 +11802,13 @@ msgstr ""
"« tar » ne correspondent pas, une mauvaise archive source en résulte."
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, no-wrap
msgid "B<-sn>"
msgstr "B<-sn>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -11431,13 +11821,13 @@ msgstr ""
"distincte et donc pas de fichier « diff » de debianisation."
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<-sa> or B<-sA>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -11467,20 +11857,20 @@ msgstr ""
"défaut est B<-sA>."
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr "B<options d'extractions (avec -x):>"
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
"Dans tous ces cas, l'arborescence existante des sources d'origine est "
"supprimée."
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -11493,12 +11883,12 @@ msgstr ""
"est copié dans ce répertoire. (B<Ceci est le comportement par défaut>)."
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr "Dépaquetage de l'arborescence du répertoire source d'origine."
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -11509,7 +11899,7 @@ msgstr ""
"présente dans le répertoire courant, elle est toujours supprimée."
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
@@ -11518,26 +11908,26 @@ msgstr ""
"plusieurs, seule la dernière sera prise en compte."
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<--skip-debianization>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
"Passe l'étape d'application du fichier de différences Debian aux sources "
"amont."
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr "Format: 2.0"
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11549,7 +11939,7 @@ msgstr ""
"de paquet source."
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -11563,7 +11953,7 @@ msgstr ""
"de l'extraction."
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
@@ -11573,13 +11963,13 @@ msgstr ""
"B<zz_debian-diff-auto>."
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr "Format: 3.0 (native)"
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -11593,13 +11983,13 @@ msgstr ""
"help>)."
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr "Format: 3.0 (quilt)"
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -11615,7 +12005,7 @@ msgstr ""
"tirets (« - »)."
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -11635,7 +12025,7 @@ msgstr ""
"include-binaries>)."
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -11662,7 +12052,7 @@ msgstr ""
"options, et la construction est susceptible d'échouer."
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
@@ -11670,7 +12060,7 @@ msgstr ""
"aussi supprimer des fichiers."
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
#, fuzzy
#| msgid ""
#| "The file B<debian/patches/.dpkg-source-applied> is created if some "
@@ -11683,7 +12073,7 @@ msgstr ""
"correctifs ont été appliqués au cours de l'extraction."
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
#, fuzzy
#| msgid ""
#| "All original tarballs found in the current directory are extracted in a "
@@ -11723,7 +12113,7 @@ msgstr ""
"blanche de B<debian/source/include-binaries>."
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
#, fuzzy
#| msgid ""
#| "All original tarballs found in the current directory are extracted in a "
@@ -11761,7 +12151,7 @@ msgstr ""
"blanche de B<debian/source/include-binaries>."
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
@@ -11770,7 +12160,7 @@ msgstr ""
"ensuite utilisés pour recréer l'archive tar debian."
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -11784,7 +12174,7 @@ msgstr ""
"la génération automatique du patch."
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
#, fuzzy
#| msgid ""
#| "Note: B<dpkg-source> expects the source tree to have all patches listed "
@@ -11828,12 +12218,12 @@ msgstr ""
"comportement."
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
msgid "B<Build options>"
msgstr "B<Options de construction>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
#| msgid "B<--to> I<version>, B<-t>I<version>"
msgid "B<--allow-version-of-quilt-db=>I<version>"
@@ -11841,7 +12231,7 @@ msgstr "B<--to> I<version>, B<-t>I<version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11851,13 +12241,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, no-wrap
msgid "B<--include-removal>"
msgstr "B<--include-removal>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
@@ -11866,24 +12256,24 @@ msgstr ""
"modification généré automatiquement."
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr "B<--include-timestamp>"
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr "Inclure la date dans le patch généré automatiquement."
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, no-wrap
msgid "B<--include-binaries>"
msgstr "B<--include-binaries>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -11895,13 +12285,13 @@ msgstr ""
"nécessaire."
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--no-preparation>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
@@ -11910,7 +12300,7 @@ msgstr ""
"correctifs qui ne lui sont apparemment pas appliqués."
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
#| msgid "B<--skip-debianization>"
msgid "B<--single-debian-patch>"
@@ -11918,7 +12308,7 @@ msgstr "B<--skip-debianization>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -11930,13 +12320,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -11945,36 +12335,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr "B<Options d'extraction>"
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
"Passe l'étape d'extraction de l'archive tar debian par dessus les sources "
"amont"
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--skip-patches>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr "Ne pas appliquer des correctifs à la fin de l'extraction."
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr "Format: 3.0 (custom)"
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
@@ -11984,7 +12374,7 @@ msgstr ""
"fichiers arbitraires."
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -11995,13 +12385,13 @@ msgstr ""
"préférence dans le répertoire courant. Au moins un fichier doit être donné."
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--target-format=>I<valeur>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -12012,13 +12402,13 @@ msgstr ""
"(custom)\"."
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr "Format: 3.0 (git) et 3.0 (bzr)"
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
@@ -12027,7 +12417,7 @@ msgstr ""
"contenant le référentiel VCS correspondant."
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
@@ -12036,7 +12426,7 @@ msgstr ""
"branche de la version courante."
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
@@ -12045,7 +12435,7 @@ msgstr ""
"s'assurer que nous n'avons pas de changements non-soumis à ne pas ignorer."
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -12057,19 +12447,115 @@ msgstr ""
"l'espace."
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr "FORMATS DE FICHIERS"
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr "debian/source/format"
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -12080,13 +12566,13 @@ msgstr ""
"pas contenir d'espaces avant ou après l'indication du format."
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, no-wrap
msgid "debian/source/include-binaries"
msgstr "debian/source/include-binaries"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -12099,13 +12585,13 @@ msgstr ""
"commentaires et sont ignorées, ainsi que les lignes vides."
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, no-wrap
msgid "debian/source/options"
msgstr "debian/source/options"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -12118,7 +12604,7 @@ msgstr ""
"compression-level> conviennent bien pour ce fichier."
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -12134,7 +12620,7 @@ msgstr ""
"donnée. Voici un exemple d'un tel fichier :"
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, fuzzy, no-wrap
#| msgid ""
#| " # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -12152,7 +12638,7 @@ msgstr ""
" compression-level = 9\n"
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
@@ -12161,7 +12647,23 @@ msgstr ""
"devriez utiliser B<debian/source/format> à la place."
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+#| msgid "debian/source/options"
+msgid "debian/source/local-options"
+msgstr "debian/source/options"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
#| msgid "debian/source/format"
msgid "debian/source/patch-header"
@@ -12169,20 +12671,20 @@ msgstr "debian/source/format"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr "debian/patches/series"
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -12205,15 +12707,10 @@ msgstr ""
"ligne)."
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-
#. type: TH
#: dpkg-split.1:2
#, no-wrap
@@ -14347,6 +14844,228 @@ msgid "B<dselect>(1)."
msgstr "B<dselect>(1)."
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+#| msgid "2009-08-16"
+msgid "2010-04-16"
+msgstr "16-08-2009"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr "Copyright \\(co 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:112
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr "Copyright \\(co 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:114
+#, fuzzy
+#| msgid "Copyright \\(co 2000 Wichert Akkerman"
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr "Copyright \\(co 2000 Wichert Akkerman"
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
@@ -15989,6 +16708,105 @@ msgstr ""
msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
+#~ msgid ""
+#~ "Some environment variables defining compiler and linker options are set "
+#~ "to default values unless already present in the environment. Note that "
+#~ "this mechanism was only introduced in version 1.14.17 of dpkg-dev and not "
+#~ "all I<rules> files and build tools will honour these variables, yet."
+#~ msgstr ""
+#~ "Certaines variables d'environnement qui définissent les options du "
+#~ "compilateur et de l'éditeur de lien sont réglés par défaut sauf si elles "
+#~ "ont déjà été fixées dans l'environnement. Veuillez noter que ce mécanisme "
+#~ "n'a été mis en place qu'à partir de la version 1.14.17 de dpkg-dev et que "
+#~ "tous les fichiers I<rules> et les outils de construction n'utilisent pas "
+#~ "encore ces variables."
+
+#~ msgid ""
+#~ "Optimization options which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default value: B<-g -"
+#~ "O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
+#~ "Overriding options can be used to explicitly set a higher optimization "
+#~ "level, or work around compiler bugs, which only can be seen with some "
+#~ "optimization levels (the last opt level \"wins\")."
+#~ msgstr ""
+#~ "Les options d'optimisation qui sont passées au système de construction "
+#~ "Debian et qui peuvent être remplacées par le générateur de paquet si "
+#~ "besoin (valeur par défaut : B<-g\\ -O2>, ou B<-g\\ -O0> si B<noopt> est "
+#~ "indiqué dans DEB_BUILD_OPTIONS). Remplacer ces options peut être utilisé "
+#~ "pour fixer un niveau d'optimisation plus élevé, ou plus de travail dans "
+#~ "la recherche de bogues, qui ne peuvent être détectés qu'avec certains "
+#~ "niveaux d'optimisation (le dernier niveau d'optimisation \"gagne\")."
+
+#~ msgid "B<CFLAGS_APPEND>"
+#~ msgstr "B<CFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Les options d'optimisation passées sur les drapeaux du compilateur, qui "
+#~ "ne doivent pas être remplacé par ceux du paquet (le plus souvent utilisé "
+#~ "pour faire des tests de construction). Valeur par défaut : aucune."
+
+#~ msgid "Same as B<CFLAGS> for C++ sources."
+#~ msgstr "Identique à B<CFLAGS> pour des sources en C++."
+
+#~ msgid "B<CXXFLAGS_APPEND>"
+#~ msgstr "B<CXXFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for C++ sources."
+#~ msgstr "Identique à B<CFLAGS_APPEND> pour des sources en C++."
+
+#~ msgid "Same as B<CFLAGS> for Fortran sources."
+#~ msgstr "Identique à B<CFLAGS> pour des sources en Fortran."
+
+#~ msgid "B<FFLAGS_APPEND>"
+#~ msgstr "B<FFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
+#~ msgstr "identique à B<CFLAGS_APPEND> pour des sources en Fortran."
+
+#~ msgid ""
+#~ "Preprocessor flags which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default: empty). "
+#~ "This macro is seldom used (most build systems just use B<CFLAGS> instead "
+#~ "of B<CPPFLAGS>)."
+#~ msgstr ""
+#~ "Les drapeaux du préprocesseur qui sont passés au système de construction "
+#~ "Debian peuvent être remplacés par ceux du paquet en construction si "
+#~ "besoin (par défaut : aucun). Cette macro est rarement utilisée (la "
+#~ "plupart des systèmes de construction utilisent simplement B<CFLAGS> au "
+#~ "lieu de B<CPPFLAGS>)."
+
+#~ msgid "B<CPPFLAGS_APPEND>"
+#~ msgstr "B<CPPFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Preprocessor flags appended to the preprocessor flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Drapeaux du préprocesseur liés à ceux de ce dernier, qui ne doivent pas "
+#~ "être remplacés par ceux du paquet (le plus souvent utilisé pour des tests "
+#~ "de construction). Valeur par défaut : aucuns."
+
+#~ msgid "B<LDFLAGS_APPEND>"
+#~ msgstr "B<LDFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags when linking code, "
+#~ "which must not be overwritten by the package (mostly used to for test "
+#~ "builds). Default value: empty."
+#~ msgstr ""
+#~ "Options d'optimisation passées par les drapeaux du compilateur durant la "
+#~ "phase de liaison, qui ne doivent pas être remplacés par ceux du paquet "
+#~ "(le plus souvent utilisé pour des tests de construction). Valeur par "
+#~ "défaut : aucunes."
+
+#~ msgid "include all changes."
+#~ msgstr "inclut tous les changements."
+
#~ msgid "2009-11-12"
#~ msgstr "12-11-2009"
@@ -16786,13 +17604,6 @@ msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
#~ msgid "2008-03-14"
#~ msgstr "14-03-2008"
-#~ msgid ""
-#~ "B<dpkg-buildpackage> is a control script which can be used to help "
-#~ "automate the building of a package."
-#~ msgstr ""
-#~ "B<dpkg-buildpackage> est un script de contrôle qui peut faciliter la "
-#~ "construction automatique d'un paquet."
-
#, fuzzy
#~ msgid ""
#~ "The B<-s>I<x> options control whether the original source archive is "
diff --git a/man/po/hu.po b/man/po/hu.po
index 3e06ed6b1..5052a0022 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:17+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian\n"
@@ -31,12 +31,13 @@ msgstr "2006-02-28"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -53,13 +54,14 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "NÉV"
@@ -72,13 +74,14 @@ msgstr ""
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "SZINOPSZIS"
@@ -92,13 +95,15 @@ msgstr ""
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "LEÍRÁS"
@@ -205,11 +210,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -1034,7 +1039,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr ""
@@ -1054,10 +1059,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, fuzzy, no-wrap
msgid "AUTHORS"
msgstr "SZERZŐ"
@@ -1068,17 +1074,19 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr ""
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr ""
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
#, fuzzy
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
@@ -1350,14 +1358,14 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr ""
#. type: Plain text
#: deb-shlibs.5:38
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
@@ -1367,7 +1375,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr ""
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, fuzzy, no-wrap
msgid "EXAMPLES"
@@ -1648,9 +1656,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "FÁJLOK"
@@ -1667,15 +1676,15 @@ msgid "List of substitution variables and values."
msgstr ""
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "HIBÁK"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1691,7 +1700,8 @@ msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
@@ -1699,17 +1709,17 @@ msgid "AUTHOR"
msgstr "SZERZŐ"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr ""
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr ""
@@ -1961,8 +1971,9 @@ msgid "2010-03-07"
msgstr "2006-02-28"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "dpkg készlet"
@@ -2571,9 +2582,9 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, fuzzy, no-wrap
msgid "B<--help>"
msgstr "B<--help>, B<-h>"
@@ -2606,13 +2617,14 @@ msgid "Give help about debugging options."
msgstr ""
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -2694,11 +2706,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, fuzzy, no-wrap
msgid "OPTIONS"
msgstr "MÁS LEHETŐSÉGEK"
@@ -3348,8 +3360,8 @@ msgid "I<postrm>"
msgstr ""
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
@@ -3470,82 +3482,108 @@ msgstr ""
#. type: TP
#: dpkg.1:646
#, no-wrap
-msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
+msgid "B<DPKG_LIBDIR>"
msgstr ""
#. type: Plain text
#: dpkg.1:650
msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+
+#. type: TP
+#: dpkg.1:650
+#, no-wrap
+msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:654
+msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
msgstr ""
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr ""
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
msgstr ""
+#. type: TP
+#: dpkg.1:658
+#, no-wrap
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:662
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:665
msgid "To list packages related to the editor B<vi>(1):"
msgstr ""
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr ""
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr ""
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr ""
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
msgstr ""
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -3553,24 +3591,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr ""
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr ""
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr ""
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -3578,7 +3616,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
msgid ""
"Note that this will not actually install or remove anything, but just set "
"the selection state on the requested packages. You will need some other "
@@ -3587,39 +3625,39 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
msgstr ""
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr ""
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
msgid ""
"Additional functionality can be gained by installing any of the following "
"packages: B<apt>, B<aptitude> and B<debsums>."
msgstr ""
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
msgstr ""
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr ""
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
"contributed to B<dpkg>."
@@ -3677,9 +3715,10 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -3787,22 +3826,24 @@ msgid "Print a list of valid architecture names."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
#, fuzzy
@@ -4467,6 +4508,320 @@ msgid "B<dpkg>(1)."
msgstr "B<dpkg>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, no-wrap
+msgid "dpkg-buildflags"
+msgstr ""
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-11"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, no-wrap
+msgid "2."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+msgid "B<--list>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+msgid "B<--get>I< flag>"
+msgstr "B<--licence>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+msgid "B<--origin>I< flag>"
+msgstr "B<--licence>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+msgid "B<vendor>"
+msgstr "B<--showformat=>I<formátum>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+msgid "B<system>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+msgid "B<user>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+msgid "B<env>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, no-wrap
+msgid "B<CFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "System wide configuration file."
+msgstr "dselect.cfg - dselect konfigurációs fájl"
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "User configuration file."
+msgstr "dselect.cfg - dselect konfigurációs fájl"
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, no-wrap
msgid "dpkg-buildpackage"
@@ -5010,19 +5365,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, fuzzy, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<--help>, B<-h>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, fuzzy, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "Debian Project"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -5030,162 +5393,28 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, no-wrap
-msgid "B<CFLAGS>"
-msgstr ""
-
-# type: Plain text
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
+#: dpkg-buildpackage.1:244
msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
#, fuzzy
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
@@ -5193,8 +5422,8 @@ msgid ""
msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr ""
#. type: TH
@@ -6168,13 +6397,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -6182,7 +6411,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, fuzzy, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<--fsys-tarfile>"
@@ -6198,29 +6427,29 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, fuzzy, no-wrap
msgid "B<-U>I<field>"
msgstr "B<--field>, B<-f>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, fuzzy, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "B<--control>, B<-e>"
@@ -6234,7 +6463,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr ""
@@ -6255,14 +6484,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr ""
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -7357,6 +7586,131 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr ""
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr "dpkg-deb"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "2006-02-28"
+msgid "2010-04-18"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+msgid "LIMITATIONS"
+msgstr "MŰVELETI LEHETŐSÉGEK"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: TH
#: dpkg-name.1:6
#, fuzzy, no-wrap
msgid "dpkg-name"
@@ -7766,12 +8120,13 @@ msgid "B<--all>"
msgstr "B<--old>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -7779,13 +8134,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -7794,7 +8149,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr ""
@@ -9119,23 +9474,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, fuzzy, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<Section:> E<lt>szakaszE<gt>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -9143,13 +9500,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -9157,7 +9514,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -9165,20 +9522,20 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, fuzzy, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--showformat=>I<formátum>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -9186,13 +9543,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -9202,13 +9559,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -9216,13 +9573,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -9236,7 +9593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -9250,13 +9607,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -9266,13 +9623,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -9282,7 +9639,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -9290,7 +9647,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -9303,48 +9660,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
msgstr ""
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, fuzzy, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "MÁS LEHETŐSÉGEK"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, fuzzy, no-wrap
msgid "B<--no-copy>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy, no-wrap
msgid "B<--no-check>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -9354,28 +9711,27 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -9383,12 +9739,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -9401,12 +9757,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -9415,13 +9771,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -9432,7 +9788,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -9440,13 +9796,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, fuzzy, no-wrap
msgid "B<-sk>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -9456,24 +9812,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, fuzzy, no-wrap
msgid "B<-sp>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr ""
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, fuzzy, no-wrap
msgid "B<-su>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -9481,24 +9837,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, fuzzy, no-wrap
msgid "B<-sr>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr ""
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, fuzzy, no-wrap
msgid "B<-ss>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -9507,13 +9863,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, fuzzy, no-wrap
msgid "B<-sn>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -9522,13 +9878,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, fuzzy, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<--info>, B<-I>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -9544,18 +9900,18 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -9564,12 +9920,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -9577,31 +9933,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
msgstr ""
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, fuzzy, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<--version>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -9609,7 +9965,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -9618,20 +9974,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
msgstr ""
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -9640,13 +9996,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -9656,7 +10012,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -9668,7 +10024,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -9683,14 +10039,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -9698,7 +10054,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -9712,7 +10068,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -9723,14 +10079,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -9740,7 +10096,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -9755,19 +10111,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
msgid "B<Build options>"
msgstr ""
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<--version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -9777,37 +10133,37 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, fuzzy, no-wrap
msgid "B<--include-removal>"
msgstr "B<--old>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, fuzzy, no-wrap
msgid "B<--include-binaries>"
msgstr "B<--licence>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -9815,27 +10171,27 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, fuzzy, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--version>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
msgstr ""
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<--version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -9847,13 +10203,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -9862,41 +10218,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, fuzzy, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--new>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr ""
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -9904,13 +10260,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, fuzzy, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--showformat=>I<formátum>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -9918,34 +10274,34 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -9953,19 +10309,115 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr ""
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -9973,13 +10425,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, fuzzy, no-wrap
msgid "debian/source/include-binaries"
msgstr "B<--licence>"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -9988,13 +10440,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, fuzzy, no-wrap
msgid "debian/source/options"
msgstr "B<--licence>"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -10003,7 +10455,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -10014,7 +10466,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -10025,34 +10477,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+msgid "debian/source/local-options"
+msgstr "B<--licence>"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
msgid "debian/source/patch-header"
msgstr "B<--licence>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -10065,16 +10532,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
#, fuzzy
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr ""
-
#. type: TH
#: dpkg-split.1:2
#, fuzzy, no-wrap
@@ -11758,6 +12220,221 @@ msgid "B<dselect>(1)."
msgstr "B<dselect>(1)."
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-16"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:112
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:114
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr ""
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
diff --git a/man/po/ja.po b/man/po/ja.po
index 4b83a37ca..aa0019e66 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:17+0100\n"
"Last-Translator: KISE Hiroshi <kise@fuyuneko.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -30,12 +30,13 @@ msgstr "2006-02-28"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -52,13 +53,14 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, fuzzy, no-wrap
msgid "NAME"
msgstr ""
@@ -75,13 +77,14 @@ msgstr "deb - Debian バイナリパッケージ形式"
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "書式"
@@ -95,13 +98,15 @@ msgstr "I<filename>B<.deb>"
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "説明"
@@ -242,11 +247,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -1124,7 +1129,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr ""
@@ -1144,10 +1149,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr "著者"
@@ -1159,18 +1165,20 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr "Copyright (C) 1995 Ian Jackson."
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
#, fuzzy
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Copyright 2000 Wichert Akkerman"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
#, fuzzy
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
@@ -1488,14 +1496,14 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr ""
#. type: Plain text
#: deb-shlibs.5:38
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
@@ -1505,7 +1513,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr ""
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
@@ -1787,9 +1795,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "ファイル"
@@ -1807,15 +1816,15 @@ msgid "List of substitution variables and values."
msgstr "使用できるパッケージの一覧。"
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "バグ"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1833,7 +1842,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, fuzzy, no-wrap
@@ -1845,18 +1855,18 @@ msgstr ""
"著者"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
#, fuzzy
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Copyright (C) 1995 Ian Jackson."
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
#, fuzzy
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Copyright 2000 Wichert Akkerman"
@@ -2110,8 +2120,9 @@ msgid "2010-03-07"
msgstr "2006-04-09"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "dpkg suite"
@@ -2828,9 +2839,9 @@ msgstr ""
"じてそれらがリセットされることはない。"
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -2863,13 +2874,14 @@ msgid "Give help about debugging options."
msgstr "デバッグ用オプション一覧を表示する。"
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -2973,11 +2985,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "オプション"
@@ -3755,8 +3767,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr "環境変数"
@@ -3882,78 +3894,105 @@ msgstr ""
#. type: TP
#: dpkg.1:646
+#, no-wrap
+msgid "B<DPKG_LIBDIR>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:650
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+
+#. type: TP
+#: dpkg.1:650
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
msgstr ""
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
msgstr ""
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_NO_TSTP>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_NO_TSTP>"
+
+#. type: Plain text
+#: dpkg.1:662
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:665
msgid "To list packages related to the editor B<vi>(1):"
msgstr "B<vi>(1) エディタに関連のあるパッケージの一覧を表示する。"
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr " B<dpkg -l \\(aq*vi*\\(aq>\n"
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr "2 つのパッケージの I</var/lib/dpkg/available> にある項目を表示する。"
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr " B<dpkg --print-avail elvis vim | less>\n"
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr "自分でパッケージのリストから検索する。"
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr " B<less /var/lib/dpkg/available>\n"
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr "elvis パッケージを削除する。"
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr " B<dpkg -r elvis>\n"
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
@@ -3963,7 +4002,7 @@ msgstr ""
"セクションに属している。"
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, fuzzy, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -3973,24 +4012,24 @@ msgstr ""
" B<dpkg -i vim_4.5-3.deb>\n"
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr "パッケージ選択状況のコピーを作成する。"
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr " B<dpkg --get-selections E<gt>myselections>\n"
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr "このファイルをほかのコンピュータに転送して、インストールする。"
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -4000,7 +4039,7 @@ msgstr ""
" B<dpkg --set-selections E<lt>myselections>\n"
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
#, fuzzy
msgid ""
"Note that this will not actually install or remove anything, but just set "
@@ -4014,7 +4053,7 @@ msgstr ""
"B<dselect> を起動して、\"導入(Install)\" を選べばよい。"
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
@@ -4023,13 +4062,13 @@ msgstr ""
"ある。"
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr "機能の追加"
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
#, fuzzy
msgid ""
"Additional functionality can be gained by installing any of the following "
@@ -4039,7 +4078,7 @@ msgstr ""
"加できる。"
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
#, fuzzy
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -4049,12 +4088,12 @@ msgstr ""
"(5), B<dpkg.cfg>(5), B<dpkg-reconfigure>(8)."
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。"
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
#, fuzzy
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
@@ -4114,9 +4153,10 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr "コマンド"
@@ -4224,11 +4264,12 @@ msgid "Print a list of valid architecture names."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
#, fuzzy
@@ -4236,11 +4277,12 @@ msgid "Show the usage message and exit."
msgstr "利用方法を表示して正常終了する。"
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
#, fuzzy
@@ -4896,6 +4938,320 @@ msgid "B<dpkg>(1)."
msgstr "B<dpkg>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildflags"
+msgstr "dpkg-scanpackages"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-11"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, fuzzy, no-wrap
+#| msgid "2"
+msgid "2."
+msgstr "2"
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+#| msgid "B<list>"
+msgid "B<--list>"
+msgstr "B<list>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+msgid "B<--get>I< flag>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+msgid "B<--origin>I< flag>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+msgid "B<vendor>"
+msgstr "B<--admindir=>I<dir>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+msgid "B<system>"
+msgstr "B<-B>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+#| msgid "B<query>"
+msgid "B<user>"
+msgstr "B<query>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+msgid "B<env>"
+msgstr "B<-G>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, fuzzy, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<COLUMNS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+msgid "System wide configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+msgid "User configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+#, fuzzy
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, fuzzy, no-wrap
msgid "dpkg-buildpackage"
@@ -5450,19 +5806,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, fuzzy, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-H>|B<--help>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, fuzzy, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "B<dpkg --print-architecture>"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -5470,162 +5834,28 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, fuzzy, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<COLUMNS>"
-
-# type: Plain text
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
+#: dpkg-buildpackage.1:244
msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
#, fuzzy
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
@@ -5635,9 +5865,9 @@ msgstr ""
"B<xargs>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
#, fuzzy
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr "Copyright 2001 Joey Hess"
#. type: TH
@@ -6685,13 +6915,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -6699,7 +6929,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, fuzzy, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<--fsys-tarfile>"
@@ -6715,29 +6945,29 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, fuzzy, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, fuzzy, no-wrap
msgid "B<-U>I<field>"
msgstr "B<[--] >I<filename>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, fuzzy, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "I<control>"
@@ -6751,7 +6981,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr ""
@@ -6772,14 +7002,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr ""
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -7883,6 +8113,134 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Copyright 2001 Joey Hess"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "2006-02-28"
+msgid "2010-04-18"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+#, fuzzy
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr "dpkg-scanpackages - Packages ファイルの作成"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+#| msgid "ACTIONS"
+msgid "LIMITATIONS"
+msgstr "アクション"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+#, fuzzy
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -8328,12 +8686,13 @@ msgid "B<--all>"
msgstr "B<--all>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -8341,13 +8700,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -8356,7 +8715,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
#, fuzzy
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr "Copyright 2000 Wichert Akkerman"
@@ -9808,23 +10167,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, fuzzy, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--admindir> I<directory>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -9832,13 +10193,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -9846,7 +10207,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -9854,20 +10215,20 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, fuzzy, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--showformat=>I<format>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -9875,13 +10236,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -9891,13 +10252,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -9905,13 +10266,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -9925,7 +10286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -9939,13 +10300,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -9955,13 +10316,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -9971,7 +10332,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -9979,7 +10340,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -9992,49 +10353,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
msgstr ""
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, fuzzy, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "その他のオプション"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, fuzzy, no-wrap
msgid "B<--no-copy>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy
msgid "Do not copy original tarballs near the extracted source package."
msgstr "パッケージの短い説明文"
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy, no-wrap
msgid "B<--no-check>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -10044,28 +10405,27 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, fuzzy, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "パッケージフラグ"
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -10073,12 +10433,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -10091,12 +10451,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -10105,13 +10465,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -10122,7 +10482,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -10130,13 +10490,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, fuzzy, no-wrap
msgid "B<-sk>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -10146,24 +10506,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, fuzzy, no-wrap
msgid "B<-sp>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr ""
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, fuzzy, no-wrap
msgid "B<-su>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -10171,24 +10531,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, fuzzy, no-wrap
msgid "B<-sr>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr ""
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, fuzzy, no-wrap
msgid "B<-ss>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -10197,13 +10557,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, fuzzy, no-wrap
msgid "B<-sn>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -10212,13 +10572,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, fuzzy, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<--info>, B<-I>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -10234,18 +10594,18 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -10254,12 +10614,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -10267,31 +10627,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
msgstr ""
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, fuzzy, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<dpkg-deb actions>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -10299,7 +10659,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -10308,20 +10668,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
msgstr ""
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -10330,13 +10690,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -10346,7 +10706,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -10358,7 +10718,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -10373,14 +10733,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -10388,7 +10748,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -10402,7 +10762,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -10413,14 +10773,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -10430,7 +10790,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -10445,20 +10805,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
#, fuzzy
msgid "B<Build options>"
msgstr "B<dpkg> [I<options>] I<action>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<-v, --version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -10468,37 +10828,37 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, fuzzy, no-wrap
msgid "B<--include-removal>"
msgstr "B<dpkg --clear-avail>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, fuzzy, no-wrap
msgid "B<--include-binaries>"
msgstr "B<infodesc>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -10506,27 +10866,27 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, fuzzy, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--version>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
msgstr ""
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<dpkg-deb actions>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -10538,13 +10898,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -10553,41 +10913,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, fuzzy, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--update>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr ""
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -10595,13 +10955,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, fuzzy, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--abort-after=>I<number>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -10609,34 +10969,34 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -10644,19 +11004,115 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, fuzzy, no-wrap
msgid "FILE FORMATS"
msgstr "フォーマット"
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -10664,13 +11120,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, fuzzy, no-wrap
msgid "debian/source/include-binaries"
msgstr "B<infodesc>"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -10679,13 +11135,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, fuzzy, no-wrap
msgid "debian/source/options"
msgstr "B<infodesc>"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -10694,7 +11150,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -10705,7 +11161,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -10716,34 +11172,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+msgid "debian/source/local-options"
+msgstr "B<infodesc>"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
msgid "debian/source/patch-header"
msgstr "B<infodesc>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -10756,19 +11227,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
#, fuzzy
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr ""
"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
"B<xargs>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-#, fuzzy
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Copyright 2001 Joey Hess"
-
#. type: TH
#: dpkg-split.1:2
#, fuzzy, no-wrap
@@ -12710,6 +13175,224 @@ msgid "B<dselect>(1)."
msgstr "B<date>(1)"
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-16"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+#, fuzzy
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:112
+#, fuzzy
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:114
+#, fuzzy
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr "Copyright 2000 Wichert Akkerman"
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
diff --git a/man/po/pl.po b/man/po/pl.po
index f38442450..e7063908c 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.4\n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:18+0100\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -32,12 +32,13 @@ msgstr "2009-02-27"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -54,13 +55,14 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "NAZWA"
@@ -73,13 +75,14 @@ msgstr "deb - format binarnego pakietu Debiana"
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "SKŁADNIA"
@@ -93,13 +96,15 @@ msgstr "I<nazwa_pliku>B<.deb>"
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "OPIS"
@@ -258,11 +263,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -1222,7 +1227,7 @@ msgstr ""
"inną dziwną kolejnością."
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr "OSTRZEŻENIA"
@@ -1244,10 +1249,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr "AUTORZY"
@@ -1258,17 +1264,19 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr "Copyright \\(co 1996,1997,1998 Ian Jackson i Christian Schwarz"
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Copyright \\(co 2007 Frank Lichtenheld"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
"for copying conditions. There is NO WARRANTY."
@@ -1590,14 +1598,21 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+#, fuzzy
+#| msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr "[I<tag:>] I<biblioteka> I<wersja> I<zależności>"
#. type: Plain text
#: deb-shlibs.5:38
+#, fuzzy
+#| msgid ""
+#| "The I<library> and I<version> fields are whitespace-delimited, but the "
+#| "I<dependencies> field extends to the end of the line. The I<tag> field "
+#| "is optional and normally not needed."
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
"Pola I<biblioteka> i I<wersja> są oddzielone od siebie białymi znakami "
@@ -1610,7 +1625,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr "Dalsze szczegóły można znaleźć w Zasadach polityki Debiana."
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
@@ -1945,9 +1960,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "PLIKI"
@@ -1964,15 +1980,15 @@ msgid "List of substitution variables and values."
msgstr "Lista zmiennych podstawiania i ich wartości."
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "BŁĘDY"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1992,7 +2008,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
@@ -2000,17 +2017,17 @@ msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Copyright \\(co 1995-1996 Ian Jackson"
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Copyright \\(co 2000 Wichert Akkerman"
@@ -2315,8 +2332,9 @@ msgid "2010-03-07"
msgstr "2007-03-07"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "użytki dpkg"
@@ -3088,9 +3106,9 @@ msgstr ""
"wykonywanych podczas tego samego przebiegu."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3126,13 +3144,14 @@ msgid "Give help about debugging options."
msgstr "Wyświetlenie opisu opcji debuggera."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3248,11 +3267,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "OPCJE"
@@ -4111,8 +4130,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr "ŚRODOWISKO"
@@ -4247,11 +4266,30 @@ msgstr ""
#. type: TP
#: dpkg.1:646
#, no-wrap
+msgid "B<DPKG_LIBDIR>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:650
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the version of "
+#| "the currently running B<dpkg> instance."
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+"Zdefiniowana przez B<dpkg> w środowisku skryptu opiekuna pakietu, jako "
+"wersja aktualnie uruchomionej instancji programu B<dpkg>."
+
+#. type: TP
+#: dpkg.1:650
+#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
@@ -4260,13 +4298,13 @@ msgstr ""
"przetwarzanego pakietu."
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
@@ -4274,62 +4312,82 @@ msgstr ""
"Zdefiniowana przez B<dpkg> w środowisku skryptu opiekuna pakietu, jako "
"architektura dla której budowano pakiet."
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
+
+#. type: Plain text
+#: dpkg.1:662
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the version of "
+#| "the currently running B<dpkg> instance."
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+"Zdefiniowana przez B<dpkg> w środowisku skryptu opiekuna pakietu, jako "
+"wersja aktualnie uruchomionej instancji programu B<dpkg>."
+
#
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:665
msgid "To list packages related to the editor B<vi>(1):"
msgstr "Wyświetlenie wszystkich pakietów związanych z edytorem B<vi>(1):"
#
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr " B<dpkg -l \\(aq*vi*\\(aq>\n"
#
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr ""
"Wyświetlenie informacji z pliku I</var/lib/dpkg/available> o dwóch pakietach:"
#
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr " B<dpkg --print-avail elvis vim | less>\n"
#
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr "Samodzielne przeszukanie informacji o pakietach:"
#
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr " B<less /var/lib/dpkg/available>\n"
#
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr "Wykasowanie zainstalowanego pakietu elvis:"
#
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr " B<dpkg -r elvis>\n"
#
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
@@ -4339,7 +4397,7 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -4350,20 +4408,20 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr "Aby stworzyć kopię lokalnie wybranych pakietów:"
#
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr " B<dpkg --get-selections E<gt>mojepakiety>\n"
#
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr ""
@@ -4371,7 +4429,7 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -4382,7 +4440,7 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
msgid ""
"Note that this will not actually install or remove anything, but just set "
"the selection state on the requested packages. You will need some other "
@@ -4397,7 +4455,7 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
@@ -4406,14 +4464,14 @@ msgstr ""
"możliwości zmiany ich stanu."
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr "DODATKOWA FUNKCJONALNOŚĆ"
#
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
msgid ""
"Additional functionality can be gained by installing any of the following "
"packages: B<apt>, B<aptitude> and B<debsums>."
@@ -4423,7 +4481,7 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -4433,12 +4491,12 @@ msgstr ""
#
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr "B<--no-act> podaje raczej zbyt mało pomocnych informacji."
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
"contributed to B<dpkg>."
@@ -4510,9 +4568,10 @@ msgstr ""
"nie będą odpowiadały wartościom domyślnym."
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr "POLECENIA"
@@ -4637,11 +4696,12 @@ msgid "Print a list of valid architecture names."
msgstr "Wyświetla listę poprawnych nazw architektur."
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
@@ -4649,11 +4709,12 @@ msgstr "Wyświetla informację o użytkowaniu i kończy działanie."
#
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
msgid "Show the version and exit."
@@ -5408,6 +5469,342 @@ msgid "B<dpkg>(1)."
msgstr "B<dpkg>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "dpkg-buildpackage"
+msgid "dpkg-buildflags"
+msgstr "dpkg-buildpackage"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2009-08-16"
+msgid "2010-04-11"
+msgstr "2009-08-16"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+#| msgid "B<dpkg-trigger> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg-trigger> [I<opcja>...] I<polecenie>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, fuzzy, no-wrap
+#| msgid "2"
+msgid "2."
+msgstr "2"
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+#, fuzzy
+#| msgid ""
+#| "It prepares the build environment by setting various environment "
+#| "variables (see B<ENVIRONMENT VARIABLES>)."
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+"Przygotowuje środowisko budowania poprzez ustawienie różnych zmiennych "
+"środowiska (patrz B<ZMIENNE ŚRODOWISKA>)."
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+#| msgid "B<list>"
+msgid "B<--list>"
+msgstr "B<list>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+#| msgid "B<--log>I< file>"
+msgid "B<--get>I< flag>"
+msgstr "B<--log>I< plik>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+#| msgid "B<--log>I< file>"
+msgid "B<--origin>I< flag>"
+msgstr "B<--log>I< plik>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--is>I< vendor>"
+msgid "B<vendor>"
+msgstr "B<--is>I< twórca>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+#| msgid "B<-sr>"
+msgid "B<system>"
+msgstr "B<-sr>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+#| msgid "B<query>"
+msgid "B<user>"
+msgstr "B<query>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+#| msgid "B<-v>"
+msgid "B<env>"
+msgstr "B<-v>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<CFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr "B<CPPFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr "B<CXXFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr "B<FFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr "B<LDFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+"Opcje przekazywane do kompilatora podczas łączenia plików wykonywalnych lub "
+"współdzielonych bibliotek (jeśli linker jest wywoływany bezpośrednio, B<-Wl> "
+"i B<,> muszą być usunięte z tych opcji). Wartość domyślna: puste."
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "System wide configuration file."
+msgstr "dselect.cfg - plik konfiguracyjny programu dselect "
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "User configuration file."
+msgstr "dselect.cfg - plik konfiguracyjny programu dselect "
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+#, fuzzy
+#| msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, no-wrap
msgid "dpkg-buildpackage"
@@ -6048,19 +6445,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-h>, B<--help>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "Zmienne ustawiane przez dpkg-architecture"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -6071,181 +6476,21 @@ msgstr ""
"dołączane do środowiska budowania."
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr "Flagi kompilatora"
#. type: Plain text
-#: dpkg-buildpackage.1:242
+#: dpkg-buildpackage.1:244
msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
-"Odpowiednie zmienne środowiska do określania opcji kompilatora i linkera są "
-"ustawiane na wartości domyślne, chyba że już są ustawione w środowisku. "
-"Należy zauważyć, że ten mechanizm został wprowadzony dopiero w wersji "
-"1.14.17 dpkg-dev i jeszcze nie wszystkie pliki I<rules> i narzędzia do "
-"budowania pakietów honorują te zmienne."
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<CFLAGS>"
#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-"Opcje optymalizacji, które są przekazywane do systemu budowania Debiana i "
-"mogą/powinny być nadpisane przy budowaniu pakietu jeśli jest to potrzebne "
-"(wartość domyślna: B<-g -O2>, lub B<-g\\ -O0> jeśli opcja B<noopt> jest "
-"podana w DEB_BUILD_OPTIONS). Nadpisywanie opcji może być użyte w celu "
-"ustawienia wyższego poziomu optymalizacji lub radzenia sobie z błędami "
-"kompilatora, które pojawiają się przy niektórych poziomach optymalizacji "
-"(poziom określony w ostatniej opcji \"zwycięża\")."
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr "B<CFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Opcje optymalizacji dodawane do flag kompilatora, które nie mogą być "
-"nadpisane przez pakiet (głównie używane dla testów budowania). Wartość "
-"domyślna: puste."
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr "B<CXXFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr "To samo co B<CFLAGS> dla źródeł C++."
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr "B<CXXFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr "To samo co B<CFLAGS_APPEND> dla źródeł C++."
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr "B<FFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr "To samo co B<CFLAGS> dla źródeł w Fortranie."
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr "B<FFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr "To samo co B<CFLAGS_APPEND> dla źródeł w Fortranie."
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr "B<CPPFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-"Flagi preprocesora, które są przekazywane do systemu budowania Debiana i "
-"mogą/powinny być nadpisane przy budowaniu pakietu jeśli jest to potrzebne "
-"(wartość domyślna: puste). To makro jest rzadko stosowane (większość "
-"systemów budowania używa po prostu B<CFLAGS> zamiast B<CPPFLAGS>)."
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr "B<CPPFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
-msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Flagi dodawane do flag preprocesora, które nie mogą być nadpisane przez "
-"pakiet (głównie używane dla testów budowania). Wartość domyślna: puste."
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
-msgstr "B<LDFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-"Opcje przekazywane do kompilatora podczas łączenia plików wykonywalnych lub "
-"współdzielonych bibliotek (jeśli linker jest wywoływany bezpośrednio, B<-Wl> "
-"i B<,> muszą być usunięte z tych opcji). Wartość domyślna: puste."
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr "B<LDFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-"Opcje optymalizacji dodawane do flag kompilatora podczas łączenia kodu, "
-"które nie mogą być nadpisane przez pakiet (głównie używane dla testów "
-"budowania). Wartość domyślna: puste."
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
@@ -6255,7 +6500,7 @@ msgstr ""
#
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
"B<fakeroot>(1), B<gpg>(1)."
@@ -6264,9 +6509,11 @@ msgstr ""
"B<fakeroot>(1), B<gpg>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
#. type: TH
#: dpkg-checkbuilddeps.1:1
@@ -7395,13 +7642,13 @@ msgstr ""
"zamiast pobierać te wartości z dziennika zmian z katalogu ze źródłami."
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr "B<-V>I<nazwa>B<=>I<wartość>"
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -7411,7 +7658,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<-T>I<plik_zmiennych_podst>"
@@ -7437,29 +7684,29 @@ msgstr ""
"nadpisze pole o tej samej nazwie."
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<pole>B<=>I<wartość>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr "Nadpisuje lub dodaje wyjściowe pole pliku kontrolnego."
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, no-wrap
msgid "B<-U>I<field>"
msgstr "B<-U>I<pole>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr "Usuwa wyjściowe pole pliku kontrolnego."
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "B<-c>I<plik_kontrolny>"
@@ -7475,7 +7722,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr "B<-l>I<dziennik_zmian>"
@@ -7499,14 +7746,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr "B<-F>I<format_dziennika_zmian>"
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -8720,6 +8967,138 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "dpkg-parsechangelog"
+msgid "dpkg-mergechangelogs"
+msgstr "dpkg-parsechangelog"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "2006-02-28"
+msgid "2010-04-18"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+#, fuzzy
+#| msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr "dpkg-parsechangelog - przetwarza pliki dzienników zmian Debiana"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+#| msgid "B<dpkg-trigger> [I<option>...] I<command>"
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg-trigger> [I<opcja>...] I<polecenie>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+#| msgid "ACTIONS"
+msgid "LIMITATIONS"
+msgstr "AKCJE"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+#, fuzzy
+#| msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -9200,12 +9579,13 @@ msgid "B<--all>"
msgstr "B<--all>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
-msgstr "dołącza wszystkie zmiany."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
+msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -9216,13 +9596,13 @@ msgstr ""
"I<debian> mogą nie obsługiwać wszystkich opcji."
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr "B<debian/changelog>"
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -9234,7 +9614,7 @@ msgstr ""
"dokonane po określonym wydaniu, oraz numer wersji pakietu."
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr "Copyright \\(co 2007, 2008 Frank Lichtenheld"
@@ -10984,7 +11364,7 @@ msgstr ""
"budowaniu pakietu, mogą być również akceptowane dodatkowe parametry."
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
#, fuzzy
#| msgid ""
#| "B<dpkg-source> will build the source package with the first format that "
@@ -10995,9 +11375,11 @@ msgstr ""
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
"B<dpkg-source> będzie budować pakiet źródłowy z użyciem pierwszego "
"działającego formatu z następującej listy, w kolejności: format(y) określony"
@@ -11006,14 +11388,14 @@ msgstr ""
"można znaleźć wyczerpujący opis różnych formatów pakietów źródłowych."
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, fuzzy, no-wrap
#| msgid "B<--admindir>I< directory>"
msgid "B<--print-format> I<directory>"
msgstr "B<--admindir>I< katalog>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -11021,13 +11403,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr "OGÓLNE OPCJE BUDOWANIA"
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -11038,7 +11420,7 @@ msgstr ""
"ona interpretowana od najwyższego poziomu katalogu drzewa ze źródłami."
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -11049,13 +11431,13 @@ msgstr ""
"interpretowana od najwyższego poziomu katalogu drzewa ze źródłami."
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--format=>I<wartość>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
#, fuzzy
#| msgid ""
#| "Try first the given format for building the source package. If used "
@@ -11070,7 +11452,7 @@ msgstr ""
"Nadpisuje to każdy format podany w pliku B<debian/source/format>."
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
#, fuzzy
#| msgid ""
#| "Read substitution variables in I<substvarsfile>; the default is to not "
@@ -11084,13 +11466,13 @@ msgstr ""
"żadnego pliku."
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, fuzzy
#| msgid ""
#| "Specify the compression to use for created files (tarballs and diffs). "
@@ -11111,14 +11493,14 @@ msgstr ""
"jest wartością domyślną."
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, fuzzy, no-wrap
#| msgid "B<-z>I<compress_level>"
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr "B<-z>I<poziom_kompresji>"
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -11129,13 +11511,13 @@ msgstr ""
"I<fast>. I<9> jest wartością domyślną."
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -11160,7 +11542,7 @@ msgstr ""
"uwagę."
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -11185,13 +11567,13 @@ msgstr ""
"\"($|/)\")."
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -11201,13 +11583,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -11222,7 +11604,7 @@ msgstr ""
"wzorców wykluczeń."
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -11234,7 +11616,7 @@ msgstr ""
"libtoola."
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -11257,7 +11639,7 @@ msgstr ""
"informacji."
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
@@ -11266,43 +11648,43 @@ msgstr ""
"polecenia B<--help>."
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "OGÓLNE OPCJE ROZPAKOWYWANIA"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, no-wrap
msgid "B<--no-copy>"
msgstr "B<--no-copy>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
"Nie kopiuje oryginalnych archiwów obok rozpakowanego pakietu źródłowego."
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, no-wrap
msgid "B<--no-check>"
msgstr "B<--no-check>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
"Bez weryfikacji podpisów i sprawdzania sum kontrolnych przed rozpakowaniem."
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr "B<--require-valid-signature>"
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -11317,28 +11699,27 @@ msgstr ""
"I</usr/share/keyrings/debian-maintainers.gpg>)."
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "FORMATY PAKIETÓW ŹRÓDŁOWYCH"
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr "Format: 1.0"
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -11349,12 +11730,12 @@ msgstr ""
"gz> (w takim przypadku mówi się, że pakiet jest I<natywny>)."
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr "B<Rozpakowywanie>"
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -11377,12 +11758,12 @@ msgstr ""
"długości)."
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr "B<Budowanie>"
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -11396,13 +11777,13 @@ msgstr ""
"pakietu źródłowego z katalogiem \".orig\"."
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr "B<Opcje budowania (z -b):>"
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -11423,7 +11804,7 @@ msgstr ""
"oryginalnymi źródłami I<katalog>.orig."
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -11434,13 +11815,13 @@ msgstr ""
"sP>, B<-sK>, B<-sU> i B<-sR>."
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, no-wrap
msgid "B<-sk>"
msgstr "B<-sk>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -11456,24 +11837,24 @@ msgstr ""
"różnic (diff)."
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, no-wrap
msgid "B<-sp>"
msgstr "B<-sp>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr "Jak B<-sk>, ale ponownie usunie katalog po zakończeniu."
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, no-wrap
msgid "B<-su>"
msgstr "B<-su>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -11484,24 +11865,24 @@ msgstr ""
"którego B<dpkg-source> utworzy nowe archiwum oryginalnych źródeł."
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, no-wrap
msgid "B<-sr>"
msgstr "B<-sr>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr "Jak B<-su>, jednakże usunie katalog po jego użyciu."
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, no-wrap
msgid "B<-ss>"
msgstr "B<-ss>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -11515,13 +11896,13 @@ msgstr ""
"zostanie wygenerowane niepoprawne archiwum źródłowe."
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, no-wrap
msgid "B<-sn>"
msgstr "B<-sn>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -11535,13 +11916,13 @@ msgstr ""
"(diff)."
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<-sa> lub B<-sA>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -11564,20 +11945,20 @@ msgstr ""
"źródłowego, po czym zostanie on usunięty (co jest równoważne B<-sr>)."
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr "B<Opcje rozpakowywania (z -x):>"
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
"We wszystkich przypadkach, istniejące oryginalne drzewo ze źródłami będzie "
"usunięte."
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -11590,12 +11971,12 @@ msgstr ""
"(B<Jest to zachowanie domyślne>)."
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr "Rozpakowuje oryginalne drzewo źródeł programu."
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -11606,7 +11987,7 @@ msgstr ""
"będzie usunięty z bieżącego katalogu."
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
@@ -11615,26 +11996,26 @@ msgstr ""
"podana więcej niż jedna, to zostanie użyta ostatnia z nich."
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<--skip-debianization>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
"Pomija wykorzystanie różnic Debiana (debian diff) do nałożenia łatek na "
"oryginalne źródła."
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr "Format: 2.0"
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11645,7 +12026,7 @@ msgstr ""
"specyfikacją nowej generacji formatu pakietów źródłowych."
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -11658,7 +12039,7 @@ msgstr ""
"być prawidłowymi łatkami: są one nakładane podczas rozpakowywania."
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
@@ -11668,13 +12049,13 @@ msgstr ""
"nazwie B<zz_debian-diff-auto>."
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr "Format: 3.0 (native)"
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -11688,13 +12069,13 @@ msgstr ""
"wartości opcji B<-I> w informacjach uzyskiwanych poleceniem B<--help>)."
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr "Format: 3.0 (quilt)"
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
#, fuzzy
#| msgid ""
#| "A source package in this format contains at least an original tarball (B<."
@@ -11717,7 +12098,7 @@ msgstr ""
"oraz znaki myślnika (\"-\")."
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -11737,7 +12118,7 @@ msgstr ""
"B<--include-binaries>)."
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -11763,14 +12144,14 @@ msgstr ""
"prawdopodobnie się nie powiedzie."
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
"Podobnie do domyślnego zachowania quilt, łatki mogą także usuwać pliki."
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
#, fuzzy
#| msgid ""
#| "The file B<debian/patches/.dpkg-source-applied> is created if some "
@@ -11783,7 +12164,7 @@ msgstr ""
"plik B<debian/patches/.dpkg-source-applied>."
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
#, fuzzy
#| msgid ""
#| "All original tarballs found in the current directory are extracted in a "
@@ -11823,7 +12204,7 @@ msgstr ""
"binaries>."
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
#, fuzzy
#| msgid ""
#| "All original tarballs found in the current directory are extracted in a "
@@ -11861,7 +12242,7 @@ msgstr ""
"binaries>."
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
@@ -11870,7 +12251,7 @@ msgstr ""
"następnie używane do powtórnego wygenerowania archiwum debian."
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -11885,7 +12266,7 @@ msgstr ""
"łatki."
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
#, fuzzy
#| msgid ""
#| "Note: B<dpkg-source> expects the source tree to have all patches listed "
@@ -11929,12 +12310,12 @@ msgstr ""
"wyłączyć to zachowanie."
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
msgid "B<Build options>"
msgstr "B<Opcje budowania>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
#| msgid "B<--to> I<version>, B<-t>I<version>"
msgid "B<--allow-version-of-quilt-db=>I<version>"
@@ -11942,7 +12323,7 @@ msgstr "B<--to> I<wersja>, B<-t>I<wersja>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11952,13 +12333,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, no-wrap
msgid "B<--include-removal>"
msgstr "B<--include-removal>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
@@ -11967,24 +12348,24 @@ msgstr ""
"generowanej łatki."
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr "B<--include-timestamp>"
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr "Włączenie czasu modyfikacji w automatycznie generowanej łatce."
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, no-wrap
msgid "B<--include-binaries>"
msgstr "B<--include-binaries>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -11996,13 +12377,13 @@ msgstr ""
"już więcej potrzebna."
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--no-preparation>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
@@ -12011,7 +12392,7 @@ msgstr ""
"wyraźnie nie są nałożone."
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
#| msgid "B<--skip-debianization>"
msgid "B<--single-debian-patch>"
@@ -12019,7 +12400,7 @@ msgstr "B<--skip-debianization>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -12031,13 +12412,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -12046,36 +12427,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr "B<Opcje rozpakowywania>"
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
"Pomija rozpakowanie archiwum debian z włączeniem jego zawartości na "
"oryginalne źródła."
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--skip-patches>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr "Nie nakłada łatek po skończeniu rozpakowywania."
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr "Format: 3.0 (custom)"
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
@@ -12085,7 +12466,7 @@ msgstr ""
"pliki."
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -12097,13 +12478,13 @@ msgstr ""
"jeden plik."
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--target-format=>I<wartość>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -12114,13 +12495,13 @@ msgstr ""
"zamiast \"3.0 (custom)\"."
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr "Format: 3.0 (git) oraz 3.0 (bzr)"
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
@@ -12129,7 +12510,7 @@ msgstr ""
"odpowiednie repozytoria systemu kontroli wersji."
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
@@ -12138,7 +12519,7 @@ msgstr ""
"pobrać aktualną gałąź kodu."
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
@@ -12147,7 +12528,7 @@ msgstr ""
"nie ma żadnych niezatwierdzonych zmian, które nie są ignorowane."
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -12159,19 +12540,115 @@ msgstr ""
"zaoszczędzić miejsce."
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr "FORMATY PLIKÓW"
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr "debian/source/format"
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -12182,13 +12659,13 @@ msgstr ""
"wyżej). Niedozwolone są początkowe i końcowe znaki spacji."
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, no-wrap
msgid "debian/source/include-binaries"
msgstr "debian/source/include-binaries"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -12201,14 +12678,14 @@ msgstr ""
"pomijane, puste linie są ignorowane."
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, fuzzy, no-wrap
#| msgid "debian/source/format"
msgid "debian/source/options"
msgstr "debian/source/format"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -12217,7 +12694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -12228,7 +12705,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -12239,14 +12716,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+#| msgid "debian/source/format"
+msgid "debian/source/local-options"
+msgstr "debian/source/format"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
#| msgid "debian/source/format"
msgid "debian/source/patch-header"
@@ -12254,20 +12747,20 @@ msgstr "debian/source/format"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr "debian/patches/series"
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -12290,15 +12783,10 @@ msgstr ""
#
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-
#. type: TH
#: dpkg-split.1:2
#, no-wrap
@@ -14500,6 +14988,228 @@ msgstr ""
msgid "B<dselect>(1)."
msgstr "B<dselect>(1)."
+#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+#| msgid "2009-08-16"
+msgid "2010-04-16"
+msgstr "2009-08-16"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr "Copyright \\(co 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:112
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr "Copyright \\(co 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:114
+#, fuzzy
+#| msgid "Copyright \\(co 2000 Wichert Akkerman"
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr "Copyright \\(co 2000 Wichert Akkerman"
+
#
#. type: TH
#: start-stop-daemon.8:1
@@ -16151,6 +16861,101 @@ msgstr ""
msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
+#~ msgid ""
+#~ "Some environment variables defining compiler and linker options are set "
+#~ "to default values unless already present in the environment. Note that "
+#~ "this mechanism was only introduced in version 1.14.17 of dpkg-dev and not "
+#~ "all I<rules> files and build tools will honour these variables, yet."
+#~ msgstr ""
+#~ "Odpowiednie zmienne środowiska do określania opcji kompilatora i linkera "
+#~ "są ustawiane na wartości domyślne, chyba że już są ustawione w "
+#~ "środowisku. Należy zauważyć, że ten mechanizm został wprowadzony dopiero "
+#~ "w wersji 1.14.17 dpkg-dev i jeszcze nie wszystkie pliki I<rules> i "
+#~ "narzędzia do budowania pakietów honorują te zmienne."
+
+#~ msgid ""
+#~ "Optimization options which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default value: B<-g -"
+#~ "O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
+#~ "Overriding options can be used to explicitly set a higher optimization "
+#~ "level, or work around compiler bugs, which only can be seen with some "
+#~ "optimization levels (the last opt level \"wins\")."
+#~ msgstr ""
+#~ "Opcje optymalizacji, które są przekazywane do systemu budowania Debiana i "
+#~ "mogą/powinny być nadpisane przy budowaniu pakietu jeśli jest to potrzebne "
+#~ "(wartość domyślna: B<-g -O2>, lub B<-g\\ -O0> jeśli opcja B<noopt> jest "
+#~ "podana w DEB_BUILD_OPTIONS). Nadpisywanie opcji może być użyte w celu "
+#~ "ustawienia wyższego poziomu optymalizacji lub radzenia sobie z błędami "
+#~ "kompilatora, które pojawiają się przy niektórych poziomach optymalizacji "
+#~ "(poziom określony w ostatniej opcji \"zwycięża\")."
+
+#~ msgid "B<CFLAGS_APPEND>"
+#~ msgstr "B<CFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Opcje optymalizacji dodawane do flag kompilatora, które nie mogą być "
+#~ "nadpisane przez pakiet (głównie używane dla testów budowania). Wartość "
+#~ "domyślna: puste."
+
+#~ msgid "Same as B<CFLAGS> for C++ sources."
+#~ msgstr "To samo co B<CFLAGS> dla źródeł C++."
+
+#~ msgid "B<CXXFLAGS_APPEND>"
+#~ msgstr "B<CXXFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for C++ sources."
+#~ msgstr "To samo co B<CFLAGS_APPEND> dla źródeł C++."
+
+#~ msgid "Same as B<CFLAGS> for Fortran sources."
+#~ msgstr "To samo co B<CFLAGS> dla źródeł w Fortranie."
+
+#~ msgid "B<FFLAGS_APPEND>"
+#~ msgstr "B<FFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
+#~ msgstr "To samo co B<CFLAGS_APPEND> dla źródeł w Fortranie."
+
+#~ msgid ""
+#~ "Preprocessor flags which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default: empty). "
+#~ "This macro is seldom used (most build systems just use B<CFLAGS> instead "
+#~ "of B<CPPFLAGS>)."
+#~ msgstr ""
+#~ "Flagi preprocesora, które są przekazywane do systemu budowania Debiana i "
+#~ "mogą/powinny być nadpisane przy budowaniu pakietu jeśli jest to potrzebne "
+#~ "(wartość domyślna: puste). To makro jest rzadko stosowane (większość "
+#~ "systemów budowania używa po prostu B<CFLAGS> zamiast B<CPPFLAGS>)."
+
+#~ msgid "B<CPPFLAGS_APPEND>"
+#~ msgstr "B<CPPFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Preprocessor flags appended to the preprocessor flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Flagi dodawane do flag preprocesora, które nie mogą być nadpisane przez "
+#~ "pakiet (głównie używane dla testów budowania). Wartość domyślna: puste."
+
+#~ msgid "B<LDFLAGS_APPEND>"
+#~ msgstr "B<LDFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags when linking code, "
+#~ "which must not be overwritten by the package (mostly used to for test "
+#~ "builds). Default value: empty."
+#~ msgstr ""
+#~ "Opcje optymalizacji dodawane do flag kompilatora podczas łączenia kodu, "
+#~ "które nie mogą być nadpisane przez pakiet (głównie używane dla testów "
+#~ "budowania). Wartość domyślna: puste."
+
+#~ msgid "include all changes."
+#~ msgstr "dołącza wszystkie zmiany."
+
#, fuzzy
#~| msgid "2007-11-19"
#~ msgid "2009-11-12"
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index cd7279139..af68890c0 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:18+0100\n"
"Last-Translator: Andre Luis Lopes <andrelop@debian.org>\n"
"Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -29,12 +29,13 @@ msgstr "2006-04-09"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -51,13 +52,14 @@ msgstr "Projeto Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "NOME"
@@ -70,13 +72,14 @@ msgstr ""
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "RESUMO"
@@ -90,13 +93,15 @@ msgstr ""
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIO"
@@ -203,11 +208,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -933,7 +938,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr ""
@@ -955,10 +960,11 @@ msgstr ""
"reconfigure>(8)"
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr "AUTORES"
@@ -969,17 +975,19 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr ""
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr ""
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
#, fuzzy
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
@@ -1249,14 +1257,14 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr ""
#. type: Plain text
#: deb-shlibs.5:38
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
@@ -1266,7 +1274,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr ""
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
@@ -1547,9 +1555,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "ARQUIVOS"
@@ -1567,15 +1576,15 @@ msgid "List of substitution variables and values."
msgstr "Lista dos pacotes disponveis."
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, fuzzy, no-wrap
msgid "BUGS"
msgstr "BUGS"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1593,7 +1602,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, fuzzy, no-wrap
@@ -1601,17 +1611,17 @@ msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr ""
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr ""
@@ -1864,8 +1874,9 @@ msgid "2010-03-07"
msgstr "2006-04-09"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "dpkg suite"
@@ -2611,9 +2622,9 @@ msgstr ""
"subseqentes usados durante a mesma execuo."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, fuzzy, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -2647,13 +2658,14 @@ msgid "Give help about debugging options."
msgstr "Ajuda com as opes de depurao."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, fuzzy, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -2757,11 +2769,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "OPES"
@@ -3539,8 +3551,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, fuzzy, no-wrap
msgid "ENVIRONMENT"
msgstr "VARIVEIS DE AMBIENTE"
@@ -3672,80 +3684,107 @@ msgstr ""
#. type: TP
#: dpkg.1:646
+#, no-wrap
+msgid "B<DPKG_LIBDIR>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:650
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+
+#. type: TP
+#: dpkg.1:650
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
msgstr ""
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
msgstr ""
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_NO_TSTP>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_NO_TSTP>"
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:662
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:665
#, fuzzy
msgid "To list packages related to the editor B<vi>(1):"
msgstr "Para listar os pacotes relacionados com o editor vi:"
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, fuzzy, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr "B< dpkg -l '*vi*'>"
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
#, fuzzy
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr "Para ver as entradas em I</var/lib/dpkg/available> em dois pacotes:"
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, fuzzy, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr "B< dpkg --print-avail elvis vim | less>"
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr "Para procurar na lista de pacotes voc mesmo:"
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, fuzzy, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr "B< less /var/lib/dpkg/available>"
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr "Para remover um pacote instalado elvis:"
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, fuzzy, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr "B< dpkg -r elvis>"
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
#, fuzzy
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
@@ -3756,7 +3795,7 @@ msgstr ""
"\"editors\":"
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, fuzzy, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -3764,25 +3803,25 @@ msgid ""
msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr "Para fazer uma cpia local dos estados de seleo dos pacotes:"
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, fuzzy, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr "B< dpkg --get-selections E<gt>myselections>"
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr ""
"Voc pode transferir esse arquivo para outro computador e instal-lo com:"
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, fuzzy, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -3790,7 +3829,7 @@ msgid ""
msgstr "B< dpkg --set-selections E<lt>myselections>"
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
#, fuzzy
msgid ""
"Note that this will not actually install or remove anything, but just set "
@@ -3803,7 +3842,7 @@ msgstr ""
"aplicao para baixar e instalar os pacotes requisitados."
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
#, fuzzy
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
@@ -3813,20 +3852,20 @@ msgstr ""
"conveniente de modificar o estado de seleo dos pacotes."
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr ""
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
msgid ""
"Additional functionality can be gained by installing any of the following "
"packages: B<apt>, B<aptitude> and B<debsums>."
msgstr ""
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
#, fuzzy
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -3836,12 +3875,12 @@ msgstr ""
"reconfigure>(8)"
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr "B<--no-act> normalmente d menos informao do que seria til."
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
#, fuzzy
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
@@ -3901,9 +3940,10 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -4011,22 +4051,24 @@ msgid "Print a list of valid architecture names."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
msgid "Show the version and exit."
@@ -4680,6 +4722,316 @@ msgid "B<dpkg>(1)."
msgstr ""
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildflags"
+msgstr "B<dpkg> [I<opes>] I<ao>"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-11"
+msgstr "2006-04-09"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opes>] I<ao>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, fuzzy, no-wrap
+msgid "2."
+msgstr "2"
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+msgid "B<--list>"
+msgstr "B<install>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+msgid "B<--get>I< flag>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+msgid "B<--origin>I< flag>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+msgid "B<vendor>"
+msgstr "B<--admindir> I<diretrio>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+msgid "B<system>"
+msgstr "B<-G>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+msgid "B<user>"
+msgstr "B<--quiet>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+msgid "B<env>"
+msgstr "B<-G>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, fuzzy, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<COLUMNS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+msgid "System wide configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+msgid "User configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, fuzzy, no-wrap
msgid "dpkg-buildpackage"
@@ -5220,19 +5572,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, fuzzy, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<--help>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, fuzzy, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "B<dpkg --print-architecture>"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -5240,162 +5600,28 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, fuzzy, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<COLUMNS>"
-
-# type: Plain text
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
-msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
+#: dpkg-buildpackage.1:244
msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
#, fuzzy
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
@@ -5405,8 +5631,8 @@ msgstr ""
"reconfigure>(8)"
#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr ""
#. type: TH
@@ -6315,13 +6541,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -6329,7 +6555,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr ""
@@ -6345,29 +6571,29 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, fuzzy, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, fuzzy, no-wrap
msgid "B<-U>I<field>"
msgstr "B<--log=>I<filename>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, fuzzy, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "I<control>"
@@ -6381,7 +6607,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr ""
@@ -6402,14 +6628,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr ""
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -7510,6 +7736,131 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr ""
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr "B<dpkg> [I<opes>] I<ao>"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-18"
+msgstr "2006-04-09"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg> [I<opes>] I<ao>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+#| msgid "ACTIONS"
+msgid "LIMITATIONS"
+msgstr "AES"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: TH
#: dpkg-name.1:6
#, fuzzy, no-wrap
msgid "dpkg-name"
@@ -7920,12 +8271,13 @@ msgid "B<--all>"
msgstr "B<--all>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -7933,13 +8285,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -7948,7 +8300,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr ""
@@ -9276,23 +9628,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, fuzzy, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--admindir> I<diretrio>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -9300,13 +9654,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -9314,7 +9668,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -9322,20 +9676,20 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, fuzzy, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--abort-after=>I<nmero>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -9343,13 +9697,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -9359,13 +9713,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -9373,13 +9727,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -9393,7 +9747,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -9407,13 +9761,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -9423,13 +9777,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -9439,7 +9793,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -9447,7 +9801,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -9460,48 +9814,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
msgstr ""
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr ""
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, fuzzy, no-wrap
msgid "B<--no-copy>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy, no-wrap
msgid "B<--no-check>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -9511,28 +9865,27 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, fuzzy, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "SINALIZADORES DOS PACOTES"
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -9540,12 +9893,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -9558,12 +9911,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -9572,13 +9925,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -9589,7 +9942,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -9597,13 +9950,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, fuzzy, no-wrap
msgid "B<-sk>"
msgstr "B<-G>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -9613,24 +9966,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, fuzzy, no-wrap
msgid "B<-sp>"
msgstr "B<-G>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr ""
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, fuzzy, no-wrap
msgid "B<-su>"
msgstr "B<-G>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -9638,24 +9991,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, fuzzy, no-wrap
msgid "B<-sr>"
msgstr "B<-G>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr ""
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, fuzzy, no-wrap
msgid "B<-ss>"
msgstr "B<-G>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -9664,13 +10017,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, fuzzy, no-wrap
msgid "B<-sn>"
msgstr "B<-G>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -9679,13 +10032,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, fuzzy, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<--list> I<ligao>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -9701,18 +10054,18 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -9721,12 +10074,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -9734,31 +10087,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
msgstr ""
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, fuzzy, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<dpkg-deb-actions>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -9766,7 +10119,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -9775,20 +10128,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
msgstr ""
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -9797,13 +10150,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -9813,7 +10166,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -9825,7 +10178,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -9840,14 +10193,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -9855,7 +10208,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -9869,7 +10222,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -9880,14 +10233,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -9897,7 +10250,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -9912,20 +10265,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
#, fuzzy
msgid "B<Build options>"
msgstr "B<dpkg> [I<opes>] I<ao>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<--version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -9935,37 +10288,37 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, fuzzy, no-wrap
msgid "B<--include-removal>"
msgstr "B<dpkg --clear-avail>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, fuzzy, no-wrap
msgid "B<--include-binaries>"
msgstr "B<config-files>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -9973,27 +10326,27 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, fuzzy, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--version>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
msgstr ""
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<dpkg-deb-actions>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -10005,13 +10358,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -10020,41 +10373,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, fuzzy, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--test>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr ""
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -10062,13 +10415,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, fuzzy, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--abort-after=>I<nmero>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -10076,34 +10429,34 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -10111,19 +10464,115 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr ""
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -10131,13 +10580,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, fuzzy, no-wrap
msgid "debian/source/include-binaries"
msgstr "B<config-files>"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -10146,13 +10595,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, fuzzy, no-wrap
msgid "debian/source/options"
msgstr "B<config-files>"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -10161,7 +10610,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -10172,7 +10621,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -10183,34 +10632,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+msgid "debian/source/local-options"
+msgstr "B<config-files>"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
msgid "debian/source/patch-header"
msgstr "B<config-files>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -10223,18 +10687,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
#, fuzzy
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr ""
"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
"reconfigure>(8)"
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr ""
-
#. type: TH
#: dpkg-split.1:2
#, fuzzy, no-wrap
@@ -11915,6 +12374,221 @@ msgid "B<dselect>(1)."
msgstr ""
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-16"
+msgstr "2006-04-09"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:112
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:114
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr ""
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
diff --git a/man/po/ru.po b/man/po/ru.po
index b5e8a1111..5b5111e2a 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-07 22:18+0100\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -31,12 +31,13 @@ msgstr "2006-02-28"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -53,13 +54,14 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "НАЗВАНИЕ"
@@ -72,13 +74,14 @@ msgstr ""
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "СИНТАКСИС"
@@ -92,13 +95,15 @@ msgstr ""
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "ОПИСАНИЕ"
@@ -205,11 +210,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, fuzzy, no-wrap
@@ -1059,7 +1064,7 @@ msgid ""
msgstr ""
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr ""
@@ -1079,10 +1084,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr "АВТОРЫ"
@@ -1093,18 +1099,20 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr ""
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
#, fuzzy
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Copyright 2001 Joey Hess"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
#, fuzzy
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
@@ -1376,14 +1384,14 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr ""
#. type: Plain text
#: deb-shlibs.5:38
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
@@ -1393,7 +1401,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr ""
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
@@ -1674,9 +1682,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "ФАЙЛЫ"
@@ -1694,15 +1703,15 @@ msgid "List of substitution variables and values."
msgstr "Список доступных пакетов."
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1718,7 +1727,8 @@ msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
@@ -1726,17 +1736,17 @@ msgid "AUTHOR"
msgstr "АВТОР"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr ""
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
#, fuzzy
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Copyright 2001 Joey Hess"
@@ -1990,8 +2000,9 @@ msgid "2010-03-07"
msgstr "2006-02-28"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "комплект dpkg"
@@ -2707,9 +2718,9 @@ msgstr ""
"далее в этом запуске."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, fuzzy, no-wrap
msgid "B<--help>"
msgstr "B<dpkg --help>"
@@ -2742,13 +2753,14 @@ msgid "Give help about debugging options."
msgstr "Вывести подсказку о параметрах отладки."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, fuzzy, no-wrap
msgid "B<--version>"
msgstr "B<dpkg --version>"
@@ -2858,11 +2870,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "ПАРАМЕТРЫ"
@@ -3654,8 +3666,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, fuzzy, no-wrap
msgid "ENVIRONMENT"
msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
@@ -3785,80 +3797,107 @@ msgstr ""
#. type: TP
#: dpkg.1:646
+#, no-wrap
+msgid "B<DPKG_LIBDIR>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:650
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+
+#. type: TP
+#: dpkg.1:650
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
msgstr ""
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, fuzzy, no-wrap
#| msgid "B<DPKG_NO_TSTP>"
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_NO_TSTP>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
msgstr ""
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_NO_TSTP>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_NO_TSTP>"
+
+#. type: Plain text
+#: dpkg.1:662
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:665
#, fuzzy
msgid "To list packages related to the editor B<vi>(1):"
msgstr "Показать список пакетов, относящихся к редактору vi:"
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, fuzzy, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
#, fuzzy
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr "Посмотреть записи о двух пакетах в файле B</var/lib/dpkg/available>:"
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, fuzzy, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr "B< dpkg --print-avail elvis vim | less>"
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr "Вручную просмотреть список пакетов:"
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, fuzzy, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr "B< less /var/lib/dpkg/available>"
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr "Удалить установленный пакет elvis:"
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, fuzzy, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr "B< dpkg -r elvis>"
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
@@ -3868,7 +3907,7 @@ msgstr ""
"\" (\"редакторы\"):"
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, fuzzy, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -3876,18 +3915,18 @@ msgid ""
msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr "Получить локальную копию состояний выбранных пакетов:"
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, fuzzy, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr "B< dpkg --get-selections E<gt>myselections>"
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr ""
@@ -3895,7 +3934,7 @@ msgstr ""
"помощью:"
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, fuzzy, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -3903,7 +3942,7 @@ msgid ""
msgstr "B< dpkg --set-selections E<lt>myselections>"
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
#, fuzzy
msgid ""
"Note that this will not actually install or remove anything, but just set "
@@ -3917,7 +3956,7 @@ msgstr ""
"Например, запустите B<dselect> и выберите \"Установить\"."
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
@@ -3926,13 +3965,13 @@ msgstr ""
"выбранных пакетов."
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr "ДОПОЛНИТЕЛЬНАЯ ФУНКЦИОНАЛЬНОСТЬ"
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
#, fuzzy
msgid ""
"Additional functionality can be gained by installing any of the following "
@@ -3942,7 +3981,7 @@ msgstr ""
"следующих пакетов: I<apt>, I<aptitude> и I<debsums>."
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
#, fuzzy
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -3952,12 +3991,12 @@ msgstr ""
"(5), B<dpkg.cfg>(5) и B<dpkg-reconfigure>(8)."
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным."
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
#, fuzzy
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
@@ -4017,9 +4056,10 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -4127,22 +4167,24 @@ msgid "Print a list of valid architecture names."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr ""
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
#, fuzzy
@@ -4799,6 +4841,317 @@ msgid "B<dpkg>(1)."
msgstr "B<date>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildflags"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-11"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, no-wrap
+msgid "2."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+msgid "B<--list>"
+msgstr "B<install>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+msgid "B<--get>I< flag>"
+msgstr "B<--log=>I<имя файла>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+msgid "B<--origin>I< flag>"
+msgstr "B<--log=>I<имя файла>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+msgid "B<vendor>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+msgid "B<system>"
+msgstr "B<-B>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+msgid "B<user>"
+msgstr "B<purge>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+msgid "B<env>"
+msgstr "B<-G>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, fuzzy, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<COLUMNS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+msgid "System wide configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+msgid "User configuration file."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+#, fuzzy
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, fuzzy, no-wrap
msgid "dpkg-buildpackage"
@@ -5342,19 +5695,27 @@ msgstr ""
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, fuzzy, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-H>|B<--help>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, fuzzy, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "B<dpkg --print-architecture>"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -5362,162 +5723,28 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:242
+#: dpkg-buildpackage.1:244
msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, fuzzy, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<COLUMNS>"
-
-# type: Plain text
#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
-msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
-msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
-msgstr ""
-
-#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
msgstr ""
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
#, fuzzy
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
@@ -5525,9 +5752,9 @@ msgid ""
msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
#, fuzzy
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
msgstr "Copyright 2001 Joey Hess"
#. type: TH
@@ -6448,13 +6675,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -6462,7 +6689,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr ""
@@ -6478,29 +6705,29 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, fuzzy, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, fuzzy, no-wrap
msgid "B<-U>I<field>"
msgstr "B<--log=>I<имя файла>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr ""
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, fuzzy, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "I<control>"
@@ -6514,7 +6741,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr ""
@@ -6535,14 +6762,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr ""
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -7643,6 +7870,133 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Copyright 2001 Joey Hess"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-mergechangelogs"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "2006-02-28"
+msgid "2010-04-18"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+#| msgid "ACTIONS"
+msgid "LIMITATIONS"
+msgstr "ДЕЙСТВИЯ"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+#, fuzzy
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: dpkg-name.1:6
#, fuzzy, no-wrap
msgid "dpkg-name"
@@ -8054,12 +8408,13 @@ msgid "B<--all>"
msgstr "B<install>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -8067,13 +8422,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -8082,7 +8437,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
#, fuzzy
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr "Copyright 2001 Joey Hess"
@@ -9403,23 +9758,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, fuzzy, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--status-fd >I<E<lt>nE<gt>>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -9427,13 +9784,13 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -9441,7 +9798,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -9449,20 +9806,20 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, fuzzy, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--abort-after=>I<число>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -9470,13 +9827,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -9486,13 +9843,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -9500,13 +9857,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -9520,7 +9877,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -9534,13 +9891,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -9550,13 +9907,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -9566,7 +9923,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -9574,7 +9931,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -9587,48 +9944,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
msgstr ""
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr ""
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, fuzzy, no-wrap
msgid "B<--no-copy>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, fuzzy, no-wrap
msgid "B<--no-check>"
msgstr "B<--nocheck>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr ""
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -9638,28 +9995,27 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, fuzzy, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "ФЛАГИ ПАКЕТА"
#. type: Plain text
-#: dpkg-source.1:212
+#: dpkg-source.1:213
msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -9667,12 +10023,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -9685,12 +10041,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -9699,13 +10055,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -9716,7 +10072,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -9724,13 +10080,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, fuzzy, no-wrap
msgid "B<-sk>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -9740,24 +10096,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, fuzzy, no-wrap
msgid "B<-sp>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr ""
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, fuzzy, no-wrap
msgid "B<-su>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -9765,24 +10121,24 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, fuzzy, no-wrap
msgid "B<-sr>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr ""
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, fuzzy, no-wrap
msgid "B<-ss>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -9791,13 +10147,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, fuzzy, no-wrap
msgid "B<-sn>"
msgstr "B<-B>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -9806,13 +10162,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, fuzzy, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<-t>|B<--test>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -9828,18 +10184,18 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -9848,12 +10204,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -9861,31 +10217,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
msgstr ""
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, fuzzy, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<dpkg-deb-actions>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr ""
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -9893,7 +10249,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -9902,20 +10258,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
msgstr ""
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -9924,13 +10280,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -9940,7 +10296,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -9952,7 +10308,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -9967,14 +10323,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -9982,7 +10338,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -9996,7 +10352,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -10007,14 +10363,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -10024,7 +10380,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -10039,20 +10395,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
#, fuzzy
msgid "B<Build options>"
msgstr "B<dpkg> [I<параметры>] I<действие>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, fuzzy, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<dpkg --version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -10062,37 +10418,37 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, fuzzy, no-wrap
msgid "B<--include-removal>"
msgstr "B<dpkg --clear-avail>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr ""
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, fuzzy, no-wrap
msgid "B<--include-binaries>"
msgstr "B<config-files>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -10100,27 +10456,27 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, fuzzy, no-wrap
msgid "B<--no-preparation>"
msgstr "B<dpkg --version>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
msgstr ""
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, fuzzy, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<dpkg-deb-actions>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -10132,13 +10488,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -10147,41 +10503,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr ""
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, fuzzy, no-wrap
msgid "B<--skip-patches>"
msgstr "B<822-date>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr ""
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -10189,13 +10545,13 @@ msgid ""
msgstr ""
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, fuzzy, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--abort-after=>I<число>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -10203,34 +10559,34 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
msgstr ""
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -10238,19 +10594,115 @@ msgid ""
msgstr ""
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr ""
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -10258,13 +10710,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, fuzzy, no-wrap
msgid "debian/source/include-binaries"
msgstr "B<config-files>"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -10273,13 +10725,13 @@ msgid ""
msgstr ""
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, fuzzy, no-wrap
msgid "debian/source/options"
msgstr "B<config-files>"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -10288,7 +10740,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -10299,7 +10751,7 @@ msgstr ""
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -10310,34 +10762,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
msgstr ""
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+msgid "debian/source/local-options"
+msgstr "B<config-files>"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, fuzzy, no-wrap
msgid "debian/source/patch-header"
msgstr "B<config-files>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
msgstr ""
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr ""
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -10350,17 +10817,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
#, fuzzy
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-#, fuzzy
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Copyright 2001 Joey Hess"
-
#. type: TH
#: dpkg-split.1:2
#, fuzzy, no-wrap
@@ -12047,6 +12508,224 @@ msgid "B<dselect>(1)."
msgstr "B<date>(1)."
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+msgid "2010-04-16"
+msgstr "2006-02-28"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+#, fuzzy
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:112
+#, fuzzy
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:114
+#, fuzzy
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
diff --git a/man/po/sv.po b/man/po/sv.po
index f22f5e647..d686cda7b 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg man pages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 12:16+0100\n"
+"POT-Creation-Date: 2010-04-21 03:38+0300\n"
"PO-Revision-Date: 2010-03-10 23:06+0100\n"
"Last-Translator: Peter Krefting <peterk@debian.org>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -29,12 +29,13 @@ msgstr "2009-02-27"
#: deb.5:1 deb-control.5:3 deb-split.5:1 deb-version.5:5 deb-old.5:1
#: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
#: deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1
-#: dpkg.cfg.5:1 dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
-#: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1
+#: dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-trigger.1:1
+#: dpkg-vendor.1:1 dselect.1:1 dselect.cfg.5:1 maintscript-helper.1:1
#: start-stop-daemon.8:1 update-alternatives.8:8
#, no-wrap
msgid "Debian Project"
@@ -51,13 +52,14 @@ msgstr "Debian"
#: deb.5:2 deb-control.5:4 deb-split.5:2 deb-version.5:6 deb-old.5:2
#: deb-override.5:16 deb-extra-override.5:2 deb-shlibs.5:17 deb-substvars.5:3
#: deb-symbols.5:3 deb-triggers.5:2 dpkg.1:2 dpkg-architecture.1:2
-#: dpkg.cfg.5:2 dpkg-buildpackage.1:2 dpkg-checkbuilddeps.1:2
-#: dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2 dpkg-genchanges.1:2
-#: dpkg-gencontrol.1:2 dpkg-gensymbols.1:3 dpkg-name.1:7
-#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
-#: dpkg-statoverride.8:2 dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2
-#: dselect.cfg.5:2 start-stop-daemon.8:2 update-alternatives.8:9
+#: dpkg.cfg.5:2 dpkg-buildflags.1:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-gensymbols.1:3
+#: dpkg-mergechangelogs.1:2 dpkg-name.1:7 dpkg-parsechangelog.1:2
+#: dpkg-query.1:2 dpkg-scanpackages.1:16 dpkg-scansources.1:2
+#: dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
+#: dpkg-trigger.1:2 dpkg-vendor.1:2 dselect.1:2 dselect.cfg.5:2
+#: maintscript-helper.1:2 start-stop-daemon.8:2 update-alternatives.8:9
#, no-wrap
msgid "NAME"
msgstr "NAMN"
@@ -70,13 +72,14 @@ msgstr "deb - Debians binära paketformat"
#. type: SH
#: deb.5:4 deb-control.5:7 deb-split.5:4 deb-version.5:9 deb-old.5:5
#: deb-override.5:19 deb-extra-override.5:5 deb-substvars.5:6 deb-symbols.5:6
-#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildpackage.1:5
-#: dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5
-#: dpkg-genchanges.1:5 dpkg-gencontrol.1:5 dpkg-gensymbols.1:6 dpkg-name.1:10
+#: deb-triggers.5:5 dpkg.1:5 dpkg-architecture.1:5 dpkg-buildflags.1:5
+#: dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5 dpkg-distaddfile.1:5
+#: dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5 dpkg-gencontrol.1:5
+#: dpkg-gensymbols.1:6 dpkg-mergechangelogs.1:5 dpkg-name.1:10
#: dpkg-parsechangelog.1:5 dpkg-query.1:5 dpkg-scanpackages.1:19
#: dpkg-scansources.1:5 dpkg-shlibdeps.1:5 dpkg-source.1:6 dpkg-split.1:6
#: dpkg-statoverride.8:5 dpkg-trigger.1:5 dpkg-vendor.1:5 dselect.1:5
-#: start-stop-daemon.8:5 update-alternatives.8:12
+#: maintscript-helper.1:5 start-stop-daemon.8:5 update-alternatives.8:12
#, no-wrap
msgid "SYNOPSIS"
msgstr "SYNOPS"
@@ -90,13 +93,15 @@ msgstr "I<filnamn>B<.deb>"
#: deb.5:6 deb-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8
#: deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9
#: deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11
-#: dpkg.cfg.5:5 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10
-#: dpkg-distaddfile.1:9 dpkg-deb.1:10 dpkg-divert.8:10 dpkg-genchanges.1:10
-#: dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-name.1:16
+#: dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
+#: dpkg-gensymbols.1:10 dpkg-mergechangelogs.1:9 dpkg-name.1:16
#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28
#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11
#: dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17
-#: dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: dselect.cfg.5:5 maintscript-helper.1:15 start-stop-daemon.8:10
+#: update-alternatives.8:17
#, no-wrap
msgid "DESCRIPTION"
msgstr "BESKRIVNING"
@@ -244,11 +249,11 @@ msgstr ""
#. type: SH
#: deb.5:79 deb-control.5:228 deb-split.5:37 deb-version.5:116 deb-old.5:51
#: deb-override.5:66 deb-extra-override.5:37 deb-shlibs.5:61
-#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:709
-#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:312
+#: deb-substvars.5:134 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:717
+#: dpkg-architecture.1:294 dpkg.cfg.5:23 dpkg-buildpackage.1:250
#: dpkg-deb.1:246 dpkg-divert.8:122 dpkg-gensymbols.1:445 dpkg-name.1:95
#: dpkg-query.1:208 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:577 dpkg-split.1:223
+#: dpkg-shlibdeps.1:326 dpkg-source.1:617 dpkg-split.1:223
#: dpkg-statoverride.8:79 dpkg-trigger.1:60 dselect.1:452 dselect.cfg.5:23
#: update-alternatives.8:501
#, no-wrap
@@ -1167,7 +1172,7 @@ msgstr ""
"\"), eller dumma sorteringsordningar."
#. type: SH
-#: deb-version.5:112 dpkg-parsechangelog.1:108
+#: deb-version.5:112 dpkg-parsechangelog.1:109
#, no-wrap
msgid "CAVEATS"
msgstr "VARNINGAR"
@@ -1189,10 +1194,11 @@ msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
#. type: SH
-#: deb-version.5:120 dpkg.1:724 dpkg-buildpackage.1:319 dpkg-distaddfile.1:47
+#: deb-version.5:120 dpkg.1:732 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
-#: dpkg-parsechangelog.1:122 dpkg-shlibdeps.1:331 dpkg-source.1:582
-#: dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:487
+#: dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:622
+#: dselect.1:458 maintscript-helper.1:106 start-stop-daemon.8:294
+#: update-alternatives.8:487
#, no-wrap
msgid "AUTHORS"
msgstr "FÖRFATTARE"
@@ -1203,17 +1209,19 @@ msgid "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
msgstr "Upphovsrättsskyddat © 1996,1997,1998 Ian Jackson och Christian Schwarz"
#. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:325
+#: deb-version.5:124 dpkg-buildpackage.1:263
msgid "Copyright \\(co 2007 Frank Lichtenheld"
msgstr "Upphovsrättsskyddat © 2007 Frank Lichtenheld"
#. type: Plain text
-#: deb-version.5:126 deb-substvars.5:147 dpkg-buildpackage.1:329
-#: dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256
-#: dpkg-divert.8:129 dpkg-genchanges.1:154 dpkg-gencontrol.1:150
-#: dpkg-gensymbols.1:459 dpkg-name.1:107 dpkg-parsechangelog.1:130
-#: dpkg-query.1:207 dpkg-shlibdeps.1:341 dpkg-source.1:590 dpkg-split.1:233
-#: dpkg-statoverride.8:86 dpkg-vendor.1:53 update-alternatives.8:494
+#: deb-version.5:126 deb-substvars.5:147 dpkg-buildflags.1:116
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:256 dpkg-divert.8:129 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-mergechangelogs.1:71
+#: dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:207
+#: dpkg-shlibdeps.1:341 dpkg-source.1:630 dpkg-split.1:233
+#: dpkg-statoverride.8:86 dpkg-vendor.1:53 maintscript-helper.1:117
+#: update-alternatives.8:494
msgid ""
"This is free software; see the GNU General Public Licence version 2 or later "
"for copying conditions. There is NO WARRANTY."
@@ -1532,14 +1540,21 @@ msgstr ""
#. type: Plain text
#: deb-shlibs.5:34
-msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+#, fuzzy
+#| msgid "[I<tag:>] I<library> I<version> I<dependencies>"
+msgid "[I<type:>] I<library> I<version> I<dependencies>"
msgstr "[I<märke:>] I<bibliotek> I<version> I<beroenden>"
#. type: Plain text
#: deb-shlibs.5:38
+#, fuzzy
+#| msgid ""
+#| "The I<library> and I<version> fields are whitespace-delimited, but the "
+#| "I<dependencies> field extends to the end of the line. The I<tag> field "
+#| "is optional and normally not needed."
msgid ""
"The I<library> and I<version> fields are whitespace-delimited, but the "
-"I<dependencies> field extends to the end of the line. The I<tag> field is "
+"I<dependencies> field extends to the end of the line. The I<type> field is "
"optional and normally not needed."
msgstr ""
"Fälten I<bibliotek> och I<version> avdelas med blanktecken medan fältet "
@@ -1552,7 +1567,7 @@ msgid "See the Debian Policy Manual for further details."
msgstr "Se Debians policymanual för ytterligare detaljer."
#. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:655 dpkg-architecture.1:257
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:663 dpkg-architecture.1:257
#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:452
#, no-wrap
msgid "EXAMPLES"
@@ -1884,9 +1899,10 @@ msgstr ""
#. type: SH
#: deb-substvars.5:125 dpkg.1:572 dpkg-architecture.1:279 dpkg.cfg.5:12
-#: dpkg-distaddfile.1:39 dpkg-divert.8:112 dpkg-genchanges.1:138
-#: dpkg-gencontrol.1:128 dpkg-parsechangelog.1:114 dpkg-split.1:212
-#: dpkg-statoverride.8:69 dselect.cfg.5:12 update-alternatives.8:355
+#: dpkg-buildflags.1:94 dpkg-distaddfile.1:39 dpkg-divert.8:112
+#: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
+#: dpkg-split.1:212 dpkg-statoverride.8:69 dselect.cfg.5:12
+#: update-alternatives.8:355
#, no-wrap
msgid "FILES"
msgstr "FILER"
@@ -1903,15 +1919,15 @@ msgid "List of substitution variables and values."
msgstr "Lista över substitueringsvariabler och -värden."
#. type: SH
-#: deb-substvars.5:130 dpkg.1:721 dpkg-buildpackage.1:307 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:574 dpkg-split.1:197 dselect.1:436
+#: deb-substvars.5:130 dpkg.1:729 dpkg-buildpackage.1:245 dpkg-deb.1:225
+#: dpkg-name.1:85 dpkg-source.1:614 dpkg-split.1:197 dselect.1:436
#: update-alternatives.8:479
#, no-wrap
msgid "BUGS"
msgstr "PROGRAMFEL"
#. type: Plain text
-#: deb-substvars.5:133 dpkg-source.1:577
+#: deb-substvars.5:133 dpkg-source.1:617
msgid ""
"The point at which field overriding occurs compared to certain standard "
"output field settings is rather confused."
@@ -1930,7 +1946,8 @@ msgstr ""
#. type: SH
#: deb-substvars.5:141 dpkg-architecture.1:298 dpkg.cfg.5:19
-#: dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:125 dpkg-name.1:103
+#: dpkg-buildflags.1:111 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
+#: dpkg-divert.8:125 dpkg-mergechangelogs.1:66 dpkg-name.1:103
#: dpkg-query.1:202 dpkg-scansources.1:77 dpkg-split.1:229
#: dpkg-statoverride.8:82 dpkg-vendor.1:48 dselect.cfg.5:19
#, no-wrap
@@ -1938,17 +1955,17 @@ msgid "AUTHOR"
msgstr "FÖRFATTARE"
#. type: Plain text
-#: deb-substvars.5:143 dpkg-buildpackage.1:321 dpkg-distaddfile.1:49
+#: deb-substvars.5:143 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:124 dpkg-shlibdeps.1:333 dpkg-source.1:584
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:624
#: dpkg-split.1:231
msgid "Copyright \\(co 1995-1996 Ian Jackson"
msgstr "Upphovsrättsskyddat © 1995-1996 Ian Jackson"
#. type: Plain text
-#: deb-substvars.5:145 dpkg-buildpackage.1:323 dpkg-distaddfile.1:51
-#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:126
-#: dpkg-shlibdeps.1:335 dpkg-source.1:586 dpkg-statoverride.8:84
+#: deb-substvars.5:145 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
+#: dpkg-shlibdeps.1:335 dpkg-source.1:626 dpkg-statoverride.8:84
msgid "Copyright \\(co 2000 Wichert Akkerman"
msgstr "Upphovsrättsskyddat © 2000 Wichert Akkerman"
@@ -2247,8 +2264,9 @@ msgid "2010-03-07"
msgstr "2010-03-07"
#. type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dpkg-trigger.1:1
-#: dpkg-vendor.1:1 dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
+#: dpkg-mergechangelogs.1:1 dpkg-query.1:1 dpkg-trigger.1:1 dpkg-vendor.1:1
+#: dselect.cfg.5:1 maintscript-helper.1:1
#, no-wrap
msgid "dpkg suite"
msgstr "Dpkg-sviten"
@@ -2972,9 +2990,9 @@ msgstr ""
"återställs inte för kommandon som körs i en följd under samma körning."
#. type: TP
-#: dpkg.1:256 dpkg-architecture.1:61 dpkg-divert.8:71 dpkg-scansources.1:67
-#: dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121
-#: update-alternatives.8:317
+#: dpkg.1:256 dpkg-architecture.1:61 dpkg-buildflags.1:62 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
+#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
@@ -3007,13 +3025,14 @@ msgid "Give help about debugging options."
msgstr "Ger hjälp om felsökningsflaggorna."
#. type: TP
-#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildpackage.1:227
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
-#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-parsechangelog.1:36 dpkg-query.1:107
-#: dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220
-#: dpkg-source.1:75 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34
-#: dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:265 dpkg-architecture.1:64 dpkg-buildflags.1:65
+#: dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
+#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
+#: dpkg-shlibdeps.1:220 dpkg-source.1:76 dpkg-split.1:130
+#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
+#: update-alternatives.8:320
#, no-wrap
msgid "B<--version>"
msgstr "B<--version>"
@@ -3117,11 +3136,11 @@ msgstr ""
#: dpkg.1:313 dpkg-architecture.1:68 dpkg-buildpackage.1:49
#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
#: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-name.1:29 dpkg-parsechangelog.1:15
-#: dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45
-#: dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52
-#: dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100
-#: update-alternatives.8:324
+#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
+#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
+#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
+#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
+#: start-stop-daemon.8:100 update-alternatives.8:324
#, no-wrap
msgid "OPTIONS"
msgstr "FLAGGOR"
@@ -3915,8 +3934,8 @@ msgid "I<postrm>"
msgstr "I<postrm>"
#. type: SH
-#: dpkg.1:611 dpkg-buildpackage.1:231 dpkg-deb.1:219 dpkg-query.1:196
-#: dpkg-vendor.1:42 dselect.1:430
+#: dpkg.1:611 dpkg-buildflags.1:101 dpkg-buildpackage.1:231 dpkg-deb.1:219
+#: dpkg-query.1:196 dpkg-vendor.1:42 dselect.1:430
#, no-wrap
msgid "ENVIRONMENT"
msgstr "MILJÖVARIABLER"
@@ -4054,12 +4073,32 @@ msgstr ""
#. type: TP
#: dpkg.1:646
+#, fuzzy, no-wrap
+#| msgid "B<TMPDIR>"
+msgid "B<DPKG_LIBDIR>"
+msgstr "B<TMPDIR>"
+
+#. type: Plain text
+#: dpkg.1:650
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the version of "
+#| "the currently running B<dpkg> instance."
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the private "
+"library directory of the currently running B<dpkg> instance."
+msgstr ""
+"Definieras av B<dpkg> i utvecklarskriptets miljö till versionen av den "
+"instans av B<dpkg> som körs för tillfället."
+
+#. type: TP
+#: dpkg.1:650
#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
#. type: Plain text
-#: dpkg.1:650
+#: dpkg.1:654
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the package name "
"being handled."
@@ -4068,13 +4107,13 @@ msgstr ""
"hanteras."
#. type: TP
-#: dpkg.1:650
+#: dpkg.1:654
#, no-wrap
msgid "B<DPKG_MAINTSCRIPT_ARCH>"
msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
#. type: Plain text
-#: dpkg.1:654
+#: dpkg.1:658
msgid ""
"Defined by B<dpkg> on the maintainer script environment to the architecture "
"the package got built for."
@@ -4082,53 +4121,73 @@ msgstr ""
"Definieras av B<dpkg> i utvecklarskriptets miljö till arkitekturen paketet "
"byggdes för."
+#. type: TP
+#: dpkg.1:658
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
+msgid "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
+
+#. type: Plain text
+#: dpkg.1:662
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the version of "
+#| "the currently running B<dpkg> instance."
+msgid ""
+"Defined by B<dpkg> on the maintainer script environment to the name of the "
+"script running (preinst, postinst, prerm, postrm)."
+msgstr ""
+"Definieras av B<dpkg> i utvecklarskriptets miljö till versionen av den "
+"instans av B<dpkg> som körs för tillfället."
+
#. type: Plain text
-#: dpkg.1:657
+#: dpkg.1:665
msgid "To list packages related to the editor B<vi>(1):"
msgstr ""
"För att lista paket relaterade till textredigeringsprogrammet B<vi>(1):"
#. type: Plain text
-#: dpkg.1:659
+#: dpkg.1:667
#, no-wrap
msgid " B<dpkg -l \\(aq*vi*\\(aq>\n"
msgstr " B<dpkg -l \\(aq*vi*\\(aq>\n"
#. type: Plain text
-#: dpkg.1:662
+#: dpkg.1:670
msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
msgstr "För att se posterna i I</var/lib/dpkg/available> för två paket:"
#. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:672
#, no-wrap
msgid " B<dpkg --print-avail elvis vim | less>\n"
msgstr " B<dpkg --print-avail elvis vim | less>\n"
#. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:675
msgid "To search the listing of packages yourself:"
msgstr "För att själv söka i paketlistan:"
#. type: Plain text
-#: dpkg.1:669
+#: dpkg.1:677
#, no-wrap
msgid " B<less /var/lib/dpkg/available>\n"
msgstr " B<less /var/lib/dpkg/available>\n"
#. type: Plain text
-#: dpkg.1:672
+#: dpkg.1:680
msgid "To remove an installed elvis package:"
msgstr "För att ta bort det installerade paketet elvis:"
#. type: Plain text
-#: dpkg.1:674
+#: dpkg.1:682
#, no-wrap
msgid " B<dpkg -r elvis>\n"
msgstr " B<dpkg -r elvis>\n"
#. type: Plain text
-#: dpkg.1:679
+#: dpkg.1:687
msgid ""
"To install a package, you first need to find it in an archive or CDROM. The "
"\"available\" file shows that the vim package is in section \"editors\":"
@@ -4138,7 +4197,7 @@ msgstr ""
"\"editors\":"
#. type: Plain text
-#: dpkg.1:682
+#: dpkg.1:690
#, no-wrap
msgid ""
" B<cd /cdrom/pool/main/v/vim>\n"
@@ -4148,18 +4207,18 @@ msgstr ""
" B<dpkg -i vim_4.5-3.deb>\n"
#. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:693
msgid "To make a local copy of the package selection states:"
msgstr "För att göra en lokal kopia av paketmarkeringarna:"
#. type: Plain text
-#: dpkg.1:687
+#: dpkg.1:695
#, no-wrap
msgid " B<dpkg --get-selections E<gt>myselections>\n"
msgstr " B<dpkg --get-selections E<gt>mitturval>\n"
#. type: Plain text
-#: dpkg.1:691
+#: dpkg.1:699
msgid ""
"You might transfer this file to another computer, and install it there with:"
msgstr ""
@@ -4167,7 +4226,7 @@ msgstr ""
"skriva:"
#. type: Plain text
-#: dpkg.1:694
+#: dpkg.1:702
#, no-wrap
msgid ""
" B<dpkg --clear-selections>\n"
@@ -4177,7 +4236,7 @@ msgstr ""
" B<dpkg --set-selections E<lt>mitturval>\n"
#. type: Plain text
-#: dpkg.1:700
+#: dpkg.1:708
msgid ""
"Note that this will not actually install or remove anything, but just set "
"the selection state on the requested packages. You will need some other "
@@ -4190,7 +4249,7 @@ msgstr ""
"Till exempel kan du köra B<apt-get dselect-upgrade>."
#. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:711
msgid ""
"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
"to modify the package selection states."
@@ -4199,13 +4258,13 @@ msgstr ""
"ett bekvämare sätt att ändra paketmarkeringarna."
#. type: SH
-#: dpkg.1:705
+#: dpkg.1:713
#, no-wrap
msgid "ADDITIONAL FUNCTIONALITY"
msgstr "YTTERLIGARE FUNKTIONER"
#. type: Plain text
-#: dpkg.1:708
+#: dpkg.1:716
msgid ""
"Additional functionality can be gained by installing any of the following "
"packages: B<apt>, B<aptitude> and B<debsums>."
@@ -4214,7 +4273,7 @@ msgstr ""
"paket: B<apt>, B<aptitude> och B<debsums>."
#. type: Plain text
-#: dpkg.1:720
+#: dpkg.1:728
msgid ""
"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -4223,12 +4282,12 @@ msgstr ""
"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5) och B<dpkg-reconfigure>(8)."
#. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:731
msgid "B<--no-act> usually gives less information than might be helpful."
msgstr "B<--no-act> ger oftast mindre information än vad som vore hjälpsamt."
#. type: Plain text
-#: dpkg.1:726 dpkg.cfg.5:22
+#: dpkg.1:734 dpkg.cfg.5:22
msgid ""
"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
"contributed to B<dpkg>."
@@ -4297,9 +4356,10 @@ msgstr ""
"inte överensstämmer med förvalet."
#. type: SH
-#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
-#: dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24
-#: dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-buildflags.1:33 dpkg-deb.1:28 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
+#: update-alternatives.8:203
#, no-wrap
msgid "COMMANDS"
msgstr "KOMMANDON"
@@ -4422,22 +4482,24 @@ msgid "Print a list of valid architecture names."
msgstr "Visa en lista över giltiga arkitekturnamn."
#. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildpackage.1:227 dpkg-checkbuilddeps.1:36
-#: dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134
-#: dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-name.1:60
+#: dpkg-architecture.1:64 dpkg-buildflags.1:65 dpkg-buildpackage.1:227
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:75
+#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:76
#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
#: update-alternatives.8:320
msgid "Show the usage message and exit."
msgstr "Visar hjälpskärm och avslutar."
#. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildpackage.1:230 dpkg-checkbuilddeps.1:39
-#: dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137
-#: dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-name.1:63
+#: dpkg-architecture.1:67 dpkg-buildflags.1:68 dpkg-buildpackage.1:230
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
+#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:78
+#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:79
#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
#: update-alternatives.8:323
msgid "Show the version and exit."
@@ -5190,6 +5252,348 @@ msgid "B<dpkg>(1)."
msgstr "B<dpkg>(1)."
#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "dpkg-buildpackage"
+msgid "dpkg-buildflags"
+msgstr "dpkg-buildpackage"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2009-04-13"
+msgid "2010-04-11"
+msgstr "2009-04-13"
+
+#. type: Plain text
+#: dpkg-buildflags.1:4
+msgid "dpkg-buildflags - returns build flags to use during package build"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:8
+#, fuzzy
+#| msgid "B<dpkg-trigger> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgstr "B<dpkg-trigger> [I<flaggor>...] I<kommando>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:12
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-buildpackage> is a control script which can be used to help "
+#| "automate the building of a package."
+msgid ""
+"B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
+"build of Debian packages."
+msgstr ""
+"B<dpkg-buildpackage> är ett styrskript som kan användas för att göra det "
+"enklare att automatisera paketbyggning."
+
+#. type: Plain text
+#: dpkg-buildflags.1:15
+msgid ""
+"The default flags are defined by the vendor but they can be extended/"
+"overriden in several ways:"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:15
+#, fuzzy, no-wrap
+#| msgid "1"
+msgid "1."
+msgstr "1"
+
+#. type: Plain text
+#: dpkg-buildflags.1:17
+msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:17
+#, fuzzy, no-wrap
+#| msgid "2"
+msgid "2."
+msgstr "2"
+
+#. type: Plain text
+#: dpkg-buildflags.1:19
+msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:19
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:21
+#, fuzzy
+#| msgid ""
+#| "It prepares the build environment by setting various environment "
+#| "variables (see B<ENVIRONMENT>)."
+msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgstr ""
+"Byggmiljön förbereds genom att diverse miljövariabler sätts (se B<MILJÖ>)."
+
+#. type: Plain text
+#: dpkg-buildflags.1:23
+msgid "The configuration files can contain two types of directives:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "B<SET>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid "Override the flag named I<flag> to have the value I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:26
+#, no-wrap
+msgid "B<APPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:30
+msgid ""
+"Extend the flag named I<flag> with the options given in I<value>. A space "
+"is prepended to the appended value if the flag's current value is non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:33
+msgid ""
+"The configuration files can contain comments on lines starting with a hash "
+"(#). Empty lines are also ignored."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
+#, fuzzy, no-wrap
+#| msgid "B<list>"
+msgid "B<--list>"
+msgstr "B<list>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:39
+msgid ""
+"Print the list of flags supported by the current vendor (one per line). See "
+"the B<SUPPORTED FLAGS> section for more information about them."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:39
+#, fuzzy, no-wrap
+#| msgid "B<--log>I< file>"
+msgid "B<--get>I< flag>"
+msgstr "B<--log> I<fil>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:43
+msgid ""
+"Print the value of the flag on standard output. Exits with 0 if the flag is "
+"known otherwise exits with 1."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:43
+#, fuzzy, no-wrap
+#| msgid "B<--log>I< file>"
+msgid "B<--origin>I< flag>"
+msgstr "B<--log> I<fil>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:48
+msgid ""
+"Print the origin of the value that is returned by B<--get>. Exits with 0 if "
+"the flag is known otherwise exits with 1. The origin can be one of the "
+"following values:"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--is>I< vendor>"
+msgid "B<vendor>"
+msgstr "B<--is>I< återförsäljare>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:52
+msgid "the original flag set by the vendor is returned;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:52
+#, fuzzy, no-wrap
+#| msgid "B<symver>"
+msgid "B<system>"
+msgstr "B<symver>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:55
+msgid "the flag is set/modified by a system-wide configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:55
+#, fuzzy, no-wrap
+#| msgid "B<query>"
+msgid "B<user>"
+msgstr "B<query>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:58
+msgid "the flag is set/modified by a user-specific configuration;"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:58
+#, fuzzy, no-wrap
+#| msgid "B<-v>"
+msgid "B<env>"
+msgstr "B<-V>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:61
+msgid "the flag is set/modified by an environment-specific configuration."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:69
+#, no-wrap
+msgid "SUPPORTED FLAGS"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:70
+#, no-wrap
+msgid "B<CFLAGS>"
+msgstr "B<CFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:76
+msgid ""
+"Options for the C compiler. The default value set by the vendor includes I<-"
+"g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
+"B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:76
+#, no-wrap
+msgid "B<CPPFLAGS>"
+msgstr "B<CPPFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:79
+msgid "Options for the C preprocessor. Default value: empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:79
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr "B<CXXFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:82
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:82
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr "B<FFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:85
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:85
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr "B<LDFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:93
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+"Flaggor som sänds till kompilatorn vid länkning av binärer eller delade "
+"objekt (om länkaren anropas direkt måste B<-Wl> och B<,> tas bort från dessa "
+"flaggor). Standardvärde: tomt."
+
+#. type: TP
+#: dpkg-buildflags.1:95
+#, fuzzy, no-wrap
+#| msgid "I</etc/dpkg/dpkg.cfg>"
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:98
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "System wide configuration file."
+msgstr "dselect.cfg - inställningsfil för dselect"
+
+#. type: TP
+#: dpkg-buildflags.1:98
+#, no-wrap
+msgid "B<~/.config/dpkg-buildflags.conf>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:101
+#, fuzzy
+#| msgid "dselect.cfg - dselect configuration file"
+msgid "User configuration file."
+msgstr "dselect.cfg - inställningsfil för dselect"
+
+#. type: TP
+#: dpkg-buildflags.1:102
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:106
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:110
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:113 maintscript-helper.1:108
+#, fuzzy
+#| msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Upphovsrättsskyddat © 2008 Raphaël Hertzog"
+
+#. type: TH
#: dpkg-buildpackage.1:1
#, no-wrap
msgid "dpkg-buildpackage"
@@ -5804,19 +6208,27 @@ msgstr "Ändra platsen för B<dpkg>-databasen. Förval är I</var/lib/dpkg>."
#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:72 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-source.1:73 dpkg-split.1:127 dpkg-trigger.1:31
#, no-wrap
msgid "B<-h>, B<--help>"
msgstr "B<-h>, B<--help>"
+#. type: Plain text
+#: dpkg-buildpackage.1:235
+msgid ""
+"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"not rely on their presence and should instead use the respective interface "
+"to retrieve the needed values."
+msgstr ""
+
#. type: SS
-#: dpkg-buildpackage.1:232
+#: dpkg-buildpackage.1:235
#, no-wrap
msgid "Variables set by dpkg-architecture"
msgstr "Variabler som sätts av dpkg-architecture"
#. type: Plain text
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
msgid ""
"B<dpkg-architecture> is called with the B<-a> and B<-t> parameters "
"forwarded. Any variable that is output by its B<-s> option is integrated in "
@@ -5826,180 +6238,21 @@ msgstr ""
"Variabler som skrivs ut via dess B<-s>-flagga integreras i byggmiljön."
#. type: SS
-#: dpkg-buildpackage.1:236
+#: dpkg-buildpackage.1:239
#, no-wrap
msgid "Compiler flags"
msgstr "Kompileringsflaggor"
#. type: Plain text
-#: dpkg-buildpackage.1:242
-msgid ""
-"Some environment variables defining compiler and linker options are set to "
-"default values unless already present in the environment. Note that this "
-"mechanism was only introduced in version 1.14.17 of dpkg-dev and not all "
-"I<rules> files and build tools will honour these variables, yet."
-msgstr ""
-"Ett par miljövariabler som anger kompilator- och länkarflaggor återställs "
-"till sina standardvärden såvida de inte redan har satts i miljön. Observera "
-"att denna mekanism introducerades först i dpkg-dev version 1.14.17 och att "
-"inte alla I<rules>-filer och byggverktyg ännu godtar dessa variabler."
-
-#. type: TP
-#: dpkg-buildpackage.1:242
-#, no-wrap
-msgid "B<CFLAGS>"
-msgstr "B<CFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:255
-msgid ""
-"Optimization options which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default value: B<-g -"
-"O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-"Overriding options can be used to explicitly set a higher optimization "
-"level, or work around compiler bugs, which only can be seen with some "
-"optimization levels (the last opt level \"wins\")."
-msgstr ""
-"Optimeringsflaggor som sänds till Debians byggsystem och kan/bör överstyras "
-"av paketet som byggs om så behövs (standardvärde: B<-g -O2>, eller B<-g -O0> "
-"om B<noopt> anges i DEB_BUILD_OPTIONS). Överstyrda flaggor kan användas för "
-"att explicit välja en högre optimeringsnivå, eller för att förbigå "
-"kompilatorfel som bara ses med vissa optimeringsnivåer (den sist satta "
-"optimeringsnivån \"vinner\")."
-
-#. type: TP
-#: dpkg-buildpackage.1:255
-#, no-wrap
-msgid "B<CFLAGS_APPEND>"
-msgstr "B<CFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:260
-msgid ""
-"Optimization options appended to the compiler flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Optimeringsflaggor som läggs till kompilatorflaggorna, vilka inte får "
-"skrivas över av paketet (används huvudsakligen för testbyggen). "
-"Standardvärde: tomt."
-
-#. type: TP
-#: dpkg-buildpackage.1:260
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr "B<CXXFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:265
-msgid "Same as B<CFLAGS> for C++ sources."
-msgstr "Samma som B<CFLAGS> för C++-källkod."
-
-#. type: TP
-#: dpkg-buildpackage.1:265
-#, no-wrap
-msgid "B<CXXFLAGS_APPEND>"
-msgstr "B<CXXFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:270
-msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-msgstr "Samma som B<CFLAGS_APPEND> för C++-källkod."
-
-#. type: TP
-#: dpkg-buildpackage.1:270
-#, no-wrap
-msgid "B<FFLAGS>"
-msgstr "B<FFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:275
-msgid "Same as B<CFLAGS> for Fortran sources."
-msgstr "Samma som B<CFLAGS> för Fortrankällkod."
-
-#. type: TP
-#: dpkg-buildpackage.1:275
-#, no-wrap
-msgid "B<FFLAGS_APPEND>"
-msgstr "B<FFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:280
-msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-msgstr "Samma som B<CFLAGS_APPEND> för Fortrankällkod."
-
-#. type: TP
-#: dpkg-buildpackage.1:280
-#, no-wrap
-msgid "B<CPPFLAGS>"
-msgstr "B<CPPFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:288
-msgid ""
-"Preprocessor flags which are passed to the Debian build system and can/"
-"should be overridden by the package build if needed (default: empty). This "
-"macro is seldom used (most build systems just use B<CFLAGS> instead of "
-"B<CPPFLAGS>)."
-msgstr ""
-"Förprocessorflaggor som sänds till Debians byggsystem och kan/bör överstyras "
-"av paketet som byggs om så behövs (standardvärde: tomt). Detta makro används "
-"sällan (de flesta byggsystem använder helt enkelt B<CFLAGS> istället för "
-"B<CPPFLAGS>)."
-
-#. type: TP
-#: dpkg-buildpackage.1:288
-#, no-wrap
-msgid "B<CPPFLAGS_APPEND>"
-msgstr "B<CPPFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:293
-msgid ""
-"Preprocessor flags appended to the preprocessor flags, which must not be "
-"overwritten by the package (mostly used to for test builds). Default value: "
-"empty."
-msgstr ""
-"Förprocessorflaggor som läggs till förprocessorflaggorna, vilka inte får "
-"skrivas över av paketet (används huvudsakligen för testbyggen). "
-"Standardvärde: tomt."
-
-#. type: TP
-#: dpkg-buildpackage.1:293
-#, no-wrap
-msgid "B<LDFLAGS>"
-msgstr "B<LDFLAGS>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:301
-msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
-msgstr ""
-"Flaggor som sänds till kompilatorn vid länkning av binärer eller delade "
-"objekt (om länkaren anropas direkt måste B<-Wl> och B<,> tas bort från dessa "
-"flaggor). Standardvärde: tomt."
-
-#. type: TP
-#: dpkg-buildpackage.1:301
-#, no-wrap
-msgid "B<LDFLAGS_APPEND>"
-msgstr "B<LDFLAGS_APPEND>"
-
-#. type: Plain text
-#: dpkg-buildpackage.1:306
+#: dpkg-buildpackage.1:244
msgid ""
-"Optimization options appended to the compiler flags when linking code, which "
-"must not be overwritten by the package (mostly used to for test builds). "
-"Default value: empty."
+"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+"environment variables are set to the values that B<dpkg-buildflags> "
+"returned. See its manual page for more information."
msgstr ""
-"Flaggor som läggs till kompilatorflaggorna vid länkning av kod, vilka inte "
-"får skrivas över av paketet (används huvudsakligen för testbyggen). "
-"Standardvärde: tomt."
#. type: Plain text
-#: dpkg-buildpackage.1:311
+#: dpkg-buildpackage.1:249
msgid ""
"It should be possible to specify spaces and shell metacharacters in and "
"initial arguments for I<gain-root-command> and I<sign-command>."
@@ -6008,7 +6261,7 @@ msgstr ""
"inledande argument för, I<få-root-kommando> och I<signeringskommando>."
#. type: Plain text
-#: dpkg-buildpackage.1:318
+#: dpkg-buildpackage.1:256
msgid ""
"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
"B<fakeroot>(1), B<gpg>(1)."
@@ -6017,9 +6270,11 @@ msgstr ""
"B<fakeroot>(1), B<gpg>(1)."
#. type: Plain text
-#: dpkg-buildpackage.1:327
-msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
-msgstr "Upphovsrättsskyddat © 2008 Raphaël Hertzog"
+#: dpkg-buildpackage.1:265 dpkg-source.1:628
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgstr "Upphovsrättsskyddat © 2007-2009 Raphaël Hertzog"
#. type: TH
#: dpkg-checkbuilddeps.1:1
@@ -7093,13 +7348,13 @@ msgstr ""
"källkodsträdets changelog-fil."
#. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:103
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:104
#, no-wrap
msgid "B<-V>I<name>B<=>I<value>"
msgstr "B<-V>I<namn>B<=>I<värde>"
#. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:107
+#: dpkg-genchanges.1:76 dpkg-source.1:108
msgid ""
"Set an output substitution variable. See B<deb-substvars>(5) for a "
"discussion of output substitution."
@@ -7109,7 +7364,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:107
+#: dpkg-source.1:108
#, no-wrap
msgid "B<-T>I<substvarsfile>"
msgstr "B<-T>I<substvars-fil>"
@@ -7130,29 +7385,29 @@ msgstr ""
"substitutionsvariabler från flera filer."
#. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:113
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:114
#, no-wrap
msgid "B<-D>I<field>B<=>I<value>"
msgstr "B<-D>I<fält>B<=>I<värde>"
#. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
msgid "Override or add an output control file field."
msgstr "Ersätt eller lägg till ett fält i den genererade control-filen."
#. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:116
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:117
#, no-wrap
msgid "B<-U>I<field>"
msgstr "B<-U>I<fält>"
#. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:119
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:120
msgid "Remove an output control file field."
msgstr "Ta bort ett fält ur den genererade control-filen."
#. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:80
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:81
#, no-wrap
msgid "B<-c>I<controlfile>"
msgstr "B<-c>I<control-fil>"
@@ -7168,7 +7423,7 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:87
+#: dpkg-source.1:88
#, no-wrap
msgid "B<-l>I<changelogfile>"
msgstr "B<-l>I<ändringsloggfil>"
@@ -7193,14 +7448,14 @@ msgstr ""
#. type: TP
#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:94
+#: dpkg-source.1:95
#, no-wrap
msgid "B<-F>I<changelogformat>"
msgstr "B<-F>I<ändringsloggformat>"
#. type: Plain text
#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:99
+#: dpkg-source.1:100
msgid ""
"Specifies the format of the changelog. By default the format is read from a "
"special line near the bottom of the changelog or failing that defaults to "
@@ -8653,6 +8908,138 @@ msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
msgstr "Upphovsrättsskyddat © 2007-2009 Raphaël Hertzog"
#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "dpkg-parsechangelog"
+msgid "dpkg-mergechangelogs"
+msgstr "dpkg-parsechangelog"
+
+#. type: TH
+#: dpkg-mergechangelogs.1:1
+#, fuzzy, no-wrap
+#| msgid "2010-01-28"
+msgid "2010-04-18"
+msgstr "2010-01-28"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:4
+#, fuzzy
+#| msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
+msgstr "dpkg-parsechangelog - tolka Debians ändringsloggar"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:8
+#, fuzzy
+#| msgid "B<dpkg-trigger> [I<option>...] I<command>"
+msgid ""
+"B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
+msgstr "B<dpkg-trigger> [I<flaggor>...] I<kommando>"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:15
+msgid ""
+"This program will use the 3 provided versions of the Debian changelog to "
+"generate a merged changelog file. The resulting changelog is stored in the "
+"file I<out> or output to the standard output if that parameter is not given."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:26
+msgid ""
+"Each entry is identified by its version number and they are assumed to be "
+"not conflicting, they are simply merged in the right order (by decreasing "
+"version number). When B<--merge-prereleases> is used, the part of the "
+"version number after the last tilde is dropped so that 1.0-1~exp1 and 1.0-"
+"1~exp5 are considered to be the same entry. When the same version is "
+"available in both I<new-a> and I<new-b>, a standard line-based 3-way merge "
+"is attempted (provided that the module Algorithm::Merge is available \\[em] "
+"it's part of the package libalgorithm-merge-perl \\[em] otherwise you get a "
+"global conflict on the content of the entry)."
+msgstr ""
+
+#. type: TP
+#: dpkg-mergechangelogs.1:28
+#, no-wrap
+msgid "B<--merge-prereleases>, B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:33
+msgid ""
+"Drop the part after the last tilde in the version number when doing version "
+"comparison to identify if two entries are supposed to be the same or not."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:38
+msgid ""
+"This is useful when you keep using the same changelog entry but you increase "
+"its version number regularly. For instance, you might have 2.3-1~exp1, 2.3-"
+"1~exp2, ... until the official release 2.3-1 and they are all the same "
+"changelog entry that has evolved over time."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:45
+#, fuzzy, no-wrap
+#| msgid "ACTIONS"
+msgid "LIMITATIONS"
+msgstr "ÅTGÄRDER"
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:50
+msgid ""
+"Anything that is not parsed by Dpkg::Changelog is lost during the merge. "
+"This might include stuff like vim modelines, comments which were not "
+"supposed to be there, etc."
+msgstr ""
+
+#. type: SH
+#: dpkg-mergechangelogs.1:51
+#, no-wrap
+msgid "INTEGRATION WITH GIT"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:56
+msgid ""
+"If you want to use this program to merge Debian changelog files in a git "
+"repository, you have first to register a new merge driver in B<.git/config> "
+"or B<~/.gitconfig>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:60
+#, no-wrap
+msgid ""
+" [merge \"dpkg-mergechangelogs\"]\n"
+" name = debian/changelog merge driver\n"
+" driver = dpkg-mergechangelogs -m %O %A %B %A\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:64
+msgid ""
+"Then you have to setup the merge attribute for the debian/changelog file "
+"either in B<.gitattributes> in the repository itself, or in B<.git/info/"
+"attributes>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:66
+#, no-wrap
+msgid " debian/changelog merge=dpkg-mergechangelogs\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-mergechangelogs.1:68
+#, fuzzy
+#| msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2009-2010 Rapha\\[:e]l Hertzog"
+msgstr "Upphovsrättsskyddat © 2007-2008 Raphaël Hertzog"
+
+#. type: TH
#: dpkg-name.1:6
#, no-wrap
msgid "dpkg-name"
@@ -9124,12 +9511,13 @@ msgid "B<--all>"
msgstr "B<--all>"
#. type: Plain text
-#: dpkg-parsechangelog.1:107
-msgid "include all changes."
-msgstr "ta med alla ändringar."
+#: dpkg-parsechangelog.1:108
+msgid ""
+"include all changes. Note: other options have no effect when this is in use."
+msgstr ""
#. type: Plain text
-#: dpkg-parsechangelog.1:113
+#: dpkg-parsechangelog.1:114
msgid ""
"All B<Parser Options> except for -v are only supported in B<dpkg>, version "
"1.14.16 and later. Third party parsers for changelog formats other than "
@@ -9140,13 +9528,13 @@ msgstr ""
"I<debian> kanske inte stöder alla flaggor."
#. type: TP
-#: dpkg-parsechangelog.1:115
+#: dpkg-parsechangelog.1:116
#, no-wrap
msgid "B<debian/changelog>"
msgstr "B<debian/changelog>"
#. type: Plain text
-#: dpkg-parsechangelog.1:121
+#: dpkg-parsechangelog.1:122
msgid ""
"The changelog file, used to obtain version-dependent information about the "
"source package, such as the urgency and distribution of an upload, the "
@@ -9159,7 +9547,7 @@ msgstr ""
"på källkoden."
#. type: Plain text
-#: dpkg-parsechangelog.1:128
+#: dpkg-parsechangelog.1:129
msgid "Copyright \\(co 2007, 2008 Frank Lichtenheld"
msgstr "Upphovsrättsskyddat © 2007, 2008 Frank Lichtenheld"
@@ -10851,13 +11239,22 @@ msgstr ""
"ytterligare parametrar kanske godtas."
#. type: Plain text
-#: dpkg-source.1:65
+#: dpkg-source.1:66
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-source> will build the source package with the first format found "
+#| "in this ordered list: the format indicated with the I<--format> command-"
+#| "line option, the format indicated in B<debian/source/format>, \"1.0\". "
+#| "See section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
+#| "various source package formats."
msgid ""
"B<dpkg-source> will build the source package with the first format found in "
"this ordered list: the format indicated with the I<--format> command-line "
-"option, the format indicated in B<debian/source/format>, \"1.0\". See "
-"section B<SOURCE PACKAGE FORMATS> for an extensive description of the "
-"various source package formats."
+"option, the format indicated in B<debian/source/format>, \"1.0\". The "
+"fallback to \"1.0\" is deprecated and will be removed at some point in the "
+"future, you should always document the desired source format in B<debian/"
+"source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
+"description of the various source package formats."
msgstr ""
"B<dpkg-source> kommer bygga källkodspaketet med det första format som "
"fungerar från denna lista i denna ordning: formatet som anges med "
@@ -10866,13 +11263,13 @@ msgstr ""
"beskrivning av de olika källkodspaketformaten."
#. type: TP
-#: dpkg-source.1:66
+#: dpkg-source.1:67
#, no-wrap
msgid "B<--print-format> I<directory>"
msgstr "B<--print-format> I<katalog>"
#. type: Plain text
-#: dpkg-source.1:71
+#: dpkg-source.1:72
msgid ""
"Print the source format that would be used to build the source package if "
"B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -10883,13 +11280,13 @@ msgstr ""
"parametrar)."
#. type: SH
-#: dpkg-source.1:79
+#: dpkg-source.1:80
#, no-wrap
msgid "GENERIC BUILD OPTIONS"
msgstr "ALLMÄNNA BYGGFLAGGOR"
#. type: Plain text
-#: dpkg-source.1:87
+#: dpkg-source.1:88
msgid ""
"Specifies the main source control file to read information from. The default "
"is B<debian/control>. If given with relative pathname this is interpreted "
@@ -10900,7 +11297,7 @@ msgstr ""
"källkodsträdets toppnivåkatalog."
#. type: Plain text
-#: dpkg-source.1:94
+#: dpkg-source.1:95
msgid ""
"Specifies the change log file to read information from. The default is "
"B<debian/changelog>. If given with relative pathname this is interpreted "
@@ -10911,13 +11308,13 @@ msgstr ""
"källkodsträdets toppnivåkatalog."
#. type: TP
-#: dpkg-source.1:99
+#: dpkg-source.1:100
#, no-wrap
msgid "B<--format=>I<value>"
msgstr "B<--format=>I<värde>"
#. type: Plain text
-#: dpkg-source.1:103
+#: dpkg-source.1:104
msgid ""
"Use the given format for building the source package. It does override any "
"format given in B<debian/source/format>."
@@ -10926,7 +11323,7 @@ msgstr ""
"ett eventuellt format som anges i B<debian/source/format>."
#. type: Plain text
-#: dpkg-source.1:113
+#: dpkg-source.1:114
msgid ""
"Read substitution variables in I<substvarsfile>; the default is to not read "
"any file. This option can be used multiple times to read substitution "
@@ -10937,13 +11334,13 @@ msgstr ""
"substitueringsvariabler från flera filer."
#. type: TP
-#: dpkg-source.1:119
+#: dpkg-source.1:120
#, no-wrap
msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
msgstr "B<-Z>I<komprimering>, B<--compression>=I<komprimering>"
#. type: Plain text
-#: dpkg-source.1:127
+#: dpkg-source.1:128
msgid ""
"Specify the compression to use for created files (tarballs and diffs). Note "
"that this option will not cause existing tarballs to be recompressed, it "
@@ -10958,13 +11355,13 @@ msgstr ""
"från och med dpkg-dev 1.15.5."
#. type: TP
-#: dpkg-source.1:127
+#: dpkg-source.1:128
#, no-wrap
msgid "B<-z>I<level>, B<--compression-level>=I<level>"
msgstr "B<-z>I<nivå>, B<--compression-level>=I<nivå>"
#. type: Plain text
-#: dpkg-source.1:133
+#: dpkg-source.1:134
msgid ""
"Compression level to use. As with B<-Z> it only affects newly created files. "
"Supported values are: I<1> to I<9>, I<best>, and I<fast>. I<9> is the "
@@ -10975,13 +11372,13 @@ msgstr ""
"(snabb). I<9> är förval."
#. type: TP
-#: dpkg-source.1:133
+#: dpkg-source.1:134
#, no-wrap
msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
msgstr "B<-i>[I<reg.uttr>], B<--diff-ignore>[=I<reg.uttr>]"
#. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:146
msgid ""
"You may specify a perl regular expression to match files you want filtered "
"out of the list of files for the diff. (This list is generated by a find "
@@ -11005,7 +11402,7 @@ msgstr ""
"som gäller."
#. type: Plain text
-#: dpkg-source.1:155
+#: dpkg-source.1:156
msgid ""
"This is very helpful in cutting out extraneous files that get included in "
"the diff, e.g. if you maintain your source in a revision control system and "
@@ -11028,13 +11425,13 @@ msgstr ""
"'($|/)')."
#. type: TP
-#: dpkg-source.1:155
+#: dpkg-source.1:156
#, no-wrap
msgid "B<--extend-diff-ignore>=I<regexp>"
msgstr "B<--extend-diff-ignore>=I<reg.uttr>"
#. type: Plain text
-#: dpkg-source.1:162
+#: dpkg-source.1:163
msgid ""
"The perl regular expression specified will extend the default regular "
"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
@@ -11048,13 +11445,13 @@ msgstr ""
"automatiskt genererade filer från skapandet av automatiska patchar."
#. type: TP
-#: dpkg-source.1:162
+#: dpkg-source.1:163
#, no-wrap
msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
msgstr "B<-I>[I<filmönster>], B<--tar-ignore>[=I<filmönster>]"
#. type: Plain text
-#: dpkg-source.1:171
+#: dpkg-source.1:172
msgid ""
"If this option is specified, the pattern will be passed to B<tar>(1)'s --"
"exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -11069,7 +11466,7 @@ msgstr ""
"skall uteslutas."
#. type: Plain text
-#: dpkg-source.1:176
+#: dpkg-source.1:177
msgid ""
"B<-I> by itself adds default --exclude options that will filter out control "
"files and directories of the most common revision control systems, backup "
@@ -11080,7 +11477,7 @@ msgstr ""
"säkerhetskopior, växlingsfiler och Libtool-byggutdatakataloger."
#. type: Plain text
-#: dpkg-source.1:188
+#: dpkg-source.1:189
msgid ""
"B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
"different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -11102,7 +11499,7 @@ msgstr ""
"dokumentation."
#. type: Plain text
-#: dpkg-source.1:191
+#: dpkg-source.1:192
msgid ""
"The default regexp and patterns for both options can be seen in the output "
"of the B<--help> command."
@@ -11111,42 +11508,42 @@ msgstr ""
"utdata för B<--help>-kommandot."
#. type: SH
-#: dpkg-source.1:191
+#: dpkg-source.1:192
#, no-wrap
msgid "GENERIC EXTRACT OPTIONS"
msgstr "ALLMÄNNA UPPACKNINGSFLAGGOR"
#. type: TP
-#: dpkg-source.1:192
+#: dpkg-source.1:193
#, no-wrap
msgid "B<--no-copy>"
msgstr "B<--no-copy>"
#. type: Plain text
-#: dpkg-source.1:195
+#: dpkg-source.1:196
msgid "Do not copy original tarballs near the extracted source package."
msgstr ""
"Kopiera inte original-tarbollar i närheten av det uppackade källkodspaketet."
#. type: TP
-#: dpkg-source.1:195
+#: dpkg-source.1:196
#, no-wrap
msgid "B<--no-check>"
msgstr "B<--no-check>"
#. type: Plain text
-#: dpkg-source.1:198
+#: dpkg-source.1:199
msgid "Do not check signatures and checksums before unpacking."
msgstr "Kontrollera inte signaturer och kontrollsummor före uppackning."
#. type: TP
-#: dpkg-source.1:198
+#: dpkg-source.1:199
#, no-wrap
msgid "B<--require-valid-signature>"
msgstr "B<--require-valid-signature>"
#. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:207
msgid ""
"Refuse to unpack the source package if it doesn't contain an OpenPGP "
"signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -11161,17 +11558,23 @@ msgstr ""
"share/keyrings/debian-maintainers.gpg>)."
#. type: SH
-#: dpkg-source.1:207
+#: dpkg-source.1:208
#, no-wrap
msgid "SOURCE PACKAGE FORMATS"
msgstr "FORMAT PÅ KÄLLKODSPAKET"
#. type: Plain text
-#: dpkg-source.1:212
-msgid ""
-"If you don't know what source format you should use, you should probably "
-"pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
-"default formats in the near future. See http://wiki.debian.org/Projects/"
+#: dpkg-source.1:213
+#, fuzzy
+#| msgid ""
+#| "If you don't know what source format you should use, you should probably "
+#| "pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
+#| "default formats in the near future. See http://wiki.debian.org/Projects/"
+#| "DebSrc3.0 for information on the deployment of those formats within "
+#| "Debian."
+msgid ""
+"If you don't know what source format to use, you should probably pick either "
+"\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
"DebSrc3.0 for information on the deployment of those formats within Debian."
msgstr ""
"Om du inte vet vilket källkodspaketformat du skall använda, bör du "
@@ -11181,13 +11584,13 @@ msgstr ""
"produktion i Debian."
#. type: SS
-#: dpkg-source.1:213
+#: dpkg-source.1:214
#, no-wrap
msgid "Format: 1.0"
msgstr "Format: 1.0"
#. type: Plain text
-#: dpkg-source.1:217
+#: dpkg-source.1:218
msgid ""
"A source package in this format consists either of a B<.orig.tar.gz> "
"associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -11198,12 +11601,12 @@ msgstr ""
"paketet vara I<eget>, \"I<native>\")."
#. type: Plain text
-#: dpkg-source.1:219 dpkg-source.1:380 dpkg-source.1:520
+#: dpkg-source.1:220 dpkg-source.1:381 dpkg-source.1:521
msgid "B<Extracting>"
msgstr "B<Uppackning>"
#. type: Plain text
-#: dpkg-source.1:229
+#: dpkg-source.1:230
msgid ""
"Extracting a native package is a simple extraction of the single tarball in "
"the target directory. Extracting a non-native package is done by first "
@@ -11224,12 +11627,12 @@ msgstr ""
"det sättet), men kan inte ta bort filer (tomma filer kommer lämnas kvar)."
#. type: Plain text
-#: dpkg-source.1:231 dpkg-source.1:408 dpkg-source.1:525
+#: dpkg-source.1:232 dpkg-source.1:409 dpkg-source.1:526
msgid "B<Building>"
msgstr "B<Bygga>"
#. type: Plain text
-#: dpkg-source.1:237
+#: dpkg-source.1:238
msgid ""
"Building a native package is just creating a single tarball with the source "
"directory. Building a non-native package involves extracting the original "
@@ -11243,13 +11646,13 @@ msgstr ""
"katalogen."
#. type: TP
-#: dpkg-source.1:238
+#: dpkg-source.1:239
#, no-wrap
msgid "B<Build options (with -b):>"
msgstr "B<Byggflaggor (med -b):>"
#. type: Plain text
-#: dpkg-source.1:251
+#: dpkg-source.1:252
msgid ""
"If a second non-option argument is supplied it should be the name of the "
"original source directory or tarfile or the empty string if the package is a "
@@ -11267,7 +11670,7 @@ msgstr ""
"flaggorna."
#. type: Plain text
-#: dpkg-source.1:257
+#: dpkg-source.1:258
msgid ""
"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -11278,13 +11681,13 @@ msgstr ""
"B<-sR> anges i stället."
#. type: TP
-#: dpkg-source.1:257
+#: dpkg-source.1:258
#, no-wrap
msgid "B<-sk>"
msgstr "B<-sk>"
#. type: Plain text
-#: dpkg-source.1:266
+#: dpkg-source.1:267
msgid ""
"Specifies to expect the original source as a tarfile, by default "
"I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>. It will leave "
@@ -11299,24 +11702,24 @@ msgstr ""
"i I<katalog>B<.orig> för att generera diffen."
#. type: TP
-#: dpkg-source.1:266 dpkg-source.1:328
+#: dpkg-source.1:267 dpkg-source.1:329
#, no-wrap
msgid "B<-sp>"
msgstr "B<-sp>"
#. type: Plain text
-#: dpkg-source.1:271
+#: dpkg-source.1:272
msgid "Like B<-sk> but will remove the directory again afterwards."
msgstr "Som B<-sk>, men tar bort katalogen igen efteråt."
#. type: TP
-#: dpkg-source.1:271 dpkg-source.1:334
+#: dpkg-source.1:272 dpkg-source.1:335
#, no-wrap
msgid "B<-su>"
msgstr "B<-su>"
#. type: Plain text
-#: dpkg-source.1:279
+#: dpkg-source.1:280
msgid ""
"Specifies that the original source is expected as a directory, by default "
"I<package>B<->I<upstream-version>B<.orig> and B<dpkg-source> will create a "
@@ -11327,24 +11730,24 @@ msgstr ""
"originalkällkodsarkiv från den."
#. type: TP
-#: dpkg-source.1:279
+#: dpkg-source.1:280
#, no-wrap
msgid "B<-sr>"
msgstr "B<-sr>"
#. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:285
msgid "Like B<-su> but will remove that directory after it has been used."
msgstr "Som B<-su>, men tar bort katalogen när den har använts."
#. type: TP
-#: dpkg-source.1:284
+#: dpkg-source.1:285
#, no-wrap
msgid "B<-ss>"
msgstr "B<-ss>"
#. type: Plain text
-#: dpkg-source.1:292
+#: dpkg-source.1:293
msgid ""
"Specifies that the original source is available both as a directory and as a "
"tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -11358,13 +11761,13 @@ msgstr ""
"källkodsarkiv att skapas."
#. type: TP
-#: dpkg-source.1:292 dpkg-source.1:337
+#: dpkg-source.1:293 dpkg-source.1:338
#, no-wrap
msgid "B<-sn>"
msgstr "B<-sn>"
#. type: Plain text
-#: dpkg-source.1:298
+#: dpkg-source.1:299
msgid ""
"Specifies to not look for any original source, and to not generate a diff. "
"The second argument, if supplied, must be the empty string. This is used for "
@@ -11377,13 +11780,13 @@ msgstr ""
"separat uppströmskällkod och därför inte har någon debianiseringsdiff."
#. type: TP
-#: dpkg-source.1:298
+#: dpkg-source.1:299
#, no-wrap
msgid "B<-sa> or B<-sA>"
msgstr "B<-sa> eller B<-sA>"
#. type: Plain text
-#: dpkg-source.1:324
+#: dpkg-source.1:325
msgid ""
"Specifies to look for the original source archive as a tarfile or as a "
"directory - the second argument, if any, may be either, or the empty string "
@@ -11408,18 +11811,18 @@ msgstr ""
"B<-sA> är standard."
#. type: TP
-#: dpkg-source.1:324
+#: dpkg-source.1:325
#, no-wrap
msgid "B<Extract options (with -x):>"
msgstr "B<Extraheringsflaggor (med -x):>"
#. type: Plain text
-#: dpkg-source.1:328
+#: dpkg-source.1:329
msgid "In all cases any existing original source tree will be removed."
msgstr "Oavsett kommer ett befintligt källkodsträd att tas bort."
#. type: Plain text
-#: dpkg-source.1:334
+#: dpkg-source.1:335
msgid ""
"Used when extracting then the original source (if any) will be left as a "
"tarfile. If it is not already located in the current directory or if an "
@@ -11432,12 +11835,12 @@ msgstr ""
"(B<Detta är standard.>)"
#. type: Plain text
-#: dpkg-source.1:337
+#: dpkg-source.1:338
msgid "Unpacks the original source tree."
msgstr "Packar upp originalkällkodsträdet."
#. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:343
msgid ""
"Ensures that the original source is neither copied to the current directory "
"nor unpacked. Any original source tree that was in the current directory is "
@@ -11448,7 +11851,7 @@ msgstr ""
"katalogen tas fortfarande bort."
#. type: Plain text
-#: dpkg-source.1:347
+#: dpkg-source.1:348
msgid ""
"All the B<-s>I<X> options are mutually exclusive. If you specify more than "
"one only the last one will be used."
@@ -11457,24 +11860,24 @@ msgstr ""
"kommer endast den sista att användas."
#. type: TP
-#: dpkg-source.1:347 dpkg-source.1:493
+#: dpkg-source.1:348 dpkg-source.1:494
#, no-wrap
msgid "B<--skip-debianization>"
msgstr "B<--skip-debianization>"
#. type: Plain text
-#: dpkg-source.1:350
+#: dpkg-source.1:351
msgid "Skips application of the debian diff on top of the upstream sources."
msgstr "Hoppas över att tillämpa debian-diffen ovanpå uppströmskällkoden."
#. type: SS
-#: dpkg-source.1:351
+#: dpkg-source.1:352
#, no-wrap
msgid "Format: 2.0"
msgstr "Format: 2.0"
#. type: Plain text
-#: dpkg-source.1:355
+#: dpkg-source.1:356
msgid ""
"Also known as wig&pen. This format is not recommended for wide-spread usage, "
"the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11485,7 +11888,7 @@ msgstr ""
"specifikationen av en ny generation av källkodspaketformat."
#. type: Plain text
-#: dpkg-source.1:360
+#: dpkg-source.1:361
msgid ""
"The behaviour of this format is the same as the \"3.0 (quilt)\" format "
"except that it doesn't use an explicit list of patches. All files in "
@@ -11498,7 +11901,7 @@ msgstr ""
"måste vara giltiga patchar: de appliceras när paketet packas upp."
#. type: Plain text
-#: dpkg-source.1:363
+#: dpkg-source.1:364
msgid ""
"When building a new source package, any change to the upstream source is "
"stored in a patch named B<zz_debian-diff-auto>."
@@ -11507,13 +11910,13 @@ msgstr ""
"uppströmskällkoden att lagras i en patch som kallas B<zz_debian-diff-auto>."
#. type: SS
-#: dpkg-source.1:364
+#: dpkg-source.1:365
#, no-wrap
msgid "Format: 3.0 (native)"
msgstr "Format: 3.0 (eget)"
#. type: Plain text
-#: dpkg-source.1:370
+#: dpkg-source.1:371
msgid ""
"This format is an extension of the native package format as defined in the "
"1.0 format. It supports all compression methods and will ignore by default "
@@ -11526,13 +11929,13 @@ msgstr ""
"(se standardvärdet som är knutet till flaggan B<-i> i texten för B<--help>)."
#. type: SS
-#: dpkg-source.1:371
+#: dpkg-source.1:372
#, no-wrap
msgid "Format: 3.0 (quilt)"
msgstr "Format: 3.0 (quilt)"
#. type: Plain text
-#: dpkg-source.1:378
+#: dpkg-source.1:379
msgid ""
"A source package in this format contains at least an original tarball (B<."
"orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -11548,7 +11951,7 @@ msgstr ""
"\")."
#. type: Plain text
-#: dpkg-source.1:389
+#: dpkg-source.1:390
msgid ""
"The main original tarball is extracted first, then all additional original "
"tarballs are extracted in subdirectories named after the I<component> part "
@@ -11568,7 +11971,7 @@ msgstr ""
"binaries>)."
#. type: Plain text
-#: dpkg-source.1:401
+#: dpkg-source.1:402
msgid ""
"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
"series> are then applied. If the former file is used and the latter one "
@@ -11594,7 +11997,7 @@ msgstr ""
"bygget kommer troligen att misslyckas."
#. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:404
msgid ""
"Similarly to quilt's default behaviour, the patches can remove files too."
msgstr ""
@@ -11602,7 +12005,7 @@ msgstr ""
"fungerar."
#. type: Plain text
-#: dpkg-source.1:406
+#: dpkg-source.1:407
msgid ""
"The file B<.pc/applied-patches> is created if some patches have been applied "
"during the extraction."
@@ -11610,7 +12013,7 @@ msgstr ""
"Filen B<.pc/applied-patchers> skapas om patchar tillämpades vid uppackningen."
#. type: Plain text
-#: dpkg-source.1:418
+#: dpkg-source.1:419
msgid ""
"All original tarballs found in the current directory are extracted in a "
"temporary directory by following the same logic as for the unpack, the "
@@ -11631,7 +12034,7 @@ msgstr ""
"den till/tas bort från series-filen och från quilt-metadata."
#. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:427
msgid ""
"Any change on a binary file is not representable in a diff and will thus "
"lead to a failure unless the maintainer deliberately decided to include that "
@@ -11648,7 +12051,7 @@ msgstr ""
"de inte har vitlistats i B<debian/source/include-binaries>."
#. type: Plain text
-#: dpkg-source.1:429
+#: dpkg-source.1:430
msgid ""
"The updated debian directory and the list of modified binaries is then used "
"to generate the debian tarball."
@@ -11657,7 +12060,7 @@ msgstr ""
"används sedan för att skapa debian-tarbollen."
#. type: Plain text
-#: dpkg-source.1:435
+#: dpkg-source.1:436
msgid ""
"The automatically generated diff doesn't include changes on VCS specific "
"files as well as many temporary files (see default value associated to B<-i> "
@@ -11671,7 +12074,7 @@ msgstr ""
"den automatiska patchen skapas."
#. type: Plain text
-#: dpkg-source.1:448
+#: dpkg-source.1:449
msgid ""
"Note: B<dpkg-source> expects the source tree to have all patches listed in "
"the series file applied when you generate the source package. This is not "
@@ -11696,19 +12099,19 @@ msgstr ""
"preparation> kan användas för att slå av detta beteende."
#. type: Plain text
-#: dpkg-source.1:450 dpkg-source.1:505
+#: dpkg-source.1:451 dpkg-source.1:506
msgid "B<Build options>"
msgstr "B<Byggflaggor>"
#. type: TP
-#: dpkg-source.1:450
+#: dpkg-source.1:451
#, no-wrap
msgid "B<--allow-version-of-quilt-db=>I<version>"
msgstr "B<--allow-version-of-quilt-db=>I<version>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:458
+#: dpkg-source.1:459
msgid ""
"Allow B<dpkg-source> to build the source package if the version of the quilt "
"metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11723,13 +12126,13 @@ msgstr ""
"lagras i B<.pc/.version>."
#. type: TP
-#: dpkg-source.1:458
+#: dpkg-source.1:459
#, no-wrap
msgid "B<--include-removal>"
msgstr "B<--include-removal>"
#. type: Plain text
-#: dpkg-source.1:462
+#: dpkg-source.1:463
msgid ""
"Do not ignore removed files and include them in the automatically generated "
"patch."
@@ -11738,24 +12141,24 @@ msgstr ""
"patchen."
#. type: TP
-#: dpkg-source.1:462
+#: dpkg-source.1:463
#, no-wrap
msgid "B<--include-timestamp>"
msgstr "B<--include-timestamp>"
#. type: Plain text
-#: dpkg-source.1:465
+#: dpkg-source.1:466
msgid "Include timestamp in the automatically generated patch."
msgstr "Ta med tidsstämpel i den automatiskt genererade patchen."
#. type: TP
-#: dpkg-source.1:465
+#: dpkg-source.1:466
#, no-wrap
msgid "B<--include-binaries>"
msgstr "B<--include-binaries>"
#. type: Plain text
-#: dpkg-source.1:470
+#: dpkg-source.1:471
msgid ""
"Add all modified binaries in the debian tarball. Also add them to B<debian/"
"source/include-binaries>: they will be added by default in subsequent builds "
@@ -11766,13 +12169,13 @@ msgstr ""
"följande byggen och du behöver inte längre ange den här flaggan."
#. type: TP
-#: dpkg-source.1:470
+#: dpkg-source.1:471
#, no-wrap
msgid "B<--no-preparation>"
msgstr "B<--no-preparation>"
#. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:475
msgid ""
"Do not try to prepare the build tree by applying patches which are "
"apparently unapplied."
@@ -11781,14 +12184,14 @@ msgstr ""
"verkar ha tillämpas för närvarande."
#. type: TP
-#: dpkg-source.1:474
+#: dpkg-source.1:475
#, no-wrap
msgid "B<--single-debian-patch>"
msgstr "B<--single-debian-patch>"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:485
msgid ""
"Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
"changes->I<version> for the name of the automatic patch generated during "
@@ -11807,13 +12210,13 @@ msgstr ""
"exempel i det versionshanteringssystem som används."
#. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:485
#, no-wrap
msgid "B<--create-empty-orig>"
msgstr "B<--create-empty-orig>"
#. type: Plain text
-#: dpkg-source.1:490
+#: dpkg-source.1:491
msgid ""
"Automatically create the main original tarball as empty if it's missing and "
"if there are supplementary original tarballs. This option is meant to be "
@@ -11826,34 +12229,34 @@ msgstr ""
"inte finns något \"huvud\"-program."
#. type: Plain text
-#: dpkg-source.1:493
+#: dpkg-source.1:494
msgid "B<Extract options>"
msgstr "B<Extraheringsflaggor>"
#. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:497
msgid "Skips extraction of the debian tarball on top of the upstream sources."
msgstr "Hoppas över att packa upp debian-tarbollen ovanpå uppströmskällkoden."
#. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:497
#, no-wrap
msgid "B<--skip-patches>"
msgstr "B<--skip-patches>"
#. type: Plain text
-#: dpkg-source.1:499
+#: dpkg-source.1:500
msgid "Do not apply patches at the end of the extraction."
msgstr "Applicera inte patchar i slutet av uppackningen."
#. type: SS
-#: dpkg-source.1:500
+#: dpkg-source.1:501
#, no-wrap
msgid "Format: 3.0 (custom)"
msgstr "Format: 3.0 (skräddarsytt)"
#. type: Plain text
-#: dpkg-source.1:503
+#: dpkg-source.1:504
msgid ""
"This format is particular. It doesn't represent a real source package format "
"but can be used to create source packages with arbitrary files."
@@ -11862,7 +12265,7 @@ msgstr ""
"utan kan användas för att skapa källkodspaket med godtyckliga filer."
#. type: Plain text
-#: dpkg-source.1:509
+#: dpkg-source.1:510
msgid ""
"All non-option arguments are taken as files to integrate in the generated "
"source package. They must exist and are preferrably in the current "
@@ -11873,13 +12276,13 @@ msgstr ""
"Åtminstone en fil måste anges."
#. type: TP
-#: dpkg-source.1:509
+#: dpkg-source.1:510
#, no-wrap
msgid "B<--target-format=>I<value>"
msgstr "B<--target-format=>I<värde>"
#. type: Plain text
-#: dpkg-source.1:514
+#: dpkg-source.1:515
msgid ""
"B<Required>. Defines the real format of the generated source package. The "
"generated .dsc file will contain this value in its I<Format> field and not "
@@ -11890,13 +12293,13 @@ msgstr ""
"inte \"3.0 (custom)\"."
#. type: SS
-#: dpkg-source.1:515
+#: dpkg-source.1:516
#, no-wrap
msgid "Format: 3.0 (git) and 3.0 (bzr)"
msgstr "Format: 3.0 (git) och 3.0 (bzr)"
#. type: Plain text
-#: dpkg-source.1:518
+#: dpkg-source.1:519
msgid ""
"Those formats are experimental. They generate a single tarball containing "
"the corresponding VCS repository."
@@ -11905,7 +12308,7 @@ msgstr ""
"motsvarande VCS-arkiv."
#. type: Plain text
-#: dpkg-source.1:523
+#: dpkg-source.1:524
msgid ""
"The tarball is unpacked and then the VCS is used to checkout the current "
"branch."
@@ -11914,7 +12317,7 @@ msgstr ""
"aktuella grenen."
#. type: Plain text
-#: dpkg-source.1:528
+#: dpkg-source.1:529
msgid ""
"Before going any further, some checks are done to ensure that we don't have "
"any non-ignored uncommitted changes."
@@ -11923,7 +12326,7 @@ msgstr ""
"till att vi inte har några ej ignorerade ej incheckade ändringar."
#. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:533
msgid ""
"Then the VCS specific part of the source directory is copied over to a "
"temporary directory. Before this temporary directory is packed in a tarball, "
@@ -11934,19 +12337,115 @@ msgstr ""
"tarboll utförs viss städning för att spara plats."
#. type: SH
-#: dpkg-source.1:532
+#: dpkg-source.1:533
+#, no-wrap
+msgid "WARNINGS AND ERRORS"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:534
+#, no-wrap
+msgid "no source format specified in debian/source/format"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:540
+msgid ""
+"The file B<debian/source/format> should always exist and indicate the "
+"desired source format. For backwards compatibility, format \"1.0\" is "
+"assumed when the file doesn't exist but you should not rely on this: at some "
+"point in the future dpkg-source will be modified to fail when that file "
+"doesn't exist."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:546
+msgid ""
+"The rationale is that format \"1.0\" is no longer the recommended format, "
+"you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
+"(native)\") but B<dpkg-source> will not do this automatically for you. If "
+"you want to continue using the old format, you should be explicit about it "
+"and put \"1.0\" in B<debian/source/format>."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:546
+#, no-wrap
+msgid "the diff modifies the following upstream files"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:553
+msgid ""
+"When using source format \"1.0\" it is usually a bad idea to modify upstream "
+"files directly as the changes end up hidden and mostly undocumented in the ."
+"diff.gz file. Instead you should store your changes as patches in the debian "
+"directory and apply them at build-time. To avoid this complexity you can "
+"also use the format \"3.0 (quilt)\" that offers this natively."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:553
+#, no-wrap
+msgid "cannot represent change to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:559
+msgid ""
+"Changes to upstream sources are usually stored with patch files, but not all "
+"changes can be represented with patches: they can only alter the content of "
+"plain text files. If you try replacing a file with something of a different "
+"type (for example replacing a plain file with a symlink or a directory), you "
+"will get this error message."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:559
+#, no-wrap
+msgid "newly created empty file I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:562
+msgid ""
+"Empty files can't be created with patch files. Thus this change is not "
+"recorded in the source package and you are warned about it."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:562
+#, no-wrap
+msgid "executable mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:563
+#, no-wrap
+msgid "special mode I<perms> of I<file> will not be represented in diff"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:567
+msgid ""
+"Patch files do not record permissions of files and thus modified permissions "
+"are not stored in the source package. This warning reminds you of that fact."
+msgstr ""
+
+#. type: SH
+#: dpkg-source.1:567
#, no-wrap
msgid "FILE FORMATS"
msgstr "FILFORMAT"
#. type: SS
-#: dpkg-source.1:533
+#: dpkg-source.1:568
#, no-wrap
msgid "debian/source/format"
msgstr "debian/source/format"
#. type: Plain text
-#: dpkg-source.1:537
+#: dpkg-source.1:572
msgid ""
"This file contains on a single line the format that should be used to build "
"the source package (possible formats are described above). No leading or "
@@ -11957,13 +12456,13 @@ msgstr ""
"avslutande blanksteg tillåts."
#. type: SS
-#: dpkg-source.1:537
+#: dpkg-source.1:572
#, no-wrap
msgid "debian/source/include-binaries"
msgstr "debian/source/include-binaries"
#. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:576
msgid ""
"This file contains a list of binary files (one per line) that should be "
"included in the debian tarball. Leading and trailing spaces are stripped. "
@@ -11975,13 +12474,13 @@ msgstr ""
"som börjar med \"#\" är kommentarer och hoppas över. Tomma rader ignoreras."
#. type: SS
-#: dpkg-source.1:541
+#: dpkg-source.1:576
#, no-wrap
msgid "debian/source/options"
msgstr "debian/source/options"
#. type: Plain text
-#: dpkg-source.1:547
+#: dpkg-source.1:582
msgid ""
"This file contains a list of long options that should be automatically "
"prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -11994,7 +12493,7 @@ msgstr ""
"compression-level> är passande att lägga in i den här filen."
#. type: Plain text
-#: dpkg-source.1:553
+#: dpkg-source.1:588
msgid ""
"Each option should be put on a separate line. Empty lines and lines starting "
"with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -12008,7 +12507,7 @@ msgstr ""
"värdet. Här är ett exempel på en sådan fil:"
#. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:594
#, no-wrap
msgid ""
" # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -12024,7 +12523,7 @@ msgstr ""
" single-debian-patch\n"
#. type: Plain text
-#: dpkg-source.1:562
+#: dpkg-source.1:597
msgid ""
"Note: B<format> options are not accepted in this file, you should use "
"B<debian/source/format> instead."
@@ -12033,14 +12532,30 @@ msgstr ""
"filen B<debian/source/format> istället."
#. type: SS
-#: dpkg-source.1:562
+#: dpkg-source.1:597
+#, fuzzy, no-wrap
+#| msgid "debian/source/options"
+msgid "debian/source/local-options"
+msgstr "debian/source/options"
+
+#. type: Plain text
+#: dpkg-source.1:602
+msgid ""
+"Exactly like B<debian/source/options> except that the file is not included "
+"in the generated source package. It can be useful to store a preference tied "
+"to the maintainer or to the VCS repository where the source package is "
+"maintained."
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:602
#, no-wrap
msgid "debian/source/patch-header"
msgstr "debian/source/patch-header"
# type: Plain text
#. type: Plain text
-#: dpkg-source.1:565
+#: dpkg-source.1:605
msgid ""
"Free form text that is put on top of the automatic patch generated in "
"formats \"2.0\" or \"3.0 (quilt)\"."
@@ -12049,13 +12564,13 @@ msgstr ""
"formaten \"2.0\" eller \"3.0 (quilt)\"."
#. type: SS
-#: dpkg-source.1:565
+#: dpkg-source.1:605
#, no-wrap
msgid "debian/patches/series"
msgstr "debian/patches/series"
#. type: Plain text
-#: dpkg-source.1:574
+#: dpkg-source.1:614
msgid ""
"This file lists all patches that have to be applied (in the given order) on "
"top of the upstream source package. Leading and trailing spaces are "
@@ -12076,15 +12591,10 @@ msgstr ""
"anger början på en kommentar fram till slutet av raden)."
#. type: Plain text
-#: dpkg-source.1:581
+#: dpkg-source.1:621
msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
-#. type: Plain text
-#: dpkg-source.1:588
-msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
-msgstr "Upphovsrättsskyddat © 2007-2009 Raphaël Hertzog"
-
#. type: TH
#: dpkg-split.1:2
#, no-wrap
@@ -14170,6 +14680,228 @@ msgid "B<dselect>(1)."
msgstr "B<dselect>(1)."
#. type: TH
+#: maintscript-helper.1:1
+#, no-wrap
+msgid "maintscript-helper"
+msgstr ""
+
+#. type: TH
+#: maintscript-helper.1:1
+#, fuzzy, no-wrap
+#| msgid "2009-08-16"
+msgid "2010-04-16"
+msgstr "2009-08-16"
+
+#. type: Plain text
+#: maintscript-helper.1:4
+msgid ""
+"maintscript-helper - works around known dpkg limitations in maintainer "
+"scripts"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:8
+msgid ""
+"B<$DPKG_LIBDIR/maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+"script-parameters>"
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:9
+#, no-wrap
+msgid "COMMANDS AND PARAMETERS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:12
+msgid "B<rm_conffile> I<conffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:14
+msgid ""
+"B<mv_conffile> I<oldconffile> I<newconffile> I<lastversion> [I<package>]"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:20
+msgid ""
+"This program is designed to be run within maintainer scripts to achieve some "
+"tasks that dpkg can't (yet) handle natively either because of design "
+"decisions or due to current limitations."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:27
+msgid ""
+"Many of those tasks require coordinated actions from several maintainer "
+"scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+"the same call simply needs to be put in all scripts and the program will "
+"automatically adapt its behaviour based on the environment variable "
+"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
+"to forward after a double dash."
+msgstr ""
+
+#. type: SH
+#: maintscript-helper.1:28
+#, no-wrap
+msgid "CONFFILE RELATED TASKS"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:38
+msgid ""
+"When upgrading a package, dpkg will not automatically remove a conffile (a "
+"configuration file for which dpkg should preserve user changes) if it is not "
+"present in the newer version. There are two principal reasons for this; the "
+"first is that the conffile could've been dropped by accident and the next "
+"version could restore it, users wouldn't want their changes thrown away. The "
+"second is to allow packages to transition files from a dpkg-maintained "
+"conffile to a file maintained by the package's maintainer scripts, usually "
+"with a tool like debconf or ucf."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:42
+msgid ""
+"This means that if a package is intended to rename or remove a conffile, it "
+"must explicitly do so and B<maintscript-helper> can be used to implement "
+"graceful deletion and moving of conffiles within maintainer scripts."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:43
+#, no-wrap
+msgid "REMOVING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:49
+msgid ""
+"If a conffile is completely removed, it should be removed from disk, unless "
+"the user has modified it. If there are local modifications, they should be "
+"preserved. If the package upgrades aborts, the newly obsolete conffile "
+"should not disappear."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:52
+msgid ""
+"All of this is implemented by putting the following shell snippet in the "
+"B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:57
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper rm_conffile \\e\n"
+" I<conffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:64
+msgid ""
+"I<conffile> is the filename of the conffile to remove. I<lastversion> is "
+"the last version of the package that contained the conffile. I<package> is "
+"the package name, it's optional as it will default to "
+"$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of the "
+"package acted upon). All the parameters of the maintainer scripts have to be "
+"forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:72
+msgid ""
+"Current implementation: in the B<preinst>, it checks if the conffile was "
+"modified and renames it either to I<conffile>B<.dpkg-remove> (if not "
+"modified) or to I<conffile>B<.dpkg-bak> (if modified). The latter file is "
+"kept for reference as it contains user modifications but the former will be "
+"removed in the B<postinst>. If the package upgrade aborts, the B<postrm> "
+"reinstalls the original conffile. During purge, the B<postrm> will also "
+"delete the B<.dpkg-bak> file kept up to now."
+msgstr ""
+
+#. type: SS
+#: maintscript-helper.1:73
+#, no-wrap
+msgid "RENAMING A CONFFILE"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:80
+msgid ""
+"If a conffile is moved from one location to another, you need to make sure "
+"you move across any changes the user has made. This may seem a simple change "
+"to the B<preinst> script at first, however that will result in the user "
+"being prompted by dpkg to approve the conffile edits even though they are "
+"not responsible of them."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:84
+msgid ""
+"Graceful renaming can be implemented by putting the following shell snippet "
+"in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:89
+#, no-wrap
+msgid ""
+" if [ -x $DPKG_LIBDIR/maintscript-helper ]; then\n"
+" $DPKG_LIBDIR/maintscript-helper mv_conffile \\e\n"
+" I<oldconffile> I<newconffile> I<lastversion> I<package> -- \"$@\"\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:97
+msgid ""
+"I<oldconffile> and I<newconffile> are the old and new name of the conffile "
+"to rename. I<lastversion> is the last version of the package that contained "
+"the conffile with the old name. I<package> is the package name, it's "
+"optional as it will default to $DPKG_MAINTSCRIPT_PACKAGE (this variable is "
+"set by dpkg to the name of the package acted upon). All the parameters of "
+"the maintainer scripts have to be forwarded to the program after \"--\"."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:105
+msgid ""
+"Current implementation: the B<preinst> checks if the conffile has been "
+"modified, if yes it's left on place otherwise it's renamed to "
+"I<oldconffile>B<.dpkg-remove>. On configuration, the B<postinst> removes "
+"I<oldconffile>B<.dpkg-remove> and renames I<oldconffile> to I<newconffile> "
+"if I<oldconffile> is still available. On abort-upgrade/abort-install, the "
+"B<postrm> renames I<oldconffile>B<.dpkg-remove> back to I<oldconffile> if "
+"required."
+msgstr ""
+
+#. type: Plain text
+#: maintscript-helper.1:110
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2008 Joey Hess"
+msgstr "Upphovsrättsskyddat © 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:112
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2007 Guillem Jover"
+msgstr "Upphovsrättsskyddat © 2001 Joey Hess"
+
+#. type: Plain text
+#: maintscript-helper.1:114
+#, fuzzy
+#| msgid "Copyright \\(co 2000 Wichert Akkerman"
+msgid "Copyright \\(co 2005 Scott James Remnant"
+msgstr "Upphovsrättsskyddat © 2000 Wichert Akkerman"
+
+#. type: TH
#: start-stop-daemon.8:1
#, no-wrap
msgid "start-stop-daemon"
@@ -15778,6 +16510,101 @@ msgstr ""
msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
+#~ msgid ""
+#~ "Some environment variables defining compiler and linker options are set "
+#~ "to default values unless already present in the environment. Note that "
+#~ "this mechanism was only introduced in version 1.14.17 of dpkg-dev and not "
+#~ "all I<rules> files and build tools will honour these variables, yet."
+#~ msgstr ""
+#~ "Ett par miljövariabler som anger kompilator- och länkarflaggor återställs "
+#~ "till sina standardvärden såvida de inte redan har satts i miljön. "
+#~ "Observera att denna mekanism introducerades först i dpkg-dev version "
+#~ "1.14.17 och att inte alla I<rules>-filer och byggverktyg ännu godtar "
+#~ "dessa variabler."
+
+#~ msgid ""
+#~ "Optimization options which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default value: B<-g -"
+#~ "O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
+#~ "Overriding options can be used to explicitly set a higher optimization "
+#~ "level, or work around compiler bugs, which only can be seen with some "
+#~ "optimization levels (the last opt level \"wins\")."
+#~ msgstr ""
+#~ "Optimeringsflaggor som sänds till Debians byggsystem och kan/bör "
+#~ "överstyras av paketet som byggs om så behövs (standardvärde: B<-g -O2>, "
+#~ "eller B<-g -O0> om B<noopt> anges i DEB_BUILD_OPTIONS). Överstyrda "
+#~ "flaggor kan användas för att explicit välja en högre optimeringsnivå, "
+#~ "eller för att förbigå kompilatorfel som bara ses med vissa "
+#~ "optimeringsnivåer (den sist satta optimeringsnivån \"vinner\")."
+
+#~ msgid "B<CFLAGS_APPEND>"
+#~ msgstr "B<CFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Optimeringsflaggor som läggs till kompilatorflaggorna, vilka inte får "
+#~ "skrivas över av paketet (används huvudsakligen för testbyggen). "
+#~ "Standardvärde: tomt."
+
+#~ msgid "Same as B<CFLAGS> for C++ sources."
+#~ msgstr "Samma som B<CFLAGS> för C++-källkod."
+
+#~ msgid "B<CXXFLAGS_APPEND>"
+#~ msgstr "B<CXXFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for C++ sources."
+#~ msgstr "Samma som B<CFLAGS_APPEND> för C++-källkod."
+
+#~ msgid "Same as B<CFLAGS> for Fortran sources."
+#~ msgstr "Samma som B<CFLAGS> för Fortrankällkod."
+
+#~ msgid "B<FFLAGS_APPEND>"
+#~ msgstr "B<FFLAGS_APPEND>"
+
+#~ msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
+#~ msgstr "Samma som B<CFLAGS_APPEND> för Fortrankällkod."
+
+#~ msgid ""
+#~ "Preprocessor flags which are passed to the Debian build system and can/"
+#~ "should be overridden by the package build if needed (default: empty). "
+#~ "This macro is seldom used (most build systems just use B<CFLAGS> instead "
+#~ "of B<CPPFLAGS>)."
+#~ msgstr ""
+#~ "Förprocessorflaggor som sänds till Debians byggsystem och kan/bör "
+#~ "överstyras av paketet som byggs om så behövs (standardvärde: tomt). Detta "
+#~ "makro används sällan (de flesta byggsystem använder helt enkelt B<CFLAGS> "
+#~ "istället för B<CPPFLAGS>)."
+
+#~ msgid "B<CPPFLAGS_APPEND>"
+#~ msgstr "B<CPPFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Preprocessor flags appended to the preprocessor flags, which must not be "
+#~ "overwritten by the package (mostly used to for test builds). Default "
+#~ "value: empty."
+#~ msgstr ""
+#~ "Förprocessorflaggor som läggs till förprocessorflaggorna, vilka inte får "
+#~ "skrivas över av paketet (används huvudsakligen för testbyggen). "
+#~ "Standardvärde: tomt."
+
+#~ msgid "B<LDFLAGS_APPEND>"
+#~ msgstr "B<LDFLAGS_APPEND>"
+
+#~ msgid ""
+#~ "Optimization options appended to the compiler flags when linking code, "
+#~ "which must not be overwritten by the package (mostly used to for test "
+#~ "builds). Default value: empty."
+#~ msgstr ""
+#~ "Flaggor som läggs till kompilatorflaggorna vid länkning av kod, vilka "
+#~ "inte får skrivas över av paketet (används huvudsakligen för testbyggen). "
+#~ "Standardvärde: tomt."
+
+#~ msgid "include all changes."
+#~ msgstr "ta med alla ändringar."
+
#~ msgid "2009-11-12"
#~ msgstr "2009-11-12"
@@ -16469,13 +17296,6 @@ msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
#~ msgid "2008-03-14"
#~ msgstr "2008-03-14"
-#~ msgid ""
-#~ "B<dpkg-buildpackage> is a control script which can be used to help "
-#~ "automate the building of a package."
-#~ msgstr ""
-#~ "B<dpkg-buildpackage> är ett styrskript som kan användas för att göra det "
-#~ "enklare att automatisera paketbyggning."
-
#, fuzzy
#~ msgid ""
#~ "The B<-s>I<x> options control whether the original source archive is "
diff --git a/po/ast.po b/po/ast.po
index b401c39b6..71b20832c 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Debian dpkg 1.14.22\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-11-14 17:43+0100\n"
"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
"com>\n"
@@ -1188,7 +1188,7 @@ msgstr "fin de ficheru inesperáu al lleer `%.250s'"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "error al lleer del tubu de dpkg-deb"
@@ -1202,12 +1202,12 @@ msgstr "saltando ficheru ensin empaquetar '%.255s' (trocar o escluyir?)"
msgid "error setting timestamps of `%.255s'"
msgstr "error al afitar les dates de `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "error al afitar el propietariu de `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "error al afitar los permisos de `%.255s'"
@@ -1228,7 +1228,7 @@ msgstr ""
"falló amosar l'estáu (siguiendo enllaces) del destín del enllaz nuevu `"
"%.250s' pa l'enllaz simbólicu `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1237,17 +1237,17 @@ msgstr ""
"tentando sobrescribir `%.250s', que ye la versión esviada de `"
"%.250s' (paquete: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "tentando sobrescribir `%.250s', que ye la versión esviada de `%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "nun pudo amosase l'estáu de `%.255s' (que taba nel intre d'instalase)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1256,28 +1256,28 @@ msgstr ""
"nun pue llimpiase'l baruyu al rodiu de `%.255s' enantes d'instalar otra "
"versión"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"nun pue amosase l'estáu de `%.255s' restaurau enantes d'instalar otra versión"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "l'archivu contenía un oxetu `%.255s' de triba desconocía 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Reemplazando los ficheros del paquete antiguu %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Reemplazaos polos ficheros del paquete instalau %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1286,99 +1286,99 @@ msgstr ""
"tentando sobreescribir el direutoriu `%.250s' del paquete %.250s con un non "
"direutoriu"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "tentando sobreescribir `%.250s', que tamién ta nel paquete %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "imposible criar `%.255s' (mientres se procesab `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "mandase de dpkg-deb demientres `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "error al zarrar/escribir `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "error al criar el tubu `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "error al criar el preséu `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "error al criar l'enllaz duru `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "error al criar l'enllaz simbólicu `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "error al afitar el propietariu de l'enllaz simbólicu `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "error al criar el direutoriu `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "nun pue apartase `%.255s' pa instalar la versión nueva"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "nun pue lleese l'enllaz `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "nun pue facese enllaz simbólicu de seguridá pa `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "nun pue camudase'l dueñu de l'enllaz simbólicu de seguridá pa `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"nun pue facese l'enllaz de seguridá de `%.255s' enantes d'instalar la "
"versión nueva"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "nun pue instalase la versión nueva de `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "nun puede crease '%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "nun puede desfacese'l búfer `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1387,7 +1387,7 @@ msgstr ""
"inorando el problema de dependencies con %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1396,7 +1396,7 @@ msgstr ""
"valorando la desconfiguración del paquete\n"
" esencial %s, p'activar %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1405,7 +1405,7 @@ msgstr ""
"dpkg: non, %s ye esencial, nun va desconfigurase\n"
" col envís d'activar %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1414,28 +1414,28 @@ msgstr ""
"dpkg: non, nun pue continuase con %s (--auto-deconfigure aidará):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "eliminación de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalación de %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: albidrando desconfigurar %s, que frañaríase por %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: sí, desconfigurarase %s (frañáu por %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1444,11 +1444,11 @@ msgstr ""
"dpkg: tocante a %s que contién %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "escaeciendo'l frañamientu, ¡pue siguise lo mesmo!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1457,27 +1457,27 @@ msgstr ""
"instalar %.250s frañaría %.250s, y la\n"
" desconfiguración ta torgada (--auto-deconfigure pue aidar)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "instalar %.250s frañaría software esistente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: albidrando quitar %s en favor de %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s nun ta correutamente instaláu - escaeciendo lo que depende d'el.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: quitar %s pue dar problemes, porque ufre %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1486,69 +1486,69 @@ msgstr ""
"dpkg: el paquete %s requier reinstalación, pero va desaniciase de toes "
"maneres, como tu pidiste.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: el paquete %s requier reinstalación, nun va quitase.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "el paquete %s tien demasiaos pares Conflictu/Reemplaza"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: sí, quitarase %s en favor de %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "conflictu ente paquetes - nun s'instala %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "escaeciendo'l conflictu, ¡pue siguise igual!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive necesita polo menos un argumentu camín"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "falló la execución de find pa --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "falló facer fdopen nel tubu de find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "error al lleer el tubu de find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "error al zarrar el tubu de find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find pa --recursive devolvió l'error nun remanao %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "guetao, pero nun s'alcontraron paquetes (ficheros que concasen *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s necesita d'argumentu polo menos un ficheru d'archivu de paquete"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1559,33 +1559,33 @@ msgstr "--%s necesita d'argumentu polo menos un ficheru d'archivu de paquete"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Seleicionando el paquete enantes deseleicionáu %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Saltando'l paquete deseleicionáu %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "La versión %.250s de %.250s ya ta instalada, saltando.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "desactualizando %.250s de %.250s a %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2415,51 +2415,51 @@ msgstr "nun se pudieron establecer permisos d'execución en `%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "nun pue efeutuase setenv pal programa de caltenimientu"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "script %s instaláu"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "nun se pudo facer stat de %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "script %s nuevu"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "script %s vieyu"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nun pudo facese stat de %s '%.250s': %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - probando'l script del paquete nuevu nel so sitiu...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "nun hai un script na versión nueva del paquete - colando"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... paez que too foi bien.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "nun puede crease '%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "nun se pudo executar rm pa la llimpieza"
@@ -2900,17 +2900,7 @@ msgstr "eof inesperáu enantes del fin de la llinia %d"
msgid "need an action option"
msgstr "necesítase una opción d'aición"
-#: src/packages.c:75
-#, c-format
-msgid "--%s --pending does not take any non-option arguments"
-msgstr "--%s --pending nun garra dengún argumentu que nun seya una opción"
-
-#: src/packages.c:113 src/query.c:300 src/query.c:537
-#, c-format
-msgid "--%s needs at least one package name argument"
-msgstr "--%s necesita polo menos un nome de paquete como argumentu"
-
-#: src/packages.c:120
+#: src/packages.c:113
msgid ""
"you must specify packages by their own names, not by quoting the names of "
"the files they come in"
@@ -2919,12 +2909,22 @@ msgstr ""
"nomes\n"
"de los ficheros nos que vienen"
-#: src/packages.c:162
+#: src/packages.c:134
+#, c-format
+msgid "--%s --pending does not take any non-option arguments"
+msgstr "--%s --pending nun garra dengún argumentu que nun seya una opción"
+
+#: src/packages.c:139 src/query.c:300 src/query.c:537
+#, c-format
+msgid "--%s needs at least one package name argument"
+msgstr "--%s necesita polo menos un nome de paquete como argumentu"
+
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paquete %s llistáu más d'una vegada, sólo se procesa una.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2933,7 +2933,7 @@ msgstr ""
"¡Desempaquetóse más d'una copia del paquete %s!\n"
"Va configuráse solamente una vegada\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2942,78 +2942,78 @@ msgstr ""
"el paquete %.250s nun ta preparáu pa procesar disparadores\n"
"(l'estáu actual ye `%.250s' ensin disparadorse pendientes)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " El paquete `%s' apurre `%s' pero va desinstalase.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " El paquete `%s' va desinstalase.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " La versión de `%s' nel sistema ye %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" El paquete `%s' qu'apurre `%s' ta esperando al procesamientu de los "
"disparadores.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " El paquete %s ta esperando pol procesáu de disparadores.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: tamién configurando `%s' (requeríu por `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " El paquete `%s' qu'apurre`%s' entá nun se configuró.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " El paquete `%s' entá nun se configuró.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " El paquete `%s' qu'apurre %s nun s'instaló.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " El paquete «%s» nun s'instaló.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) france %s y ye %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) apurre %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " La versión de `%s' que se desconfigurará ye %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depende de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; por embargu:\n"
@@ -3021,38 +3021,38 @@ msgstr "; por embargu:\n"
msgid "(no description available)"
msgstr "(ensin descripción disponible)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "nun se puede acceder al ficheru"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "fallu al asegurase de que `%.250s' nun existe"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "fallu al executar dpkg-split pa ver si ye parte d'un multiparte"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "paquete reensambláu"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autentificando %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "fallu al executar debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "¡Falló la verificación del paquete %s!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3061,31 +3061,31 @@ msgstr ""
"Falló la verificación del paquete %s,\n"
"pero instalaráse de toles formes talo y como se solicitó\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "correuto\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "falló al criar nome de direutoriu temporal"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "fallá al executar dpkg-deb pa estrayer la información de control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Rexistrada la información sobro %s a partir de %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "l'arquitectura del paquete (%s) nun correspuende cola del sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3094,101 +3094,101 @@ msgstr ""
"dpkg: tocante a %s que contién %s, problema de predependencia:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema de predependencia - nun s'instala %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "descartando problema de predependencia!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Tresnando pa trocar %s %s (usando %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Desempaquetando %s (de %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"el nome del conffile (qu'entama por `%.250s')\n"
"ye abondu llargu (>%d carauteres)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "error de llectura en %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "fallu al zarrar %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "fallu intentando abrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Desconfigurando %s, pa poder desaniciar %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Desconfigurando %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Desempaquetando'l troquéu de %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "nun puede executase dpkg-deb pa obtener el ficheru"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "fallu al lleer la salida de tar de dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "sistema de ficheros del archivu-tar dañado - archivu de paquete frañáu"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zapea dables ceros finales"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"nun pudo efeutuase stat al fichero antiguu '%.250s' polo que nun se "
"desaniciará: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "nun puede desaniciase'l direutoriu antiguu '%.250s': %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr "el conffile antiguu '%.250s' yera un direutoriu ermu (y desanicióse)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "nun puede efeutuase `stat' otru ficheru nuevu `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3197,71 +3197,71 @@ msgstr ""
"el ficheru antiguu '%.250s' ye'l mesmu que dellos de los nuevos ficheros! "
"(tantu '%.250s' como '%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "nun se puede %s el ficheru antiguu '%.250s': %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "nun puede lleese'l direutoriu `info'"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"la versión antigua del paquete tien un nome de ficheru d'información\n"
"llarguísimu qu'entama per `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "nun puede desaniciase'l ficheru d'información obsoletu `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
"nun puede instalase'l (supuestamente) nuevu ficheru d'información `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "nun puede abrise'l direutoriu de control temporal"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"el paquete contién un nome de ficheru d'información llarguísimu\n"
"(entama con `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "la información de control del paquete contién el direutoriu `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "package control info rmdir of `%.250s' didn't say not a dir"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "el paquete %s contién list como ficheru d'información"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"nun puede instalase'l nuevu ficheru d'información `%.250s' como `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Note la desaparición de %s, que trocóse ensembre.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3902,7 +3902,7 @@ msgstr "dpkg-trigger: nome de paquete esperáu illegal `%.250s': %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "nome de disparador inválidu `%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3911,7 +3911,7 @@ msgstr ""
"%s: alcontróse un bucle al procesar los disparadores:\n"
" la cadena de paquetes cuyos disparadores son o pueden ser responsables:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3921,11 +3921,11 @@ msgstr ""
" disparadores pendientes de paquetes que nun son o pueden nun ser "
"resolubles:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "los disparadores entraron en bucle, desdexando"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Procesando disparadores pa %s ...\n"
diff --git a/po/bs.po b/po/bs.po
index 0b6a56ae0..c0d4d61c2 100644
--- a/po/bs.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1120,7 +1120,7 @@ msgstr ""
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr ""
@@ -1134,12 +1134,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr ""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr ""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr ""
@@ -1156,303 +1156,303 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr ""
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr ""
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr ""
-#: src/archives.c:579
+#: src/archives.c:582
#, fuzzy, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Ažurirani instalirani paketi"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr ""
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr ""
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr ""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr ""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr ""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr ""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr ""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr ""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr ""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr ""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr ""
-#: src/archives.c:831
+#: src/archives.c:839
#, c-format
msgid "unable to open '%.255s'"
msgstr ""
-#: src/archives.c:833
+#: src/archives.c:841
#, c-format
msgid "unable to sync file '%.255s'"
msgstr ""
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
"%s"
msgstr ""
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr ""
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr ""
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
"%s"
msgstr ""
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr ""
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr ""
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
"%s"
msgstr ""
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr ""
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr ""
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr ""
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr ""
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr ""
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr ""
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr ""
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr ""
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr ""
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1463,33 +1463,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr ""
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr ""
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr ""
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2236,51 +2236,51 @@ msgstr ""
msgid "unable to setenv for maintainer script"
msgstr ""
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr ""
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr ""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr ""
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr ""
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr ""
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr ""
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr ""
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr ""
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr ""
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr ""
@@ -2561,111 +2561,111 @@ msgstr ""
msgid "need an action option"
msgstr ""
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr ""
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr ""
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
" in this run ! Only configuring it once.\n"
msgstr ""
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
" (current status `%.250s' with no pending triggers)"
msgstr ""
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr ""
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr ""
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr ""
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr ""
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr ""
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr ""
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr ""
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr ""
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr ""
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr ""
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr ""
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr ""
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr "zavisi o"
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ""
@@ -2673,230 +2673,230 @@ msgstr ""
msgid "(no description available)"
msgstr ""
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr ""
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr ""
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr ""
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr ""
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr ""
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr ""
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
"but installing anyway as you requested.\n"
msgstr ""
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr ""
-#: src/processarc.c:195
+#: src/processarc.c:202
msgid "unable to create temporary directory"
msgstr ""
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr ""
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr ""
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr ""
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr ""
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr ""
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr ""
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr ""
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr ""
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr ""
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr ""
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr ""
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr ""
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr ""
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr ""
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr ""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr ""
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr ""
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr ""
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr ""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr ""
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr ""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr ""
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3439,25 +3439,25 @@ msgstr ""
msgid "invalid trigger name `%.250s': %.250s"
msgstr ""
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 955548639..69e78a24b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.1\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-03-12 00:09+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1182,7 +1182,7 @@ msgstr "s'ha trobat un fi de fitxer inesperat en llegir «%.250s»"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "s'ha produït un error en llegir des d'un conducte de dpkg-deb"
@@ -1196,12 +1196,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "s'ha produït un error en establir les dates de «%.255s»"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "s'ha produït un error en establir el propietari de «%.255s»"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "s'ha produït un error en establir els permisos de «%.255s»"
@@ -1222,7 +1222,7 @@ msgstr ""
"no s'ha pogut fer «stat» (dereferència) sobre l'objectiu del nou enllaç "
"simbòlic proposat «%.250s» per a l'enllaç simbòlic «%.250s»"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1231,18 +1231,18 @@ msgstr ""
"s'està intentant sobreescriure «%.250s», que és la versió desviada de "
"«%.250s» (paquet: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"s'està intentant sobreescriure «%.250s», que és la versió desviada de «%.250s»"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "no es pot fer «stat» sobre «%.255s» (que és el que s'anava a instal·lar)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1250,29 +1250,29 @@ msgid ""
msgstr ""
"no es pot netejar el desordre de «%.255s» abans d'instal·lar una altra versió"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"no es pot fer «stat» sobre el «%.255s» restablert abans d'instal·lar una altra "
"versió"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "l'arxiu conté l'objete «%.255s» de tipus 0x%x desconegut"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "S'està reemplaçant fitxers del paquet antic %s …\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Reemplaçat pels fitxers al paquet instal·lat %s …\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1281,105 +1281,105 @@ msgstr ""
"s'està intentant sobreescriure el directori «%.250s» del paquet %.250s %.250s "
"amb un no directori"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"s'està intentant sobreescriure «%.250s», que també està en el paquet %.250s "
"%.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "s'ha produït un error en llegir «%.255s» (en «%.255s»)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "rerefons dpkg-deb durant «%.255s»"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "s'ha produït un error en tancar/escriure «%.255s»"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "s'ha produït un error en crear el conducte «%.255s»"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "s'ha produït un error en crear el dispositiu «%.255s»"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "s'ha produït un error en crear l'enllaç dur «%.255s»"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "s'ha produït un error en crear l'enllaç simbòlic «%.255s»"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
"s'ha produït un error en establir el propietari de l'enllaç simbòlic «%.255s»"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "s'ha produït un error en crear el directori «%.255s»"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "no es pot moure «%.255s» per a instal·lar una versió nova"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "no es pot llegir l'enllaç «%.255s»"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
"no es pot fer una còpia de seguretat de l'enllaç simbòlic per a «%.255s»"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"no es pot fer «chown» sobre l'enllaç simbòlic de la còpia de seguretat de "
"«%.255s»"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"no es pot crear un enllaç de seguretat de «%.255s» abans d'instal·lar la "
"versió nova"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "no es pot instal·lar una versió nova de «%.255s»"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "no es pot crear «%.255s»"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "no es pot desfer la memòria temporal «%.255s»"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1388,7 +1388,7 @@ msgstr ""
"no es tindrà en compte el problema de dependència amb %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1397,7 +1397,7 @@ msgstr ""
"es considera la desconfiguració del paquet\n"
" essencial %s, per a habilitar %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1406,7 +1406,7 @@ msgstr ""
"dpkg: no, %s és essencial, no serà desconfigurat\n"
" per a habilitar %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1415,29 +1415,29 @@ msgstr ""
"dpkg: no, no es pot continuar amb %s (--auto-deconfigure ajudarà):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "supressió de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instal·lació de «%.255s»"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: es considera la desinstal·lació de %s, que seria trencat per %s …\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: sí, es desconfigurarà %s (trencat per %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1446,11 +1446,11 @@ msgstr ""
"dpkg: referent a %s que conté %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "s'ignorarà el trencament, es pot procedir igualment!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1459,31 +1459,31 @@ msgstr ""
"instal·lar %.250s trencaria %.250s, i\n"
" la deconfiguració no és permesa (--auto-deconfigure podria ajudar)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "la instal·lació del paquet %.250s trencaria el programari existent"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: es considera la desinstal·lació de %s en favor de %s …\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s no està correctament instal·lat - no es tindrà en compte cap dependència "
"d'aquest.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: poden haver-hi problemes en desinstal·lar %s, donat que proveeix a %s "
"…\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1492,70 +1492,70 @@ msgstr ""
"dpkg: el paquet %s requereix ser reinstal·lat, però es desinstal·larà tal i "
"com heu demanat.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: el paquet %s requereix ser reinstal·lat, no es desinstal·larà.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "el paquet %s té massa parelles de Conflicts/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: sí, es desinstal·larà %s en favor de %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "paquets en conflicte - no s'instal·larà %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "s'ignorarà el conflicte, es pot procedir igualment!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive necessita al menys un camí com a argument"
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr "«find» per a --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "no s'ha pogut fer «fdopen» al conducte de find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "s'ha produït un error en llegir el conducte de find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "s'ha produït un error en tancar el conducte de find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "La recerca emprant --recursive ha tornat l'eixida no gestionada %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"s'ha buscat, però no s'han trobat paquets (fitxers que coincidisquen amb *."
"deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s necessita al menys un paquet arxiu com a argument"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1566,33 +1566,33 @@ msgstr "--%s necessita al menys un paquet arxiu com a argument"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "S'està seleccionant el paquet %s prèviament no seleccionat.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "S'està ometent el paquet no seleccionat %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "La versió %.250s de %.250s ja és instal·lada, es descarta.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "s'està desactualitzant %.250s de %.250s a %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2440,52 +2440,52 @@ msgstr "no es poden establir els permisos d'execució en «%.250s»"
msgid "unable to setenv for maintainer script"
msgstr "no es pot fer «setenv» per al script del mantenidor"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "seqüència de «%s» antiga"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "no es pot fer «stat» sobre %s «%.250s»"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "seqüència %s nova"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "seqüència de «%s» antiga"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "no es pot fer «stat» sobre %s «%.250s»: %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - s'està provant la seqüència del paquet nou en el seu lloc …\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr ""
"no hi ha cap seqüència en la versió nova del paquet - s'està abandonant"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: … sembla que ha anat bé.\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "no es pot esborrar «%.255s» de forma segura"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "s'ha produït un error en executar «rm» per a netejar"
@@ -2939,30 +2939,30 @@ msgstr "eof inesperat abans de la fí de la línia %d"
msgid "need an action option"
msgstr "es necessita una opció d'acció"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"heu d'especificar els paquets pels seus noms propis, no citant els noms dels "
+"fitxers en els que venen"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending no pren cap argument que no sigui una opció"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s almenys necessita un nom de paquet com a argument"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"heu d'especificar els paquets pels seus noms propis, no citant els noms dels "
-"fitxers en els que venen"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paquet %s llistat més d'una vegada, només es processarà una.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2971,7 +2971,7 @@ msgstr ""
"S'ha desempaquetat més d'una còpia del paquet %s!\n"
" Només es configurarà una vegada.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2980,77 +2980,77 @@ msgstr ""
"el paquet %.250s no està llest per a processar activadors\n"
" (estat actual «%.250s» amb cap activador pendent)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " El paquet %s que proveeix %s serà desinstal·lat.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " El paquet %s serà desinstal·lat.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " La versió del paquet «%s» al sistema és %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" El paquet %s que proveeix %s està esperant el processat dels activadors.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " El paquet %s està esperant el processat dels activadors.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: també configura «%s» (requerit per «%s»)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " El paquet %s que proveeix %s no està configurat.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " El paquet %s encara no està configurat.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " El paquet %s que proveeix %s no està instal·lat.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " El paquet %s no està instal·lat.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) trenca %s i és %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) proveeix %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " La versió del paquet %s que es configurarà és %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depèn de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; tot i així:\n"
@@ -3058,39 +3058,39 @@ msgstr "; tot i així:\n"
msgid "(no description available)"
msgstr "(no hi ha cap descripció disponible)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "no es pot accedir a l'arxiu"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "s'ha produït un error en assegurar-se de que «%.250s» no existeix"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"no s'ha pogut executar dpkg-split per a veure si és part d'una part múltiple"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "paquet reensamblat"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "S'està autenticant %s …\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "no s'ha pogut fer «execl» sobre debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Ha fallat la verificació del paquet %s!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3099,31 +3099,31 @@ msgstr ""
"Ha fallat la verificació del paquet %s,\n"
"però s'instal·larà igualment tal i com heu demanat.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "correcte\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
msgid "unable to create temporary directory"
msgstr "no s'ha pogut crear el directori temporal"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
"no s'ha pogut executar dpkg-deb per a extreure la informació de control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "S'ha registrat la informació sobre %s a partir de %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "l'arquitectura del paquet (%s) no correspon amb la del sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3132,101 +3132,101 @@ msgstr ""
"dpkg: referent a %s que conté %s, problema de predependència:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema de predependència - no s'instal·larà %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "s'està ignorant el problema de predependència!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "S'està preparant per a reemplaçar %s %s (fent servir %s) …\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "S'està desempaquetant %s (de %s) …\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"el nom del conffile (que comença per «%.250s») és massa llarg (>%d caràcters)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "error de lectura en %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "s'ha produït un error en tancar %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "s'ha produït un error en intentar obrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "S'està desconfigurant %s, per a permetre la supressió de %s …\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "S'està desconfigurant %s …\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "S'està desempaquetant el reemplaçament de %.250s …\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"no es pot executar dpkg-deb per a obtindre l'arxiu del sistema de fitxers"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "s'ha produït un error en llegir l'eixida tar de dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "sistema de fitxers de l'arxiu tar corrupte - arxiu del paquet corrupte"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: esborra possibles zeros finals"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"no es pot fer «stat» sobre el fitxer antic «%.250s» així doncs no s'eliminarà: "
"%s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "no es pot esborrar el directori antic «%.250s»: %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr "el conffile «%.250s» era un directori buit (i s'ha eliminat)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "no es pot fer «stat» sobre el fitxer nou «%.250s»"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3235,71 +3235,71 @@ msgstr ""
"el fitxer antic «%.250s» és igual que diversos fitxers nous! («%.250s» i "
"«%.250s»)"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "no es pot esborrar el fitxer antic «%.250s» de format segura: %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "no es pot llegir el directori «info»"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"la versió antiga del paquet té un nom de fitxer d'informació llarguíssim que "
"comença per «%.250s»"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "no es pot esborrar el fitxer d'info. obsolet «%.250s»"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "no es pot instal·lar el (suposat) fitxer d'info. nou «%.250s»"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "no es pot obrir el directori de control temporal"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"el paquet conté un nom de fitxer d'info. llarguíssim (comença per «%.50s»)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "la info. de control del paquet conté el directori «%.250s»"
# Què collons vol dir això, i què collons vol dir la traducció?! jm
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"a l'esborrar el directori «%.250s» amb la informació de control del paquet "
"ocorregué un error diferent com de no ser un directori"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "el paquet %s conté «list» com a fitxer d'informació"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "no es pot instal·lar el fitxer d'info. nou «%.250s» com a «%.250s»"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Noteu la desaparició de %s, que ha estat completament reemplaçat.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3950,7 +3950,7 @@ msgstr "dpkg-trigger: el nom de paquet esperat «%.255s» és il·legal: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: el nom d'activador «%.250s» és il·legal: %.250s»"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3960,7 +3960,7 @@ msgstr ""
" cadena de paquets activadors dels quals són o podrien ser els "
"responsables:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3969,11 +3969,11 @@ msgstr ""
"\n"
"activadors pendents de paquets que són o poden ser irresolubles:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "hi ha un bucle d'activadors, s'ha abandonat"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "S'estan processant els activadors per a %s …\n"
diff --git a/po/cs.po b/po/cs.po
index b3dfb9b46..797441649 100644
--- a/po/cs.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-11-14 17:44+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1155,7 +1155,7 @@ msgstr "neočekávaný konec souboru v „%.250s“"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "chyba při čtení z roury od dpkg-deb"
@@ -1169,12 +1169,12 @@ msgstr "přeskakuji rozbalení souboru „%.255s“ (nahrazen nebo vyřazen?)"
msgid "error setting timestamps of `%.255s'"
msgstr "chyba při nastavování času u „%.255s“"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "chyba při nastavování vlastníka „%.255s“"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "chyba při nastavování práv „%.255s“"
@@ -1192,7 +1192,7 @@ msgid ""
msgstr ""
"selhalo dereferencování nového cíle („%.250s“) symbolického odkazu „%.250s“"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1200,143 +1200,143 @@ msgid ""
msgstr ""
"zkouším přepsat „%.250s“, což je odkloněná verze „%.250s“ (balík: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "zkouším přepsat „%.250s“, což je odkloněná verze „%.250s“"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "nelze zjistit stav souboru „%.255s“, který bude zrovna nainstalován"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "nelze uklidit nepořádek u „%.255s“ před nainstalováním další verze "
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"nelze zjistit stav obnoveného souboru „%.255s“ před nainstalováním další "
"verze"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "archiv obsahoval objekt „%.255s“ neznámého typu 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Nahrazuji soubory ve starém balíku %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Nahrazen soubory v nainstalovaném balíku %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "zkouším přepsat adresář „%.250s“ v balíku %.250s %.250s neadresářem"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "zkouším přepsat soubor „%.250s“, který je také v balíku %.250s %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "nelze vytvořit „%.255s“ (při zpracování „%.255s“)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "dpkg-deb během „%.255s“"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "chyba při uzavírání nebo zápisu „%.255s“"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "chyba při vytváření roury „%.255s“"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "chyba při vytváření spec. souboru „%.255s“"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "chyba při vytváření pevného odkazu „%.255s“"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "chyba při vytváření symbolického odkazu „%.255s“"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "chyba při nastavování vlastníka symbolického odkazu „%.255s“"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "chyba při vytváření adresáře „%.255s“"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "nelze odsunout „%.255s“ pro nainstalování nové verze"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "nelze přečíst odkaz „%.255s“"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "nelze vytvořit záložní symbolický odkaz pro „%.255s“"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "nelze změnit vlastníka záložního symbolického odkazu „%.255s“"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "nelze vytvořit záložní odkaz „%.255s“ před nainstalováním nové verze"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "nelze nainstalovat novou verzi „%.255s“"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "nelze vytvořit „%.255s“"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "nelze odbufferovat „%.255s“"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1345,7 +1345,7 @@ msgstr ""
"ignoruji problém se závislostmi akce „%s“:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1354,7 +1354,7 @@ msgstr ""
"zvažuji dekonfiguaci nezbytného balíku\n"
" %s, což by umožnilo akci „%s“."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1363,7 +1363,7 @@ msgstr ""
"dpkg: ne, balík %s je nezbytný, neprovedu jeho dekonfiguraci,\n"
" která by umožnila akci „%s“.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1372,29 +1372,29 @@ msgstr ""
"dpkg: ne, nelze pokračovat s akcí „%s“ (pomůže --auto-deconfigure):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "odstranění %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalace %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: zvažuji dekonfiguraci balíku %s, který by byl porušen akcí „%s“...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ano, dekonfiguruji %s (porušen balíkem %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1403,11 +1403,11 @@ msgstr ""
"dpkg: ohledně %s obsahující balík %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "ignoruji porušení, zkouším pokračovat!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1416,29 +1416,29 @@ msgstr ""
"instalace balíku %.250s by porušila balík %.250s a\n"
" dekonfigurace není povolena (mohlo by pomoci --auto-deconfigure)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "instalace balíku %.250s by porušila stávající software"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: zvažuji odstranění %s ve prospěch %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"balík %s není správně nainstalován - ignoruji všechny závislosti na něm.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: možné problémy s odstraněním balíku %s, protože poskytuje %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1447,70 +1447,70 @@ msgstr ""
"dpkg: balík %s vyžaduje přeinstaci, ale bude odstraněn podle vašeho "
"požadavku.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
"dpkg: balík %s vyžaduje přeinstalaci, nebudu nepokračovat v odinstalaci.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "balík %s má příliš mnoho dvojic Koliduje/Nahrazuje"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ano, odstraním %s ve prospěch %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "konflikt balíků - nebudu instalovat %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "ignoruji konflikt, zkouším pokračovat!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive vyžaduje alespoň jednu cestu"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "chyba při spuštění find pro --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "nelze provést fdopen na rouře od příkazu find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "chyba při čtení z roury příkazu find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "chyba při zavírání roury od příkazu find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "hledání --recursive vrátilo neošetřenou chybu %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "prohledáno, ale nebyl nalezen žádný balík (soubory vyhovující *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s vyžaduje jako argument alespoň jeden soubor s balíkem"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1521,33 +1521,33 @@ msgstr "--%s vyžaduje jako argument alespoň jeden soubor s balíkem"
msgid "<standard output>"
msgstr "<standardní výstup>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<chybový výstup>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Instaluji balík %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Přeskakuji balík %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Verze %.250s balíku %.250s je již nainstalována, přeskakuji.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "instaluji starší verzi %.250s z %.250s na %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2372,51 +2372,51 @@ msgstr "nelze nastavit spustitelné právo na „%.250s“"
msgid "unable to setenv for maintainer script"
msgstr "nelze nastavit proměnné prostředí pro konfigurační skript"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "instalovaný %s skript"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "nelze zjistit stav %s „%.250s“"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nový %s skript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "starý %s skript"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nelze zjistit stav %s „%.250s“: %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - zkouším raději skript z nově nainstalovaného balíku ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "v nové verzi balíku není žádný skript - končím"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... vypadá to, že se vše povedlo.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "nelze vytvořit „%.255s“"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "spuštění rm pro úklid selhalo"
@@ -2830,30 +2830,30 @@ msgstr "neočekávaný konec souboru před koncem řádku %d"
msgid "need an action option"
msgstr "potřebuji zadat akci"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"balíky musíte zadávat jejich vlastními názvy, a ne názvy souborů, ve kterých "
+"jsou obsaženy"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending nemá žádný volitelný argument"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s vyžaduje alespoň jedno jméno balíku"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"balíky musíte zadávat jejich vlastními názvy, a ne názvy souborů, ve kterých "
-"jsou obsaženy"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Balík %s specifikován více než jednou, zpracovávám pouze jednou.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2862,7 +2862,7 @@ msgstr ""
"Byla rozbalena více než jedna kopie balíku %s\n"
" v tomto běhu ! Konfiguruji jen jednou.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2871,76 +2871,76 @@ msgstr ""
"balík %.250s není připraven ke zpracování spouštěčů\n"
" (současný stav „%.250s“ s žádnými nevyřízenými spouštěči)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Balík %s poskytující %s bude odstraněn.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Balík %s bude odstraněn.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Verze %s v systému je %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Balík %s poskytující %s očekává zpracování spouštěčů.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Balík %s očekává zpracování spouštěčů.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: také konfiguruji „%s“ (vyžadováno balíkem „%s“)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Balík %s poskytující %s zatím není zkonfigurován.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Balík %s zatím není zkonfigurován.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Balík %s poskytující %s není nainstalován.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Balík %s není nainstalován.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) porušuje %s a je %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) poskytuje %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Verze %s pro konfiguraci je %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " závisí na "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; avšak:\n"
@@ -2948,38 +2948,38 @@ msgstr "; avšak:\n"
msgid "(no description available)"
msgstr "(popis není k dispozici)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "nelze přistoupit k archivu"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "chyba při ověřování, že „%.250s“ neexistuje"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "chyba při spuštění dpkg-split pro kontrolu rozdělení na části"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "spojený balík"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Kontroluji autenticitu %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "chyba při spuštění debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Kontrola balíku %s selhala!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2988,31 +2988,31 @@ msgstr ""
"Kontrola podpisu balíku %s selhala,\n"
"ale přesto instaluji.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "úspěšná\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "nelze vytvořit dočasný adresář"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "chyba při spouštění dpkg-deb k získání informací z control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Zaznamenány informace o %s z %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "architektura balíku (%s) se neshoduje se systémem (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3021,100 +3021,100 @@ msgstr ""
"dpkg: dívám se na %s obsahující %s, před-závislostní problém:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "před-závislostní problém - neinstaluji %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "ignoruji před-závislostní problém!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Připravuji nahrazení %s %s (pomocí %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Rozbaluji %s (z %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"název konfiguračního souboru (počátek cesty „%.250s“) je příliš dlouhý (>%d "
"znaků)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "chyba čtení v %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "chyba uzavření v %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "chyba při pokusu o otevření %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Dekonfiguruji %s, aby mohl být odstraněn %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Dekonfiguruji %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Rozbaluji náhradu %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "nelze spustit dpkg-deb pro získání obsahu balíku"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "chyba při čtení tar výstupu z dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "poškozený systémový tar soubor - poškozený balík"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: ruším možné koncové nuly"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "nelze zjistit stav starého souboru „%.250s“, tudíž jej nemažu: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "nelze smazat starý adresář „%.250s“: %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"starý konfigurační soubor „%.250s“ byl prázdným adresářem a byl proto smazán"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "nelze zjistit stav nového souboru „%.250s“"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3123,66 +3123,66 @@ msgstr ""
"starý soubor „%.250s“ je stejný jako některé nové soubory! („%.250s“ i "
"„%.250s“)"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "nelze %s starý soubor „%.250s“: %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "nelze přečíst adresář info"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"stará verze balíku má příliš dlouhé jméno info souboru, který začíná „%.250s“"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "nelze odstranit starý info soubor „%.250s“"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "nelze instalovat nový info soubor „%.250s“"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "nelze otevřít dočasný kontrolní adresář"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "balík obsahuje příliš dlouhé jméno info souboru (začíná „%.50s“)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "informace o balíku obsahují adresář „%.250s“"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "informace o balíku rmdir na „%.250s“ neřekl, že to není adresář"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "balík %s obsahoval seznam jako info soubor"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "nelze instalovat nový info soubor „%.250s“ jako „%.250s“"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Poznamenávám zmizení balíku %s, který byl úplně nahrazen.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "nelze smazat mizící kontrolní info soubor „%.250s“"
@@ -3804,7 +3804,7 @@ msgstr "dpkg-trigger: nedovolené jméno očekávajícího balíku „%.250s“:
msgid "invalid trigger name `%.250s': %.250s"
msgstr "neplatné jméno spouštěče „%.250s“: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3813,7 +3813,7 @@ msgstr ""
"%s: při zpracování spouštěčů byl nalezen cyklus:\n"
" řetěz balíků, jejichž spouštěče mohou být zodpovědné:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3822,11 +3822,11 @@ msgstr ""
"\n"
" nevyřízené spouštěče, které se nemusí podařit zpracovat:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "spouštěče tvoří cyklus, přerušeno"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Zpracování spouštěčů pro balík %s ...\n"
diff --git a/po/da.po b/po/da.po
index 7a98f1756..62e605e1f 100644
--- a/po/da.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2007-09-06 22:02+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -1147,7 +1147,7 @@ msgstr "uventet filafslutning i %.250s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "fejl ved lsning fra dpkg-deb viderefrsel"
@@ -1161,12 +1161,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "fejl ved indstilling af tidsmrker for '%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "fejl ved indstilling af ejerskab for '%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "fejl ved indstilling af filrettigheder for '%.255s'"
@@ -1184,7 +1184,7 @@ msgid ""
msgstr ""
"kunne ikke flge det foreslede ml `%.250s' for den symbolske lnke `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1193,18 +1193,18 @@ msgstr ""
"forsger at overskrive '%.250s', som er den omdirigerede version af "
"'%.250s'(pakke: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"forsger at overskrive '%.250s', som er den omdirigerede version af `%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "kunne ikke finde '%.255s' (som jeg skulle til at installere)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1213,127 +1213,127 @@ msgstr ""
"kunne ikke rydde op i rodet omkring '%.255s', inden jeg installerede en "
"anden version"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"kunne ikke finde genskabt '%.255s', inden jeg installerede en anden version"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arkivet indeholdt objektet '%.255s' med ukendt type 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Erstatter filer i den gamle pakke %s...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Erstattet af filer i den installerede pakke %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "forsger at overskrive mappen '%.250s' i pakken %.250s med ikke-mappe"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "forsger at overskrive '%.250s', som ogs er i pakken %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "kunne ikke lse '%.255s' (i '%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "'backend' dpkg-deb under '%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "fejl under lukning/skrivning '%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "fejl under oprettelse af viderefrsel '%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "fejl under oprettelse af enhed '%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "fejl under oprettelse af hrd lnke '%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "fejl under oprettelse af symbolsk lnke '%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "fejl under indstilling af ejerskab af symbolsk lnke '%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "kunne ikke oprette mappen '%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "kunne ikke flytte '%.255s' vk for at installere en ny version"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "kunne ikke lse lnken '%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "kunne ikke oprette sikkerhedskopi af symbolsk lnke for '%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "kunne ikke ndre ejerskab af symbolsk lnke for '%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"kunne ikke oprette sikkerhedskopi af lnke til '%.255s' inden installationen "
"af en ny version"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "kunne ikke installere ny version af '%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "kunne ikke oprette '%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "kunne ikke lukke mellemlager for '%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1342,7 +1342,7 @@ msgstr ""
"dpkg: advarsel - ignorerer afhngighedsproblem med %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1351,7 +1351,7 @@ msgstr ""
"dpkg: advarsel - overvejer dekonfigurering af den essentielle\n"
" pakke %s for at muliggre %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1360,7 +1360,7 @@ msgstr ""
"dpkg: nej, %s er essentiel, vil ikke dekonfigurere\n"
" den for at muliggre %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1369,29 +1369,29 @@ msgstr ""
"dpkg: nej, kan ikke fortstte med %s (--auto-deconfigure vil hjlpe):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "afinstallation af %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "installation af %.255s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: overvejer at dekonfigurere %s, som ville vre i konflikt med %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ja, vil afkonfigurere %s (i konflikt med %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1400,13 +1400,13 @@ msgstr ""
"dpkg: vedrrende %s, der indeholder %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: advarsel - ignorerer konflikt, kan muligvis fortstte alligevel !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1415,28 +1415,28 @@ msgstr ""
"installation af %.250s ville vre i konflikt med %.250s, og\n"
" dekonfiguration er ikke tilladt (--auto-deconfigure kan hjlpe)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
"installation af %.250s ville vre i konflikt med eksisterende programmer"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: overvejer at afinstallere %s til fordel for %s...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s er ikke ordentligt installeret - ignorerer afhngigheder af den.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: kan f problemer med at afinstallere %s, da den giver %s...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1445,70 +1445,70 @@ msgstr ""
"dpkg: pakken %s krver geninstallation, men afinstalleres efter dit nske "
"alligevel.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: pakken %s krver geninstallation. Afinstalleres ikke.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pakken %s har for mange Conflicts/Replaces-par"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ja, vil afinstallere %s fil fordel for %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "modstridende pakker - installerer ikke %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: advarsel - ignorerer konflikt og fortstter alligevel.\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive krver mindst t stiargument"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "kunne ikke eksekvere 'find' for --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "kunne ikke udfre 'fdopen' p find's viderefrsel"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "fejl ved lsning af find's viderefrsel"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "fejl ved lukning af find's viderefrsel"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find for --recursive returnerede uforudset fejl %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "sgte, men fandt ingen pakker (filer, der matcher *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s krver mindst n pakkearkivfil som argument"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1519,33 +1519,33 @@ msgstr "--%s krver mindst n pakkearkivfil som argument"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Vlger tidligere fravalgt pakke %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Overspringer tidligere fravalgt pakke %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Version %.250s af %.250s er allerede installeret, springer over.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - advarsel: nedgraderer %.250s fra %.250s til %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2377,51 +2377,51 @@ msgstr "kunne ikke stte eksekveringsrettigheder for '%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "kunne ikke f status i vsnprintf"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "gammelt %s-script"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "kunne ikke finde %s '%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nyt %s-script"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "gammelt %s-script"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "kunne ikke finde %s '%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - forsger i stedet script fra ny pakke...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "der er intet script i den nye version af pakken - giver op"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... det ser ud til, at alt gik o.k.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "kunne ikke oprette '%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "kunne ikke udfre 'rm' for oprydning"
@@ -2850,29 +2850,29 @@ msgstr "uventet slut-p-fil fr afslutningen af linje %d"
msgid "need an action option"
msgstr "krver et handlings-tilvalg"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"du skal angive pakker ved deres egne navne, ikke ved de filnavne, de ligger i"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending tager ingen ikke-tilvalgs-parametre"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s krver mindst t pakkenavn som parameter"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"du skal angive pakker ved deres egne navne, ikke ved de filnavne, de ligger i"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Pakken %s nvnes flere gange, behandles kun n gang.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2881,7 +2881,7 @@ msgstr ""
"Flere kopier af pakken %s er blevet udpakket under\n"
" denne krsel! Konfigurerer den kun n gang.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2890,76 +2890,76 @@ msgstr ""
"pakken %.250s ikke klar til konfiguration\n"
" kan ikke konfigurere (nuvrende status '%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pakken %s, som giver %s, skal til at blive afinstalleret.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pakken %s skal til at blive afinstalleret.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Version af %s p systemet er %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pakken %s, som giver %s, skal til at blive afinstalleret.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pakken %s skal til at blive afinstalleret.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: konfigurerer ogs '%s' (krvet af '%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pakken %s, som giver %s, er ikke sat op endnu.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pakken %s er ikke sat op endnu.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Pakken '%s, som giver %s,' er ikke installeret.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pakken '%s' er ikke installeret.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) er i konflikt med %s og er %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) tilbyder %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versionen af %s, der skal stte op, er %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " afhnger af "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ", men:\n"
@@ -2967,39 +2967,39 @@ msgstr ", men:\n"
msgid "(no description available)"
msgstr "(ingen tilgngelig beskrivelse)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "kan ikke tilg arkivet"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "kunne ikke sikre, at '%.250s' ikke eksisteret"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"kunne ikke eksekvere 'dpkg-split' for at se om den er en del af multiparter"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "genskabte pakkefilen"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Godkender %s...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "kunne ikke eksekvere debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verifikation af %s mislykkedes!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3008,31 +3008,31 @@ msgstr ""
"Verifikation af %s mislykkedes,\n"
"man installerer alligevel, efter dit nske.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "godkendt\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "kunne ikke oprette midlertidig mappenavn"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "kunne ikke eksekvere dpkg-deb for at udtrkke kontrolinformation"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Gemte information om %s fra %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "pakkearkitekturen (%s) passer ikke til systemet (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3041,103 +3041,103 @@ msgstr ""
"dpkg: vedrrende %s, der indeholder %s, forhnds-afhngighedsproblem:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "forhndsafhngighedsproblem - installerer ikke %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: advarsel - ignorerer forhndsafhngighedsproblem!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Gr klar til at erstatte %s %s (med %s)...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Udpakker %s (fra %s)...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"navnet p konfigurationsfilen (starter med '%.250s') er for langt (>%d tegn)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "lsefejl i %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "fejl under lukning af %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "fejl ved forsg p at bne %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Dekonfigurerer %s, s %s kan afinstalleres...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Dekonfigurerer %s...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Udpakker erstatning %.250s...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "kunne ikke eksekvere 'dpkg-deb' for at hente filsystemarkiv"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "fejl ved lsning af dpkg-deb's tar-uddata"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "delagt filsystem-tarfil - delagt pakkearkiv"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: fjern mulige afsluttende nuller"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: advarsel - kunne ikke tilg den gamle fil '%.250s', s den slettes "
"ikke: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: advarsel - kunne ikke slette den gamle mappe '%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: advarsel - konfigurationsfil '%.250s' var en tom mappe (og her nu "
"blevet slettet)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "kunne ikke tilg den anden ny fil '%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3146,71 +3146,71 @@ msgstr ""
"dpkg: advarsel - den gamle fil '%.250s' er den samme som adskillige nye "
"filer! (bde %.250s' og'%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: advarsel - kunne ikke %s den gamle fil '%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "kan ikke lse info-mappe"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"den gamle version af pakken har et overdrevet langt filnavn, der starter med "
"'%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "kunne ikke slette forldet informationsfil '%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "kunne ikke installere (antaget) ny informationsfil '%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "kunne ikke bne midlertidigt kontrolmappe"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pakken indeholder et overdrevet langt informationsfilnavn (starter med "
"'%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "pakkekontrolinformation indeholdt mappen '%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"pakkekontrolinformation 'rmdir' af '%.250s' pstod, det ikke er en mappe"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: advarsel - pakken %s indeholdt en liste som informationsfil"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "kunne ikke installere ny informationsfil '%.250s' som '%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
"(Bemrker forsvindingen af %s, der er blevet fuldstndigt erstattet.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "kunne ikke slette forsvindende kontrolinformationsfil '%.250s'"
@@ -3831,25 +3831,25 @@ msgstr "'%s'-felt, ugyldigt pakkenavn '%.255s': %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "'%s'-felt, ugyldigt pakkenavn '%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Udrenser konfigurationsfiler for %s...\n"
diff --git a/po/de.po b/po/de.po
index 4ebdd7890..ae9781e07 100644
--- a/po/de.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-04-05 10:31+0200\n"
"Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1158,7 +1158,7 @@ msgstr "Unerwartetes EOF beim Lesen von »%.250s«"
msgid "error formatting string into varbuf variable"
msgstr "Fehler beim Formatieren von Zeichenkette in varbuf-Variable"
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "Fehler beim Lesen aus der dpkg-deb-Pipe"
@@ -1173,12 +1173,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "Fehler beim Setzen des Zeitstempels von »%.255s«"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "Fehler beim Setzen des Eigentümers von »%.255s«"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "Fehler beim Setzen der Zugriffsrechte von »%.255s«"
@@ -1199,7 +1199,7 @@ msgstr ""
"Konnte kein stat (Dereferenzierung) für vorgeschlagenes neues Symlink-Ziel "
"»%.250s« für Symlink »%250s« durchführen"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1208,20 +1208,20 @@ msgstr ""
"Versuche, »%.250s« zu überschreiben, welches die umgeleitete Version von "
"»%.250s« (Paket: %100s) ist"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"Versuche, »%.250s« zu überschreiben, welches die umgeleitete Version von "
"»%.250s« ist"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"Kann kein stat auf »%.255s« durchführen (was ich gerade installieren wollte)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1230,29 +1230,29 @@ msgstr ""
"Kann Unordnung um »%.255s« vor der Installation einer anderen Version nicht "
"aufräumen"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"Kann kein stat auf wiederhergestelltes »%.255s« vor der Installation einer "
"anderen Version durchführen"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "Archiv enthielt Objekt »%.255s« von unbekanntem Typ 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Ersetze die Dateien im alten Paket %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Ersetzt durch Dateien in installiertem Paket %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1261,102 +1261,102 @@ msgstr ""
"Versuche, Verzeichnis »%.250s« in Paket %.250s %.250s mit Nichtverzeichnis zu "
"überschreiben"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"Versuche, »%.250s« zu überschreiben, welches auch in Paket %.250s %.250s ist"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "Kann »%.255s« nicht anlegen (während der Verarbeitung von »%.255s«)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "Backend dpkg-deb während »%.255s«"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "Fehler beim Schließen/Schreiben von »%.255s«"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "Fehler beim Anlegen der Pipe »%.255s«"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "Fehler beim Anlegen des Geräts »%.255s«"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "Fehler beim Anlegen des festen Verweises »%.255s«"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "Fehler beim Anlegen des symbolischen Verweises »%.255s«"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "Fehler beim Setzen des Eigentümers des symbolischen Verweises »%.255s«"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "Fehler beim Anlegen des Verzeichnisses »%.255s«"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "Kann »%.255s« nicht aus dem Weg räumen, um neue Version zu installieren"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "Kann Verweis »%.255s« nicht lesen"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "Kann keinen symbolischen Verweis zur Sicherung von »%.255s« anlegen"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"Kann Eigentümer des symbolischen Verweises zur Sicherung von »%.255s« nicht "
"setzen"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"Kann keinen Verweis zur Sicherung von »%.255s« vor Installation der neuen "
"Version anlegen"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "Kann neue Version von »%.255s« nicht installieren"
-#: src/archives.c:831
+#: src/archives.c:839
#, c-format
msgid "unable to open '%.255s'"
msgstr "Kann »%.255s« nicht öffnen"
-#: src/archives.c:833
+#: src/archives.c:841
#, c-format
msgid "unable to sync file '%.255s'"
msgstr "Kann Datei »%.255s« nicht synchronisieren"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1365,7 +1365,7 @@ msgstr ""
"Ignoriere Abhängigkeitsproblem mit %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1374,7 +1374,7 @@ msgstr ""
"Ziehe Dekonfiguration des essenziellen Paketes\n"
" %s in Betracht, um %s zu ermöglichen."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1383,7 +1383,7 @@ msgstr ""
"dpkg: Nein, %s ist essenziell, werde es nicht dekonfigurieren,\n"
" um %s zu ermöglichen.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1392,17 +1392,17 @@ msgstr ""
"dpkg: Nein, kann nicht mit %s fortfahren (--auto-deconfigure wird helfen):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "Entfernen von %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "Installation von »%.250s«"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1410,12 +1410,12 @@ msgstr ""
"dpkg: Ziehe Dekonfiguration von %s in Betracht, welches durch %s beschädigt "
"würde ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: Ja, werde %s dekonfigurieren (beschädigt durch %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1424,11 +1424,11 @@ msgstr ""
"dpkg: Betreffend %s, welches %s enthält:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "Ignoriere Beschädigung, kann trotzdem weitermachen!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1437,29 +1437,29 @@ msgstr ""
"Installation von %.250s würde %.250s beschädigen, und\n"
" Dekonfiguration ist nicht erlaubt (--auto-deconfigure könnte helfen)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "Installation von %.250s würde existierende Software beschädigen"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: Ziehe Entfernen von %s zugunsten von %s in Betracht ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s ist nicht sauber installiert - ignoriere alle Abhängigkeiten darauf.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: Könnte Probleme haben, %s zu entfernen, da es %s bereitstellt ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1468,69 +1468,69 @@ msgstr ""
"dpkg: Paket %s erfordert Neuinstallation, wird aber auf Ihren Wunsch hin "
"trotzdem entfernt.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
"dpkg: Paket %s muss neu installiert werden, werde es nicht entfernen.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "Paket %s hat zu viele Conflicts/Replaces-Paare"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: Ja, werde %s zugunsten von %s entfernen.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "Kollidierende Pakete - installiere %.250s nicht"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "Ignoriere Kollision, kann trotzdem weitermachen!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive benötigt mindestens einen Pfad als Argument"
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr "find für dpkg --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "Konnte kein fdopen auf die Pipe von find durchführen"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "Fehler beim Lesen der Pipe von find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "Fehler beim Schließen der Pipe von find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "Suche für --recursive gab unbehandelten Fehler %i zurück"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "durchsucht, aber keine Pakete (auf *.deb passende Dateien) gefunden"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s benötigt mindestens eine Paket-Archivdatei als Argument"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1541,33 +1541,33 @@ msgstr "--%s benötigt mindestens eine Paket-Archivdatei als Argument"
msgid "<standard output>"
msgstr "<Standardausgabe>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<Standardfehlerausgabe>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Wähle vormals abgewähltes Paket %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Überspringe abgewähltes Paket %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Version %.250s von %.250s ist bereits installiert, übergehe es.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "Deaktualisiere %.250s von %.250s zu %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2402,51 +2402,51 @@ msgstr "Kann Ausführrechte für »%.250s« nicht setzen"
msgid "unable to setenv for maintainer script"
msgstr "Kann kein setenv für Betreuerskript durchführen"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "installiertes %s-Skript"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "Kann kein stat auf %s »%.250s« durchführen"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "neues %s-Skript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "altes %s-Skript"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "Kann kein stat auf %s »%.250s« durchführen: %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - probiere stattdessen Skript aus dem neuen Paket ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "Es gibt kein Skript in der neuen Version des Paketes - gebe auf"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... sieht so aus, als hätte das geklappt.\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "Kann »%.255s« nicht auf sichere Weise entfernen"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "Konnte rm nicht zum Aufräumen ausführen"
@@ -2891,30 +2891,30 @@ msgstr "unerwartetes EOF vor Ende der Zeile %d"
msgid "need an action option"
msgstr "benötige eine Aktions-Option"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"Sie müssen Pakete mit ihrem eigenen Namen angeben, nicht durch Angabe von "
+"Dateien, in denen sie geliefert werden"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending akzeptiert keine Nicht-Options-Argumente"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s benötigt mindestens ein Paketnamen-Argument"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"Sie müssen Pakete mit ihrem eigenen Namen angeben, nicht durch Angabe von "
-"Dateien, in denen sie geliefert werden"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paket %s mehr als einmal angegeben, wird nur einmal verarbeitet.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2923,7 +2923,7 @@ msgstr ""
"Mehr als eine Kopie des Paketes %s wurde in diesem Durchlauf\n"
" entpackt! Es wird nur einmal konfiguriert.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2932,76 +2932,76 @@ msgstr ""
"Paket %.250s ist nicht bereit zur Triggerverarbeitung\n"
" (momentaner Status »%.250s« ohne anhängige Trigger)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Paket %s, das %s bereitstellt, soll entfernt werden.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Paket %s soll entfernt werden.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Version von %s auf dem System ist %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Paket %s, das %s bereitstellt, wartet auf Triggerverarbeitung.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Paket %s wartet auf Triggerverarbeitung.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: Konfiguriere auch »%s« (benötigt von »%s«)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Paket %s, das %s bereitstellt, ist noch nicht konfiguriert.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Paket %s ist noch nicht konfiguriert.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Paket %s, das %s bereitstellt, ist nicht installiert.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Paket %s ist nicht installiert.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) beschädigt %s und ist %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) stellt %s bereit.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Zu konfigurierende Version von %s auf dem System ist %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " hängt ab von "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; aber:\n"
@@ -3009,41 +3009,41 @@ msgstr "; aber:\n"
msgid "(no description available)"
msgstr "(keine Beschreibung vorhanden)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "Kann auf das Archiv nicht zugreifen"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "Fehler beim Sicherstellen, dass »%.250s« nicht existiert"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"Fehler beim Ausführen von dpkg-split, um festzustellen, ob es Teil eines "
"Mehrteilers ist"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "Paketdatei wieder zusammengefügt"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Authentifiziere %s ...\n"
#
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "Konnte kein execl von debsig-verify durchführen"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Überprüfung von Paket %s fehlgeschlagen!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3052,31 +3052,31 @@ msgstr ""
"Überprüfung von Paket %s fehlgeschlagen,\n"
" aber installiere trotzdem, wie Sie gefordert haben.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "bestanden\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
msgid "unable to create temporary directory"
msgstr "Kann temporäres Verzeichnis nicht anlegen"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
"Konnte dpkg-deb nicht ausführen, um Control-Informationen zu extrahieren"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Info über %s aus %s aufgezeichnet.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "Paket-Architektur (%s) passt nicht zum System (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3085,100 +3085,100 @@ msgstr ""
"dpkg: Vor-Abhängigkeitsproblem betreffend %s, welches %s enthält:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "Vor-Abhängigkeitsproblem - installiere %.250s nicht"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "Ignoriere Vor-Abhängigkeitsproblem!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Vorbereiten zum Ersetzen von %s %s (durch %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Entpacke %s (aus %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "Name von Conffile (beginnend mit »%.250s«) ist zu lang (>%d Zeichen)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "Lesefehler in %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "Fehler beim Schließen von %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "Fehler beim Versuch, %.250s zu öffnen"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "De-konfiguriere %s, um %s entfernen zu können ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "De-konfiguriere %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Entpacke Ersatz für %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "Kann dpkg-deb nicht ausführen, um Dateisystem-Archiv zu erhalten"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "Fehler beim Lesen der dpkg-deb-tar-Ausgabe"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "defektes Tar-Dateisystem - Paketarchiv ist defekt"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: Lösche mögliche Nullen am Ende"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"Konnte kein stat auf alte Datei »%.250s« durchführen, lösche sie daher nicht: "
"%s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "Kann altes Verzeichnis »%.250s« nicht löschen: %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"Altes Conffile »%.250s« war ein leeres Verzeichnis (und wurde jetzt gelöscht)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "Kann kein stat auf andere neue Datei »%.250s« durchführen"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3187,70 +3187,70 @@ msgstr ""
"Alte Datei »%.250s« ist die gleiche wie mehrere neue Dateien! (sowohl »%.250s« "
"als auch »%.250s«)"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "Kann alte Datei »%.250s« nicht auf sichere Weise entfernen: %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "Kann Info-Verzeichnis nicht lesen"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"Alte Version des Paketes hat übermäßig langen Info-Dateinamen beginnend mit "
"»%.250s«"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "Kann veraltete Info-Datei »%.250s« nicht entfernen"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "Kann neue (vermeintliche) Info-Datei »%.250s« nicht installieren"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "Kann temporäres Control-Verzeichnis nicht öffnen"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"Paket enthält übermäßig langen Control-Info-Dateinamen (beginnend mit »%.50s«)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "Paket-Control-Info enthielt Verzeichnis »%.250s«"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"Paket-Control-Info rmdir von »%.250s« ergab nicht, dass dies kein Verzeichnis "
"sei"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "Paket %s enthielt Liste als Info-Datei"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "Kann neue Info-Datei »%.250s« nicht als »%.250s« installieren"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Bemerke Verschwinden von %s, welches komplett ersetzt wurde.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "Kann verschwindende Control-Info-Datei »%.250s« nicht löschen"
@@ -3885,7 +3885,7 @@ msgstr "dpkg-trigger: ungültiger Name des erwarteten Pakets »%.250s«: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "ungültiger Triggername »%.250s«: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3894,7 +3894,7 @@ msgstr ""
"%s: Zyklus bei der Triggerverarbeitung gefunden:\n"
" Kette der Pakete, deren Trigger verantwortlich sind oder sein könnten:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3903,11 +3903,11 @@ msgstr ""
"\n"
" anhängige Trigger von Paketen, die nicht auflösbar sind oder sein könnten:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "Trigger bilden eine Schleife, aufgegeben"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Verarbeite Trigger für %s ...\n"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 50ad1f848..00f698b44 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1117,7 +1117,7 @@ msgstr ""
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr ""
@@ -1131,12 +1131,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr ""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr ""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr ""
@@ -1153,303 +1153,303 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr ""
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr ""
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr ""
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr ""
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr ""
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr ""
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr ""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr ""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr ""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr ""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr ""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr ""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr ""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr ""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr ""
-#: src/archives.c:831
+#: src/archives.c:839
#, c-format
msgid "unable to open '%.255s'"
msgstr ""
-#: src/archives.c:833
+#: src/archives.c:841
#, c-format
msgid "unable to sync file '%.255s'"
msgstr ""
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
"%s"
msgstr ""
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr ""
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr ""
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
"%s"
msgstr ""
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr ""
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr ""
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
"%s"
msgstr ""
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr ""
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr ""
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr ""
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr ""
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr ""
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr ""
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr ""
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr ""
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr ""
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1460,33 +1460,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr ""
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr ""
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr ""
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2231,51 +2231,51 @@ msgstr ""
msgid "unable to setenv for maintainer script"
msgstr ""
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr ""
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr ""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr ""
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr ""
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr ""
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr ""
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr ""
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr ""
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr ""
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr ""
@@ -2550,111 +2550,111 @@ msgstr ""
msgid "need an action option"
msgstr ""
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr ""
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr ""
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
" in this run ! Only configuring it once.\n"
msgstr ""
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
" (current status `%.250s' with no pending triggers)"
msgstr ""
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr ""
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr ""
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr ""
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr ""
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr ""
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr ""
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr ""
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr ""
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr ""
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr ""
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr ""
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr ""
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr ""
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ""
@@ -2662,230 +2662,230 @@ msgstr ""
msgid "(no description available)"
msgstr ""
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr ""
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr ""
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr ""
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr ""
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr ""
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr ""
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
"but installing anyway as you requested.\n"
msgstr ""
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr ""
-#: src/processarc.c:195
+#: src/processarc.c:202
msgid "unable to create temporary directory"
msgstr ""
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr ""
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr ""
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr ""
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr ""
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr ""
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr ""
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr ""
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr ""
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr ""
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr ""
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr ""
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr ""
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr ""
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr ""
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr ""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr ""
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr ""
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr ""
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr ""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr ""
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr ""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr ""
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3428,25 +3428,25 @@ msgstr ""
msgid "invalid trigger name `%.250s': %.250s"
msgstr ""
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 195added0..ddf63b006 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg po.pot\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2007-06-29 04:06+0530\n"
"Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -1147,7 +1147,7 @@ msgstr "%.250s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "dpkg-deb རྒྱུད་དུང་ལས་ལྷག་ནི་འཛོལ་བ།"
@@ -1161,12 +1161,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "`%.255s' གི་དུས་བཀོད་གཞི་སྒྲིག་འབད་ནིའི་འཛོལ་བ།"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "`%.255s' གི་བདག་པོ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "`%.255s' གི་གནང་བ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
@@ -1183,7 +1183,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1192,19 +1192,19 @@ msgstr ""
"`%.250s'%.10s%.100s%.10s གི་ཁ་ཕྱོགས་སྒྱུར་ཡོད་པའི་ཐོན་རིམ་ཨིན་མི་ `%.250s' འདི་ཚབ་སྲུང་འབད་"
"ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"`%.250s'%.10s%.100s%.10s གི་ཁ་ཕྱོགས་སྒྱུར་ཡོད་པའི་ཐོན་རིམ་ཨིན་མི་ `%.250s' འདི་ཚབ་སྲུང་འབད་"
"ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "`%.255s' སི་ཊེཊི་འབད་མ་ཚུགས།(ང་གིས་གཞི་བཙུགས་འབད་ནི་འབད་མི་དེ)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1213,29 +1213,29 @@ msgstr ""
"ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' མཐའ་འཁོར་ཁམས་ལོག་སི་སི་ཚུ་བསལ་གཏང་ནི་"
"འབད་མ་ཚུགས།"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ སོར་ཆུད་འབད་ཡོད་པའི་ `%.255s' འདི་སི་ཊེཊི་འབད་མ་"
"ཚུགས།"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "ཡིག་མཛོད་ཀྱི་ནང་ན་དངོས་པོ་ `%.255s' མ་ཤེས་པའི་དབྱེ་བ་ 0x%x འདུག"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "ཐུམ་སྒྲིལ་ %s རྙིངམ་ནང་ལུ་ཡིག་སྣོད་ཚུ་ཚབ་བཙུགས་དོ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱིས་ཚབ་བཙུགས་ཡོད...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1244,97 +1244,97 @@ msgstr ""
"སྣོད་ཐོ་མིན་པ་དང་ཅིག་ཁར་ ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་སྣོད་ཐོ་ `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་"
"བསྐྱེད་དོ།"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་ཡང་ཡོད་མི་ `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "`%.255s' ལྷག་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད་(`%.255s' ནང་ལུ་)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "`%.255s' སྐབས་ dpkg-deb རྒྱབ་མཐའ་འབད།"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "`%.255s' ཁ་བསྡམ་ནི་/འབྲི་ནིའི་འཛོལ་བ།"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "རྒྱུད་དུང་ `%.255s' གསར་བསྐུན་འབདཝ་ད་འཛོལ་བ།"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "ཐབས་འཕྲུལ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "ཧརཌི་ལིངཀ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གི་བདག་པོ་གཞི་སྒྲིག་འབདཝ་ད་འཛོལ་བ།"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "སྣོད་ཐོ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལས་ `%.255s' ཟུར་ཁ་བཤུད་མ་ཚུགས།"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "འབྲེལ་ལམ་ `%.255s' ལྷག་མ་ཚུགས།"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་ཅའུན་འབད་མ་ཚུགས།"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' གི་རྒྱབ་ཐག་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "`%.255s' གནས་ཁོངས་མིན་པ་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1343,7 +1343,7 @@ msgstr ""
"dpkg: ཉེན་བརྡ་ - %s གི་རྩ་བསྐྲད་དང་ཅིག་ཁར་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་སྣང་མེད་བཞགཔ་ད:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1352,7 +1352,7 @@ msgstr ""
"dpkg: ཉེན་བརྡ་ - ཁག་ཆེ་བའི་ཐུམ་སྒྲིལ་ %s གི་རིམ་སྒྲིག་མི་འབད་ནི་ཆ་འཇོག་འབདཝ་དོ་\n"
" %s རྩབསྐྲད་གཏང་ནི་ལྕོགས་ཅན་བཟོ་ནིའི་དོན་ལས།\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1361,7 +1361,7 @@ msgstr ""
"dpkg: མེད། %s འདི་ཁག་ཆེཝ་ཨིན། འདི་རིམ་སྒྲིག་འབད་འོང་\n"
" %s རྩབསྐྲད་གཏང་ནི་ལྕོགས་ཅན་བཟོ་ནིའི་དོན་ལས།\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1370,28 +1370,28 @@ msgstr ""
"dpkg: མེད། %s རྩ་བསྐྲད་གཏང་མི་ཚུགས་ (--auto-deconfigure གི་གྲོགས་རམ་འབད་འོང་):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "%.250s ནང་ལྷག་པའི་འཛོལ་བ།"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: %s གི་དོན་ལུ་ %s རྩ་བསྐྲད་གཏང་ནི་ཆ་འཇོག་འབད་དོ་ ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ཨིན། %sགི་དོན་ལུ་ %sརྩ་བསྐྲད་གཏང་འོང་།\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1400,40 +1400,40 @@ msgstr ""
"dpkg: %s ནང་ན་ %s ཡོད་མི་གི་སྐོར་ལས་:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: ཉེན་བརྡ་ - མི་མཐུན་པ་སྣང་མེད་བཞག་དོ། ག་དེ་སྦེ་རུང་འཕྲོ་མཐུད་འོང་ !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %s གི་དོན་ལུ་ %s རྩ་བསྐྲད་གཏང་ནི་ཆ་འཇོག་འབད་དོ་ ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s འདི་ལེ་ཤོམ་སྦེ་གཞི་བཙུགས་མ་འབད་བས་ - འདི་གུའི་རྟེན་འབྲེལ་ག་ཅི་འབད་རུང་སྣང་མེད་བཞག་དོ།\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: འདི་གིས་ %s བྱིནམ་ལས་ %s རྩ་བསྐྲད་གཏང་ནི་ལུ་དཀའ་ངལ་ཡོདཔ་འོང་ ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1442,70 +1442,70 @@ msgstr ""
"dpkg: ཐུམ་སྒྲིལ་ %s ལུ་ལོག་གཞི་བཙུགས་འབད་ནི་དགོཔ་ཨིན་ དེ་འབདཝ་ད་ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རྩ་"
"བསྐྲད་གཏང་།\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: ཐུམ་སྒྲིལ་ %s ལུ་དགོཔ་ཨིན་ རྩ་བསྐྲད་མི་གཏང་།\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "ཐུན་སྒྲིལ་%s་ལུ་མཐུན་པ་ལེ་ཤ/ཚབ་བཙུགས་ཟུང"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ཨིན། %sགི་དོན་ལུ་ %sརྩ་བསྐྲད་གཏང་འོང་།\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "མི་མུན་པའི་ཐུམ་སྒྲིལ་ཚུ་ - %.250s གཞི་བཙུགས་མི་འབད།"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: ཉེན་བརྡ་ - མི་མཐུན་པ་སྣང་མེད་བཞག་དོ། ག་དེ་སྦེ་རུང་འཕྲོ་མཐུད་འོང་ !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive ལུ་ཉུང་མཐའ་འགྲུལ་ལམ་སྒྲུབ་རྟགས་གཅིག་དགོ"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "--recursive གི་དོན་ལུ་འཚོལ་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཨེཕ་ཌི་ཨོ་པཱན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ལྷག་ནིའི་འཛོལ་བ།"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "--recursive གི་དོན་ལུ་འཚོལ་ནི་གིས་ལེགས་སྐྱོང་མ་འཐབ་པའི་འཛོལ་བ་ %i སླར་ལོག་འབད་ནུག"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "འཚོལ་ཞིབ་འབད་ཡོད་ དེ་འབདཝ་ད་ཐུམ་སྒྲིག་ཚུ་འཚོལ་མ་འཐོབ་(*.deb མཐུན་མི་ཡིག་སྣོད་ཚུ་)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་ཡིག་མཛོད་ཡིག་སྣོད་ཀྱི་སྒྲུབ་རྟགས་གཅིག་དགོཔ་ཨིན།"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1516,33 +1516,33 @@ msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་ཡ
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "ཧེ་མ་སེལ་འཐུ་མ་འབད་བའི་ཐུམ་སྒྲིལ་ %s སེལ་འཐུ་འབད་དོ།\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "སེལ་འཐུ་མ་འབད་བའི་ཐུམ་སྒྲིལ་ %s གོམ་འགྱོ་དོ།\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "%.250s གི་ཐོན་རིམ་ %.250s ཧེ་མ་ལས་རང་ཡོད་ གོམ་འགྱོ་དོ།\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - ཉེན་བརྡ་: %.250s འདི་ %.250s ལས་ %.250s ལུ་མར་སྐྱེད་འབད་དོ།\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "%.250s འདི་ཐོན་རིམ་ %.250s ལས་ %.250s ལུ་མར་སྐྱེད་མི་འབད་ གོམ་འགྱོ་དོ།\n"
@@ -2375,51 +2375,51 @@ msgstr "`%.250s' གུ་ལུ་ལག་ལེན་འཐབ་པའི་
msgid "unable to setenv for maintainer script"
msgstr "vsnprintf སི་ཊེཊི་འབད་མ་ཚུགས།"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "%s ཡིག་ཚུགས་རྙིངམ།"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "%s `%.250s' སི་ཊེཊི་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "%s ཡིག་ཚུགས་གསརཔ།"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "%s ཡིག་ཚུགས་རྙིངམ།"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "%s `%.250s' སི་ཊེཊི་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - ཚབ་ལུ་ཐུམ་སྒྲིལ་གསརཔ་འདི་ལས་ཡིག་ཚུགས་འབད་རྩོལ་བསྐྱེད་དོ་...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོན་རིམ་གསརཔ་འདི་ནང་ལུ་ཡིག་ཚུགས་མེད།-བཀོག་བཞག་དོ།"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... འདི་བཏུབ་ཡར་སོངམ་བཟུམ་མཐོངམ་མས།\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "གཙང་དག་བཟོ་ནིའི་དོན་ལུ་ཨར་ཨེམ་ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་འབྱུང་ཡོད།"
@@ -2841,31 +2841,31 @@ msgstr "གྲལ་ཐིག་ %d གི་མཇུག་གི་ཧེ་
msgid "need an action option"
msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཚུ་ དེ་ཚུ་འོང་མི་ཡིག་སྣཽད་ཚུའི་མིང་ཚུ་འདྲེན་ཚིག་བཀོད་དེ་མེན་པར་ ཁོང་རའི་མིང་གིས་སྦེ་གསལ་"
+"བཀོད་འབད་དགོ "
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --བསྣར་ནི་འདི་གིས་གདམ་ཁ་-མིན་པའི་སྒྲུབ་རྟགས་ག་ནི་ཡང་མི་འབག"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་མིང་གི་སྒྲུབ་རྟགས་གཅིག་དགོ"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཚུ་ དེ་ཚུ་འོང་མི་ཡིག་སྣཽད་ཚུའི་མིང་ཚུ་འདྲེན་ཚིག་བཀོད་དེ་མེན་པར་ ཁོང་རའི་མིང་གིས་སྦེ་གསལ་"
-"བཀོད་འབད་དགོ "
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"ཐུམ་སྒྲིལ་ %s གིས་ཚར་གཅིག་ལས་ལྷག་སྟེ་ཐོ་བཀོད་འབད་ནུག ལས་སྦྱོར་ཚར་གཅིག་རྐྱངམ་ཅིག་འབདཝ་ཨིན།\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2874,7 +2874,7 @@ msgstr ""
"ཐུམ་སྒྲིལ་ %s གི་འདྲ་བཤུས་གཅིག་ལས་ལྷག་སྟེ་ བཤུབ་ཡོད་\n"
"འ་ནི་གཡོག་བཀོལ་ནང་ལུ་! ཚར་གཅིག་རྐྱངམ་ཅིག་རིམ་སྒྲིག་འབད་དོ།\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2883,76 +2883,76 @@ msgstr ""
"ཐུམ་སྒྲིལ་ %.250s འདི་རིམ་སྒྲིག་གི་དོན་ལུ་གྲ་སྒྲིག་མེད།\n"
" རིམ་སྒྲིག་འབད་མི་ཚུགས་(ད་ལྟའི་གནས་ཚད་ `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %s བྱིན་མི་ ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr "ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " རིམ་ལུགས་གུའི་ %s གི་ཐོན་རིམ་འདི་ %s ཨིན།\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %s བྱིན་མི་ ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr "ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: `%s' རིམ་སྒྲིག་ཡང་འབད་དོ་(`%s' གི་དགོཔ་ཨིན།)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr "%s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr "ཐུམ་སྒྲིལ་ %s འདི་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr "%s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr "ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr "%.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་ %s ཨིན།\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (ལས་སྦྱོར་ཡན་ལག): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " རིམ་ལུགས་གུའི་ %s གི་ཐོན་རིམ་འདི་ %s ཨིན།\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr "ལུ་རྟེནམ་ཨིན།"
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "གང་ལྟར་ཡང་:\n"
@@ -2960,39 +2960,39 @@ msgstr "གང་ལྟར་ཡང་:\n"
msgid "(no description available)"
msgstr "(འགྲེལ་བཤད་འཐོབ་ཚུགསཔ་མེད་)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "ཡིག་མཛོད་འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "`%.250s' མེདཔ་ངེས་བདེན་བཟོཝ་ད་འཛོལ་བ།"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"སྣ་མང་བགོ་མི་ཅིག་གི་ཡན་ལག་ཨིན་མེན་བལྟ ནིའི་དོན་ལས་dpkg-བཤག་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "ལོག་འཛོམས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད།"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "%s བདེན་བཤད་འབད་དོ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "ཌེབ་སིག་-བདེན་སྦྱོར་ ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "ཐུམ་སྒྲིལ་ %s གུ་ལུ་བདེན་སྦྱོར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3001,32 +3001,32 @@ msgstr ""
"ཐུམ་སྒྲིལ་ %s གུ་ལུ་བདེན་སྦྱོར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
"དེ་འབདཝ་ད་ཁྱོད་ཀྱི་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་གཞི་བཙུགས་འབད་དོ།\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "རྩིས་སྤྲོད་འབད་ཡོདཔ།\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "གནས་སྐབས་སྣོད་ཐོ་མིང་བཟོ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
"ཚད་འཛིན་བརྡ་དོན་ཕྱིར་འདོན་འབད་ནིའི་དོན་ལས་ dpkg-deb ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%s གི་སྐོར་ལས་བརྡ་དོན་འདི་ %s ལས་དྲན་ཐོ་བཀོད་ཡོད།\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "ཐུམ་སྒྲིལ་གྱི་བཟོ་བཀོད(%s)འདི་རིམ་ལུགས་(%s)དང་མི་མཐུན་པས།"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3035,102 +3035,102 @@ msgstr ""
"dpkg: %s ནང་ན་ %s ཡོད་མིའི་སྐོར་ལས་ སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་- %.250s གཞི་བཙུགས་མི་འབ་དབས།"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: ཉེན་བརྡ་ - སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་སྣང་མེད་བཞག་དོ!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "%s %s ཚབ་བཙུགས་ནི་ལུ་གྲ་སྒྲིག་འབད་དོ་(%s ལག་ལེན་འཐབ་ཐོག་)...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "%s བཤུབ་དོ་(%s ལས་)...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"རིམ་སྒྲིག་ཡིག་སྣོད་ཀྱི་མིང་(`%.250s' འགོ་བཙུགས་དོ་) འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས་(>%d ཡིག་འབྲུ)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250s ནང་ལྷག་པའི་འཛོལ་བ།"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "%.250s ཁ་བསྡམ་ད་འཛོལ་བ།"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "%.250s ཁ་ཕྱེ་ནིའ་འབད་རྩོལ་བསྐྱེདཔ་ད་འཛོལ་བ།"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "%s རིམ་སྒྲིག་མ་བཟོ་ %s རྩ་བསྐྲད་གཏང་ཚུགས་ནིའི་དོན་ལུ་...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "%s རྩ་བསྐྲད་གཏང་དོ་...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "ཚབ་མ་ %.250s བཤུབ་དོ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "ཡིག་སྣོད་རིམ་ལུགས་ཡིག་མཛོད་ལེན་ནིའི་དོན་ལས་ dpkg-deb ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "dpkg-deb ཊར་ཨའུཊི་པུཏི་ ལྷག་པའི་སྐབས་འཛོལ་བ།"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "ངན་ཅན་བཟོ་ཡོད་པའི་ཡིག་སྣོད་རིམ་ལུགས་ཊར་ཡིག་སྣོད་ - ངན་ཅན་བཟོ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་མཛོད།"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: སྲིད་པའི་རྒྱབ་ལུས་ཀླད་ཀོར་ཚུ་ཛཔ་འབད།"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགསཔ་ལས་ འདི་བཏོན་མི་གཏང་: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: ཉེན་བརྡ་ - སྣོད་ཐོ་རྙིངམ་ `%.250s': %s བཏོན་གཏང་མ་ཚུགས།\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་སྣོད་ཐོ་སྟོངམ་ཅིག་ཨིན་(དེ་ལས་འདི་བཏོན་གཏང་"
"ཡོད།)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3139,68 +3139,68 @@ msgstr ""
"dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་ཡིག་སྣོད་གསརཔ་ལེ་ཤ་ཅིག་དང་གཅིད་པ་ཨིན་པས་! (`"
"%.250s' དང `%.250s' གཉིས་ཆ་རང་)\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%%.250s': %%s %s འབད་མ་ཚུགས།\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚུགས།"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"`%.250s' འགོ་བཙུགས་པའི་སྐབས་ ཐུམ་སྒྲིལ་གི་ཐོན་རིམ་རྙིངམ་འདི་ལུ་གནམ་མེད་ས་མེད་རིངམ་བརྡ་དོན་ཡིག་སྣོད་"
"མིང་འདུག"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "ཕན་མེད་བརྡ་དོན་ཡིག་སྣོད་`%.50s'རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "བརྡ་དོན་ཡིག་སྣོད་`%.50s'གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "གནས་སྐབས་ཚད་འཛིན་སྣོད་ཐོ་ཁ་ཕྱེ་མ་ཚུགས།"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"ཐུམ་སྒྲིལ་གྱི་ནང་ན་ གནམ་མེད་ས་མེད་རིངམ་ཚད་འཛིན་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུག་(`%.50s' འགོ་བཙུགས་དོ།)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "ཐུམ་སྒྲིལ་ཚད་འཛིན་བརྡ་དོན་གྱི་ནང་ན་སྣོད་ཐོ་ `%.250s' འདུག"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "`%.250s' གི་ཐུམ་སྒྲིལ་ཚད་འཛིན་བརྡ་དོན་ཨར་ཨེམ་སྣོད་ཐོ་གིས་སྣོད་ཐོ་མེན་ཟེར་མ་སླབ།"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: ཉེན་བརྡ་ - ཐུམ་སྒྲིལ་ %s ནང་ལུ་ཐོ་ཡིག་ བརྡ་དོན་ཡིག་སྣོད་སྦེ་ འདུག"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "བརྡ་དོན་ཡིག་སྣོད་ `%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(%s གི་ཡལ་མི་ ཆ་ཚང་སྦེ་ཚབ་བཙུགས་ཡོད་མི་ ག་ཅི་ཡང་མེད།)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "ཡལ་འགྱོ་མི་ཚད་འཛིན་བརྡ་དོན་ཡིག་སྣོད་ `%.250s' བཏོན་གཏང་མ་ཚུགས།"
@@ -3824,25 +3824,25 @@ msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲི
msgid "invalid trigger name `%.250s': %.250s"
msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "%s གི་དོན་ལུ་རིམ་སྒྲིག་ཡིག་སྣོད་ཕྱིར་བསྐྲད་གཏང་དོ་...\n"
diff --git a/po/el.po b/po/el.po
index 5d0040181..dfcc90b17 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg_po_el\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-08-31 21:09+0300\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1189,7 +1189,7 @@ msgstr "μη αναμενόμενο τέλος αρχείου (eof) κατά τ
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "σφάλμα από την ανάγνωση της σωλήνωσης του dpkg-deb"
@@ -1203,12 +1203,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "σφάλμα ορισμού της χρονοσήμανσης του `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "σφάλμα ρύθμισης ιδιοκτησίας του `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "σφάλμα ορισμού των δικαιωμάτων του `%.255s'"
@@ -1229,7 +1229,7 @@ msgstr ""
"αποτυχία απόδοσης κατάστασης (derefernce) του προτεινόμενου στόχου του "
"συμβολικού συνδέσμου `%.250s' για τον συμβολικό σύνδεσμο `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1238,20 +1238,20 @@ msgstr ""
"προσπάθεια υπερεγγραφής του `%.250s', που είναι η εκτραπείσα έκδοση του `"
"%.250s' (πακέτο: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"προσπάθεια υπερεγγραφής του `%.250s', που είναι εκτραπείσα έκδοση του `"
"%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"αδύνατη η εύρεση κατάστασης του `%.255s' (που προσπάθησα να εγκαταστήσω)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1260,29 +1260,29 @@ msgstr ""
"αδύνατος ο καθαρισμός της σαβούρας γύρω από το `%.255s' πριν την εγκατάσταση "
"άλλης έκδοσης"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"αδύνατη η εύρεση κατάστασης του επαναφερθέντος `%.255s' προτού εγκατασταθεί "
"νέα έκδοση"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "το αρχείο περιείχε το αντικείμενο `%.255s' άγνωστου τύπου 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Αντικατάσταση αρχείων στο παλιό πακέτο %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Αντικατάσταση από αρχεία στο εγκατεστημένο πακέτο %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1291,101 +1291,101 @@ msgstr ""
"προσπάθεια αντικατάστασης του καταλόγου `%.250s' στο πακέτο %.250s με μη "
"κατάλογο"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"προσπάθεια αντικατάστασης του `%.250s', που είναι επίσης στο πακέτο %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "απέτυχε η ανάγνωση `%.255s' (στο `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "backend dpkg-deb κατά το `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "σφάλμα κλεισίματος/εγγραφής `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "σφάλμα δημιουργίας σωλήνωσης `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "σφάλμα κατά τη δημιουργία συσκευής `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "σφάλμα δημιουργίας συνδέσμου `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "σφάλμα δημιουργίας συμβολικού δεσμού `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "σφάλμα ρύθμισης ιδιοκτησίας του `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "σφάλμα κατά τη δημιουργία καταλόγου `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
"αδύνατη η μετακίνηση του `%.255s' κατά μέρους για εγκατάσταση νέας έκδοσης"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "αδύνατη η ανάγνωση δεσμού `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "αδύνατη η αλλαγή ιδιοκτήτη του εφεδρικού δεσμού για το `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"αδυναμία δημιουργίας εφεδρικού δεσμού του `%.255s' πριν την εγκατάσταση νέας "
"έκδοσης"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "αδύνατη η εγκατάσταση της νέας έκδοσης του `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "αδύνατη η δημιουργία `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "αδύνατη η αποδέσμευση `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1394,7 +1394,7 @@ msgstr ""
"dpkg: προειδοποίηση - αγνοείται το πρόβλημα εξάρτησης με το %s: \n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1403,7 +1403,7 @@ msgstr ""
"dpkg: προειδοποίηση - θεώρηση της απορρύθμισης του ουσιώδους\n"
" πακέτου %s, για ενεργοποίηση του %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1412,7 +1412,7 @@ msgstr ""
"dpkg: όχι,το %s είναι ουσιώδες, δε θα απορρυθμιστεί\n"
" για να ενεργοποιηθεί το %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1422,17 +1422,17 @@ msgstr ""
"βοηθήσει):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "αφαίρεση του %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "εγκατάσταση του %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1440,12 +1440,12 @@ msgstr ""
"dpkg: εξετάζω την απορύθμιση του %s, το οποίο θα \"έσπαγε\" εξαιτίας του %"
"s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ναι, θα απορυθμίσω το %s (έχει \"σπάσει\" εξαιτίας του %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1454,14 +1454,14 @@ msgstr ""
"dpkg: σχετικά με το %s που περιέχει το %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: προειδοποίηση - θα αγνοηθεί η σύγκρουση, μπορεί να συνεχίσει έτσι κι "
"αλλιώς !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1471,31 +1471,31 @@ msgstr ""
" δεν επιτρέπεται η απορύθμιση (το όρισμα --auto-deconfigure πιθανά να "
"βοηθήσει)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "η εγκατάσταση του %.250s θα \"έσπαγε\" υπάρχον λογισμικό"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: θεωρώντας την αφαίρεση του %s για χάρη του %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"το %s δεν είναι κατάλληλα εγκατεστημένο - αγνοώντας όλες τις εξαρτήσεις "
"του.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: η αφαίρεση του %s μπορεί να δημιουργήσει προβλήματα καθώς παρέχει %"
"s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1503,71 +1503,71 @@ msgid ""
msgstr ""
"dpkg: το πακέτο %s απαιτεί επανεγκατάσταση αλλά θα αφαιρεθεί όπως ζητήσατε.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: το πακέτο %s απαιτεί επανεγκατάσταση, δε θα αφαιρεθεί.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "το πακέτο %s έχει υπερβολικά πολλά ζεύγη Conflicts/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: θα μετακινηθεί το %s για χάρη του %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "συγκρουόμενα πακέτα - δε γίνεται εγκατάσταση %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: προειδοποίηση - θα αγνοηθεί η σύγκρουση, μπορεί να συνεχίσει !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive χρειάζεται τουλάχιστον ένα όρισμα μονοπατιού"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "αδύνατη η εκτέλεση της find με --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "αδύνατο το άνοιγμα της σωλήνωσης της find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "αδύνατη η ανάγνωση από τη σωλήνωση της find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "αδύνατο το κλείσιμο της σωλήνωσης της find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "η εκτέλεση της find με --recursive επέστρεψε απρόσμενο σφάλμα %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"έγινε αναζήτηση, δε βρέθηκε κανένα πακέτα (αρχεία που ταιριάζουν *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s χρειάζεται τουλάχιστον ένα αρχείο πακέτου ως παράμετρο"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1578,33 +1578,33 @@ msgstr "--%s χρειάζεται τουλάχιστον ένα αρχείο π
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Επιλογή προηγούμενου απεπιλεγμένου πακέτου %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Παράλειψη απόεπιλεγμένου πακέτου %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Έκδοση %.250s του %.250s είναι ήδη εγκατεστημένη, παράβλεψη.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - προειδοποίηση: υποβάθμιση του %.250s από %.250s σε %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2453,51 +2453,51 @@ msgstr "αδύνατος ο ορισμός άδειας εκτέλεσης στ
msgid "unable to setenv for maintainer script"
msgstr "αδύνατος ο ορισμός του setenv για το σενάριο συντήρησης (maint script)"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "παλιό σενάριο %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "νέο σενάριο %s "
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "παλιό σενάριο %s"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - δοκιμάζεται εναλλακτικά το σενάριο από το νέο πακέτο ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "δεν υπάρχει σενάριο στη νέα έκδοση του πακέτου - εγκατάλειψη"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... μάλλον επιτυχής..\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "αδύνατη η δημιουργία `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "σφάλμα κατά την διαγραφή κατά τον τερματισμό"
@@ -2965,32 +2965,32 @@ msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d
msgid "need an action option"
msgstr "χρειάζεται μια επιλογή ενέργειας"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"Θα πρέπει να ορίσετε τα πακέτα με το όνομά τους και όχι με το όνομα των "
+"αρχείων τους"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending δεν παίρνει κανένα όρισμα μη επιλογής"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s χρειάζεται τουλάχιστον ένα όρισμα ονόματος πακέτου"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"Θα πρέπει να ορίσετε τα πακέτα με το όνομά τους και όχι με το όνομα των "
-"αρχείων τους"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"Το πακέτο %s δόθηκε περισσότερες από μία φορές, η επεξεργασία θα γίνει μόνο "
"μία φορά.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2999,7 +2999,7 @@ msgstr ""
"Έχουν αποσυμπιεστεί περισσότερα από ένα αντίγραφα\n"
"του πακέτου %s ! Θα ρυθμιστεί μόνο μια φορά.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -3008,77 +3008,77 @@ msgstr ""
"το πακέτο %.250s δεν είναι έτοιμο για επεξεργασία trigger\n"
" (τωρινή κατάσταση `%.250s' χωρίς trigger σε εκκρεμότητα)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Το πακέτο %s που παρέχει το %s πρόκειται να αφαιρεθεί.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Το πακέτο %s πρόκειται να αφαιρεθεί.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Η έκδοση του %s στο σύστημα είναι %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" Το πακέτο %s που παρέχει το %s περιμένει την επεξεργασία των trigger.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Το πακέτο %s περιμένει την επεξεργασία των trigger.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: ρυθμίζεται επίσης το `%s' (απαιτείται από `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Το πακέτο %s που παρέχει το %s δεν έχει ακόμα ρυθμιστεί.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Το πακέτο %s δεν έχει ρυθμιστεί ακόμη.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Το πακέτο %s που παρέχει το %s δεν είναι εγκατεστημένο.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Το πακέτο %s δεν είναι εγκατεστημένο.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) \"σπάει\" το %s και είναι %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) παρέχει %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Η έκδοση του %s που πρόκειται να ρυθμιστεί είναι %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " εξαρτάται από "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ". Ωστόσο:\n"
@@ -3086,40 +3086,40 @@ msgstr ". Ωστόσο:\n"
msgid "(no description available)"
msgstr "(χωρίς διαθέσιμη περιγραφή)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "αδύνατη η πρόσβαση στην αρχειοθήκη"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "σφάλμα κατά την επιβεβαίωση ότι το `%.250s' δεν υπάρχει"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"αδύνατη η εκτέλεση του dpkg-split για έλεγχο αν είναι τμήμα ενός "
"πολυτμηματικού πακέτου"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "ανασυγκρότηση αρχείου πακέτου"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Γίνεται πιστοποίηση %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "αδύνατη η εκτέλεση με execl του debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Η επαλήθευση του πακέτου %s απέτυχε!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3128,32 +3128,32 @@ msgstr ""
"Η επαλήθευση του πακέτου %s απέτυχε,\n"
"αλλά θα εγκατασταθεί όπως ζητήσατε.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "επιτυχής\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "απέτυχε η δημιουργία ονόματος προσωρινού καταλόγου "
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "απέτυχε η εκτέλεση του dpkg-deb για εξαγωγή πληροφοριών ελέγχου"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Καταγράφτηκαν πληροφορίες ελέγχου για το %s από %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
"η αρχιτεκτονική του πακέτου (%s) δεν ταιριάζει με αυτή του συστήματος (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3162,105 +3162,105 @@ msgstr ""
"dpkg: σχετικά με το %s που περιέχει %s, πρόβλημα προεξάρτησης:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "πρόβλημα προεξάρτησης - δε θα εγκατασταθεί %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: προειδοποίηση - αγνοείται το πρόβλημα προεξάρτησης !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Προετοιμασία για αντικατάσταση %s %s (χρησιμοποιώντας το %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Γίνεται αποσυμπίεση %s (από %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"το όνομα του αρχείου ρυθμίσεων (από `%.250s') είναι πολύ μεγάλο (>%d "
"χαρακτήρες)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "σφάλμα ανάγνωσης στο %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "σφάλμα κλεισίματος %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "σφάλμα κατά το άνοιγμα του %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Απορρύθμιση του %s, για να επιτραπεί η αφαίρεση του %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Απορρύθμιση του %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Αποσυμπίεση του αντικαταστάτη %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "αδύνατη η εκτέλεση του dpkg-deb για τη λήψη της αρχειοθήκης"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "σφάλμα κατά την ανάγνωση της εξόδου της tar από το dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "κατεστραμμένη αρχειοθήκη tar - κατεστραμμένη αρχειοθήκη πακέτου"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: διαγραφή πιθανών μηδενικών στο τέλος"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: προειδοποίηση - αδύνατος ο προσδιορισμός της κατάστασης του παλιού "
"αρχείου `%.250s' συνεπώς δεν διαγράφεται: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr ""
"dpkg: προειδοποίηση - αδύνατη η διαγραφή του παλιού καταλόγου `%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: προειδοποίηση - το παλιό conffile `%.250s' ήταν ένας κενός κατάλογος "
"(και τώρα έχει διαγραφεί)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "αδύνατος ο προσδιορισμός κατάστασης άλλου καινούριου αρχείου `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3269,70 +3269,70 @@ msgstr ""
"dpkg: προειδοποίηση - το παλιό αρχείο `%.250s' είναι το ίδιο με αρκετά "
"καινούρια αρχεία! (τόσο τα `% 250s' όσο και τα `% 250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: προειδοποίηση - αδύνατον να %s το παλιό αρχείο `%%.250s':%%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"η παλιά έκδοση του πακέτου έχει υπερβολικά μεγάλο μήκος ονόματος αρχείου "
"πληροφοριών`%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "αδύνατη η διαγραφή του παρωχημένου αρχείου πληροφοριών `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "αδύνατη η εγκατάσταση (υποτιθέμενου) νέου αρχείου πληροφοριών `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "αδύνατο το άνοιγμα προσωρινού καταλόγου ελέγχου (control)"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"το πακέτο έχει υπερβολικά μεγάλο μήκος ονόματος αρχείου ελέγχου `%.250s'"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "οι πληροφορίες ελέγχου του πακέτου περιείχαν τον κατάλογο `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "δόθηκε rmdir του `%.250s' αλλά δεν δηλώθηκε ως μη κατάλογος"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr ""
";dpkg: προειδοποίηση - το πακέτο %s περιείχε λίστα ως αρχείο πληροφοριών"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "αδύνατη η εγκατάσταση νέου αρχείου πληροφοριών `%.250s' ως `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
"(Σημειώνεται η εξαφάνιση του %s, το οποίο έχει αντικατασταθεί πλήρως)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "αδύνατη η διαγραφή του προς εξαφάνιση αρχείου ελέγχου `%.250s'"
@@ -3996,7 +3996,7 @@ msgstr "dpkg-trigger: μη θεμιτό όνομα πακέτου σε αναμ
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: μη έγκυρο όνομα trigger `%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -4006,7 +4006,7 @@ msgstr ""
" αλυσίδα των πακέτων που οι trigger τους είναι ή πιθανόν να είναι "
"υπεύθυνοι:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -4015,11 +4015,11 @@ msgstr ""
"\n"
" trigger εκκρεμών πακέτων που είναι ή πιθανόν να είναι ανεπίλυτοι:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "οι trigger είναι σε loop, τερματισμός"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Επεξεργασία των trigger για %s ...\n"
diff --git a/po/eo.po b/po/eo.po
index 1bfa45bf6..38fadd531 100644
--- a/po/eo.po
+++ b/po/eo.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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-04-07 19:37-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -1153,7 +1153,7 @@ msgstr "neatendata dosierfino dum legado de '%.250s'"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "eraro dum legado el dukto de dpkg-deb"
@@ -1168,12 +1168,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "eraro dum difino de horstampoj de '%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "eraro dum difino de posedo de '%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "eraro dum difino de permesoj de '%.255s'"
@@ -1192,7 +1192,7 @@ msgstr ""
"malsukcesis legi staton (dereference) de proponita nova celo de symlink "
"'%.250s' por symlink '%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1201,18 +1201,18 @@ msgstr ""
"provo anstataŭigi '%.250s', kiu estas la disbranĉita versio de "
"'%.250s' (pako: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"provo anstataŭigi '%.250s', kiu estas la disbranĉita versio de '%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "maleblas legi staton de '%.255s' (kiun estis instalota)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1220,29 +1220,29 @@ msgid ""
msgstr ""
"maleblas purigi malordon ĉirkaŭ '%.255s' antaŭ ol instali alian version"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"maleblas legi staton de la restarigita '%.255s' antaŭ ol instali alian "
"version"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arkivo enhavis objekton '%.255s' el nekonata tipo 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Anstataŭigo de dosieroj en la malnova pako %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Anstataŭite per dosieroj en la instalita pako %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1250,98 +1250,98 @@ msgid ""
msgstr ""
"provo anstataŭigi la dosierujon '%.250s' en la pako %.250s kun ne-dosierujo"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "provo anstataŭigi '%.250s', kiu ankaŭ estas en la pako %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "maleblas krei '%.255s' (dum procezado de '%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "subteni dpkg-deb dum '%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "eraro dum fermo/skribo de '%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "eraro dum kreo de dukto '%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "eraro dum kreo de aparato '%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "eraro dum kreo de rekta ligilo '%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "eraro dum kreo de simbola ligilo '%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "eraro dum difino de posedo de simbola ligilo '%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "eraro dum kreo de la dosierujo '%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "maleblas puŝi aparte '%.255s' por instali novan version"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "maleblas legi ligilon '%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "maleblas fari sekurkopian simbolan ligilon por '%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "maleblas uzi 'chwon' je sekurkopia simbola ligilo por '%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"maleblas fari sekurkopian ligilon de '%.255s' antaŭ ol instali novan version"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "maleblas instali novan version de '%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "maleblas krei '%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "maleblas malbufrigi '%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1350,7 +1350,7 @@ msgstr ""
"ni ignoras dependecan problemon kun %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1359,7 +1359,7 @@ msgstr ""
"ni konsideras malakomodadon de la esenca\n"
" pako %s, por ebligi %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1368,7 +1368,7 @@ msgstr ""
"dpkg: ne, %s estas esenca, ĝi ne estos malakomodita\n"
" por ebligi %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1377,28 +1377,28 @@ msgstr ""
"dpkg: ne, ne povas daŭrigi kun %s (--auto-deconfigure helpos):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "forigo de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalo de %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: ni konsideras malakomodadon de %s, kiu estus rompita de %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: jes, ni malakomodos %s (rompita de %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1407,11 +1407,11 @@ msgstr ""
"dpkg: prizorgo de %s enhavanta %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "ni ignoras rompaĵon, povas daŭrigi iel ajn!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1420,27 +1420,27 @@ msgstr ""
"instalado de %.250s povus rompi %.250s, kaj\n"
" malakomodado ne estas permesata (--auto-deconfigure povus helpi)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "instalado de %.250s rompus ekzistantan programaron"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: ni konsideras forigi %s favore al %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s ne estas korekte instalita - ni ignoras iun ajn dependeco je ĝi.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: eble okazos problemo forigante %s, ĉar ĝi provizas %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1449,69 +1449,69 @@ msgstr ""
"dpkg: la pako %s postulas reinstalon, sed eĉ tiel ni forigos ĝin laŭ via "
"peto.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: la pako %s postulas reinstalon, ni ne forigos ĝin.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "la pako %s havas tro multajn parojn Konfliktoj/Anstataŭoj"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: jes, ni forigos %s favore al %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "konfliktantaj pakoj - ni ne instalos %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "ni ignoras konflikton, povas daŭrigi iel ajn!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive bezonas minimume unu voj-parametro"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "malsukceso dum lanĉo de find por --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "malsukceso por uzi 'fdopen' je dukto de 'find'"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "eraro dum legado de dukto de 'find'"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "eraro dum fermo de dukto de 'find'"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "'find' por --recursive liveris netraktitan eraron %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "ni serĉis, sed trovis neniun pakon (dosierojn kongruantajn al *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s bezonas minimume unu pakan arkivan dosieran argumenton"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1522,33 +1522,33 @@ msgstr "--%s bezonas minimume unu pakan arkivan dosieran argumenton"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Ni elektas la antaŭe malelektitan pakon %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Ni preterpasas malelektitan pakon %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versio %.250s de %.250s jam estas instalita, ni preterpasas.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "ni retroigas %.250s de %.250s al %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "Ni ne retroigos %.250s de versio %.250s al %.250s, ni preterpasas.\n"
@@ -2368,51 +2368,51 @@ msgstr "maleblas difini plenum-permesojn por '%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "maleblas uzi 'setenv' por la skripto de pakzorganto"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "instalis skripton %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "maleblas legi staton de %s '%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nova skripto %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "malnova skripto %s"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "maleblas legi staton de %s '%.250s': %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - ni provas skripton el la nova pako anstataŭe ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "estas neniu skripto en la nova versio de la pako - ni rezignas"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... ŝajne sukcese.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "maleblas krei '%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "malsukceso dum lanĉo de rm por purigado"
@@ -2838,30 +2838,30 @@ msgstr "ne atendita dosierfino antaŭ ol fino de linio %d"
msgid "need an action option"
msgstr "bezonas agan opcion"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"vi devas indiki pakojn per iliaj propraj nomoj, ne per citado de la nomoj de "
+"la dosieroj en kiuj ili venas"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending prenas neniun neopcian argumenton"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s bezonas minimume unu argumenton por pak-nomo"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"vi devas indiki pakojn per iliaj propraj nomoj, ne per citado de la nomoj de "
-"la dosieroj en kiuj ili venas"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "La pako %s listiĝas pli ol unufoje, ni procezas nur unufoje.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2870,7 +2870,7 @@ msgstr ""
"Pli ol unu kopio de la pako %s estis elpakata\n"
" en tiu ĉi plenumo ! Ni akomodas ĝin nur unufoje.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2879,76 +2879,76 @@ msgstr ""
"la pako %.250s ne pretas por procezado de ekigiloj\n"
" (nuna stato '%.250s' kun neniu pritraktota ekigilo)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " La pako %s, kiu provizas %s, estas forigota.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " La pako %s estas forigota.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Versio de %s en la sistemo estas %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " La pako %s, kiu provizas %s, atendas procezadon de ekigilo.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " La pako %s atendas procezadon de ekigilo.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: ni ankaŭ akomodas '%s' (postulata de '%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " La pako %s, kiu provizas %s, ankoraŭ ne estas akomodita.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " La pako %s ankoraŭ ne estas akomodita.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " La pako %s, kiu provizas %s, ankoraŭ ne estas instalita.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " La pako %s ne estas instalita.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s: (%s) rompas %s kaj estas %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) provizas %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versio de %s por esti akomodata estas %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " dependas je "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; tamen:\n"
@@ -2956,40 +2956,40 @@ msgstr "; tamen:\n"
msgid "(no description available)"
msgstr "(neniu priskribo disponeblas)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "ne povas atingi arkivon"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "eraro dum certigo ke '%.250s' ne ekzistas"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"malsukceso dum lanĉo de dpkg-split por kontroli ĉu ĝi apartenas al iu "
"'multiparter'"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "re-kunmetita pak-dosiero"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Aŭtentikigado de %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "malsukceso dum plenumo de execl debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Kontrolado je pako %s malsukcesis!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2998,31 +2998,31 @@ msgstr ""
"Kontrolado je pako %s malsukcesis,\n"
"sed ni instalas iel ajn, laŭ via peto.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "pasis\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "malsukceso dum kreo de provizora dosieruj-nomo"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "malsukceso dum lanĉo de dpkg-deb por eltiri reg-informon"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Registrita informo pri %s el %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "la pak-arkitekturo (%s) ne kongruas al la sistemo (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3031,101 +3031,101 @@ msgstr ""
"dpkg: atentas %s, kiu enhavas %s, antaŭdependeca problemo:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "antaŭdependeca problemo - ni ne instalos %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "ignoro de dependeca problemo!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Ni prepariĝas por anstataŭi %s %s (uzante %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Elpakado de %s (el %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"nomo de conffile (komencante per '%.250s') estas tro longa (>%d signoj)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "leg-eraro en %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "eraro dum fermo de %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "eraro dum provo malfermi %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Malakomodado de %s, por ebligi forigon de %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Malakomodado de %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Elpakado de anstataŭanto %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "maleblas lanĉi dpkg-deb por ricevi dosiersisteman arkivon"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "eraro dum legado de eligo de dpkg-deb tar"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "misrompita dosiersistema tar-dosiero - misrompita pak-arkivo"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: forigi eblajn vostajn nulojn"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"ne eblis legi la staton de la malnova dosiero '%.250s', do ni forigas ĝin: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "maleblas forigi la malnovan dosierujon '%.250s': %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"la malnova conffile '%.250s' estis malplena dosierujo (kaj nun estas "
"forigita)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "maleblas legi staton de alia nova dosiero '%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3134,68 +3134,68 @@ msgstr ""
"la malnova dosiero '%.250s' estas la sama ol pluraj novaj dosieroj! (kaj "
"'%.250s' kaj '%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "maleblas %s la malnovan dosieron '%.250s': %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "ne eblas legi informan dosierujon"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"malnova versio de pako havas tro longan informan dosiernomon kiu startas je "
"'%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "maleblas forigi maluzindan inform-dosieron '%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "maleblas instali la (supoze) novan inform-dosieron '%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "maleblas malfermi provizoran reg-dosierujon"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"la pako enhavas tro longan reg-informan dosiernomon (kiu startas je '%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "la pak-rega informo enhavis la dosierujon '%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "rmdir de '%.250s' per pak-rega informo ne diris ke ne estas dosierujo"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "la pako %s enhavis liston kiel inform-dosieron"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "maleblas instali novan inform-dosieron '%.250s' kiel '%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Ni rimarkas malaperon de %s, kiu estas entute anstataŭita.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "maleblas forigi la malaperintan reg-informan dosieron '%.250s'"
@@ -3823,7 +3823,7 @@ msgstr "dpkg-trigger: malvalida atendata pak-nomo '%.250s': %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "malvalida ekigila nomo '%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3832,7 +3832,7 @@ msgstr ""
"%s: ciklo estis trovata dum procezado de ekigiloj:\n"
" ĉeno da pakoj kies ekigiloj estas aŭ povas esti respondaj:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3841,11 +3841,11 @@ msgstr ""
"\n"
" traktotaj ekigiloj de pakoj kiuj estas aŭ povas esti nesolveblaj:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "ekigiloj iteraciadas, ni forlasas"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Procezado de ekigiloj por %s ...\n"
diff --git a/po/es.po b/po/es.po
index 2ecb7ce63..9e9a97462 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Debian dpkg 1.14.22\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-02-03 00:39+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1216,7 +1216,7 @@ msgstr "fin de fichero inesperado en `%.250s'"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "error al leer de una tubería de dpkg-deb"
@@ -1230,12 +1230,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "error al establecer las fechas de `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "error al establecer el propietario de `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "error al establecer los permisos de `%.255s'"
@@ -1255,7 +1255,7 @@ msgstr ""
"no se puede leer (desreferenciar) el enlace simbólico propuesto como destino "
"`%.250s' para el enlace simbólico `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1264,20 +1264,20 @@ msgstr ""
"intentando sobreescribir `%.250s', que es la versión desviada de `"
"%.250s' (paquete %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"intentando sobreescribir `%.250s', que es la versión desviada de `%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"no se puede efectuar `stat' sobre `%.255s' (que es lo que se iba a instalar)"
# Tinguaro puso "deshacer el lío". Se admiten ideas. sv
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1286,29 +1286,29 @@ msgstr ""
"no se puede arreglar el desaguisado de `%.255s' antes de instalar otra "
"versión"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"no se puede efectuar `stat' sobre el `%.255s' restablecido antes\n"
"de instalar otra versión"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "el archivo contiene el objeto `%.255s' de tipo 0x%x desconocido"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Reemplazando ficheros del paquete antiguo %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Reemplazado por ficheros en el paquete instalado %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1317,103 +1317,103 @@ msgstr ""
"intentando sobreescribir el directorio `%.250s' del paquete %.250s con un\n"
"no directorio"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"intentando sobreescribir `%.250s', que está también en el paquete %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "fallo al leer `%.255s' (en `%.255s')"
# FIXME: It is not clear enough what the `%.255s' is about. sv
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "error en dpkg-deb durante `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "error al cerrar/escribir `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "error al crear la tubería `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "error al crear el dispositivo `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "error al crear el enlace duro `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "error al crear el enlace simbólico `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "error al establecer la propiedad del enlace simbólico `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "error al crear el directorio `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "no se puede apartar `%.255s' para instalar una nueva versión"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "no se puede leer el enlace `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "no se puede respaldar enlace simbólico para `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"no se puede efectuar `chown' sobre el enlace simbólico de respaldo de `"
"%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"no se puede crear un enlace de seguridad de `%.255s' antes de instalar\n"
"la nueva versión"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "no se puede instalar una nueva versión de `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "no se puede crear `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "no se puede deshacer el búfer `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1422,7 +1422,7 @@ msgstr ""
"dpkg: atención - no se tendrá en cuenta el problema de dependencia con %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1431,7 +1431,7 @@ msgstr ""
"dpkg: aviso - considerando la desconfiguración del paquete\n"
" esencial %s, para activar %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1440,7 +1440,7 @@ msgstr ""
"dpkg: no, %s es esencial, no será desconfigurado\n"
" para activar %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1449,29 +1449,29 @@ msgstr ""
"dpkg: no, no se puede continuar con %s (--auto-deconfigure ayudará):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "la eliminación de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "la instalación de `%.255s'"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: considerando la desconfiguración de %s, ya que lo rompería %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: sí, se desconfigurará %s (roto por %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1480,14 +1480,14 @@ msgstr ""
"dpkg: acerca de %s que contiene %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: aviso - no se tiene la rotura,\n"
"¡se puede proceder de todas maneras!\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1496,17 +1496,17 @@ msgstr ""
"si se instalara %.250s se rompería %.250s, y \n"
" no es posible desconfigurarlo (--auto-deconfigure puede ayudar)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "la instalación de %.250s rompería software existente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: considerando desinstalar %s en favor de %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
@@ -1514,12 +1514,12 @@ msgstr ""
" dependencia de él.\n"
# provee/proporciona. ¿cuál es la diferencia? sv
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: puede haber problemas al desinstalar %s, ya que provee %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1528,73 +1528,73 @@ msgstr ""
"dpkg: el paquete %s requiere ser reinstalado, pero se desinstalará de todas\n"
" formas tal como se solicita.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: el paquete %s requiere ser reinstalado, no se desinstalará.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "el paquete %s tiene demasiadas parejas de Conflictos/Reemplazos"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: sí, se desinstalará %s en favor de %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "paquetes en conflicto - no se instalará %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
"dpkg: aviso - no se tiene en cuenta el conflicto,\n"
" ¡se puede proceder de todas maneras!\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive necesita al menos una ruta como argumento"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "fallo al ejecutar `find' para --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "fallo al efectuar `fdopen' en la tubería de find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "error al leer la tubería de find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "error al cerrar la tubería de find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "La búsqueda usando --recursive devolvió el error no manejado %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"se buscó, pero no se encontraron paquetes (ficheros que encajen con *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s necesita al menos un archivo de paquete como argumento"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1605,23 +1605,23 @@ msgstr "--%s necesita al menos un archivo de paquete como argumento"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Seleccionando el paquete %s previamente no seleccionado.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Omitiendo el paquete no seleccionado %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versión %.250s de %.250s ya instalada, omitiendo.\n"
@@ -1633,12 +1633,12 @@ msgstr "Versión %.250s de %.250s ya instalada, omitiendo.\n"
# buscar una que sea mínimamente razonable, aunque no sea tan común.
# El prefijo "des" nos ayuda en este caso a construir
# una palabra que significa lo contrario que actualizar. sv
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - atención: desactualizando %.250s de %.250s a %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2515,51 +2515,51 @@ msgstr "no se pueden establecer los permisos de ejecución en `%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "no se puede efectuar `setenv' para el programa de mantenimiento"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "script de `%s' antiguo"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "no se puede efectuar `stat' sobre %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "script %s nuevo"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "script de `%s' antiguo"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "no se puede efectuar `stat' sobre %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - probando el script del nuevo paquete en su lugar...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "no hay ningún script en la nueva versión del paquete - abandono"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... parece que todo fue bien.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "no se puede crear `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "fallo al ejecutar rm para limpieza"
@@ -3023,17 +3023,7 @@ msgstr "eof inesperado antes del fin de la línea %d"
msgid "need an action option"
msgstr "se necesita una opción de acción"
-#: src/packages.c:75
-#, c-format
-msgid "--%s --pending does not take any non-option arguments"
-msgstr "--%s --pending no toma ningún argumento que no sea una opción"
-
-#: src/packages.c:113 src/query.c:300 src/query.c:537
-#, c-format
-msgid "--%s needs at least one package name argument"
-msgstr "--%s necesita al menos un nombre de paquete como argumento"
-
-#: src/packages.c:120
+#: src/packages.c:113
msgid ""
"you must specify packages by their own names, not by quoting the names of "
"the files they come in"
@@ -3042,12 +3032,22 @@ msgstr ""
"nombres\n"
"de los ficheros en los que vienen"
-#: src/packages.c:162
+#: src/packages.c:134
+#, c-format
+msgid "--%s --pending does not take any non-option arguments"
+msgstr "--%s --pending no toma ningún argumento que no sea una opción"
+
+#: src/packages.c:139 src/query.c:300 src/query.c:537
+#, c-format
+msgid "--%s needs at least one package name argument"
+msgstr "--%s necesita al menos un nombre de paquete como argumento"
+
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paquete %s listado más de una vez, sólo se procesa una.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -3056,7 +3056,7 @@ msgstr ""
"¡Se ha desempaquetado más de una copia del paquete %s!\n"
" Se configurará solamente una vez.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -3065,78 +3065,78 @@ msgstr ""
"el paquete %.250s no está listo para procesar disparadores\n"
" (el estado actual es `%.250s' sin disparadorse pendientes)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " El paquete `%s' provee `%s' pero va a ser desinstalado.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " El paquete `%s' va a ser desinstalado.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " La versión de `%s' en el sistema es %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" El paquete `%s' qie provee `%s' está esperando al procesamiento de los "
"disparadores.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " El paquete %s está esperando al procesado de disparadores.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: también configurando `%s' (requerido por `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " El paquete `%s' que provee `%s' aún no está configurado.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " El paquete `%s' no está configurado todavía.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " El paquete `%s' que provee %s no está instalado.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " El paquete `%s' no está instalado.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr "%s (%s) rompe %s y es %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (%s) provee %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " La versión de `%s' que se desconfigurará es %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depende de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; sin embargo:\n"
@@ -3144,38 +3144,38 @@ msgstr "; sin embargo:\n"
msgid "(no description available)"
msgstr "(no hay ninguna descripción disponible)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "no se puede acceder al archivo"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "error al asegurarse de que `%.250s' no existe"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "fallo al ejecutar dpkg-split para ver si es parte de un multiparte"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "paquete reensamblado"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autentificando %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "fallo al ejecutar debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "¡Falló la verificación del paquete %s!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3184,32 +3184,32 @@ msgstr ""
"Falló la verificación del paquete %s,\n"
"pero se instalará de todas formas tal como se ha solicitado\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "correcto\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "fallo al crear nombre de directorio temporal"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "fallo al ejecutar dpkg-deb para extraer la información de control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Registrada la información sobre %s a partir de %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
"la arquitectura del paquete (%s) no corresponde con la del sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3218,107 +3218,107 @@ msgstr ""
"dpkg: acerca de %s que contiene %s, problema de predependencia:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema de predependencia - no se instala %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: atención - ¡descartando problema de predependencia!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Preparando para reemplazar %s %s (usando %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Desempaquetando %s (de %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"el nombre del conffile (que comienza por `%.250s')\n"
"es demasiado largo (>%d caracteres)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "error de lectura en %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "error al cerrar %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "error intentando abrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Desconfigurando %s, para poder eliminar %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Desconfigurando %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Desempaquetando el reemplazo de %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "no se puede ejecutar dpkg-deb para obtener el archivo"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "error al leer la salida de tar de dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "sistema de ficheros del archivo tar dañado - archivo de paquete dañado"
# Please, que alguien me diga qué es eso de zap. sv
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zapea posibles ceros finales"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: atención - no se pudo efecutar `stat' el fichero antiguo `%.250s' por "
"lo que no se borrará: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr ""
"dpkg: atención - no se puede borrar el directorio antiguo `%.250s': %s\n"
"\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: atención - el conffile antiguo `%.250s' era un directorio vací (y se "
"ha eliminado)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "no se puede efectuar `stat' otro fichero nuevo `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3327,75 +3327,75 @@ msgstr ""
"dpkg: atención - ¡el fichero antiguo `%.250s' es el mismo que algunos de los "
"nuevos ficheros! (tanto `%.250s' como `%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: atención - no se puede %s el fichero antiguo `%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "no se puede leer el directorio `info'"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"la versión antigua del paquete tiene un nombre de fichero de información\n"
"larguísimo que comienza por `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "no se puede borrar el fichero de información obsoleto `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
"no se puede instalar el (supuestamente) nuevo fichero de información `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "no se puede abrir el directorio de control temporal"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"el paquete contiene un nombre de fichero de información larguísimo\n"
"(comienza con `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "la información de control del paquete contiene el directorio `%.250s'"
# Este mensaje es realmente obtuso. Suerte que no sale nunca. sv
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"al borrar el directorio `%.250s' en la información de control del paquete\n"
"ocurrió un error distinto de no ser un directorio"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr ""
"dpkg: atención - el paquete %s contiene `list' como fichero de información"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"no se puede instalar el nuevo fichero de información `%.250s' como `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Note la desaparición de %s, que ha sido completamente reemplazado.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -4053,7 +4053,7 @@ msgstr "dpkg-trigger: nombre de paquete esperado ilegal `%.250s': %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: nombre de disparador inválido `%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -4062,7 +4062,7 @@ msgstr ""
"%s: se encontró un bucle al procesar los disparadores:\n"
" la cadena de paquetes cuyos disparadores son o pueden ser responsables:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -4071,11 +4071,11 @@ msgstr ""
"\n"
" disparadores pendientes de paquetes que no son o pueden no ser resolubles:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "los disparadores han entrado en bucle, abandonando"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Procesando disparadores para %s ...\n"
diff --git a/po/et.po b/po/et.po
index 430584162..fcbdce876 100644
--- a/po/et.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1133,7 +1133,7 @@ msgstr "ootamatu %s lõpp failis %.255s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "viga dpkg-deb torust lugemisel"
@@ -1147,12 +1147,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "viga `%.255s' ajatemplite sättimisel"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "viga `%.255s' omaniku sättimisel"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "viga `%.255s' pääsuõiguste sättimisel"
@@ -1169,201 +1169,201 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr "`%.250s' proovitakse üle kirjutada, see on juba pakis %.250s"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "`%.250s' proovitakse üle kirjutada, see on juba pakis %.250s"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr ""
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Failide asendamine vanas pakis %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Asendatud pakis %s olevate failidega ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "`%.250s' proovitakse üle kirjutada, see on juba pakis %.250s"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "`%.250s' proovitakse üle kirjutada, see on juba pakis %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "taustaprotsess dpkg-deb failiga `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "viga `%.255s' sulgemisel/kirjutamisel"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "viga toru `%.255s' loomisel"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "viga seadme `%.255s' loomisel"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "viga viida `%.255s' loomisel"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "viga nimeviida `%.255s' loomisel"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "viga nimeviida `%.255s' omaniku seadmisel"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "viga kataloogi `%.255s' loomisel"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "viita `%.255s' pole võimalik lugeda"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
"failist `%.255s' pole võimalik enne uue versiooni paigaldamist varukoopia "
"nimeviita luua"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "faili `%.255s' nimeviidale pole võimalik pääsuõigusi määrata (chown)"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"failist `%.255s' pole võimalik enne uue versiooni paigaldamist varukoopia "
"viita luua"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "faili `%.255s' pole võimalik luua"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "lähtefaili `%.250s' pole võimalik avada"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
"%s"
msgstr "dpkg: hoiatus - eelsõltuvuse probleemi eiramine!\n"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr "dpkg: %s eemaldamise otsustamine %s kasuks ...\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr ""
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
"%s"
msgstr ""
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "faili `%.250s' pole võimalik eemaldada"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: %s eemaldamise otsustamine %s kasuks ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: jah, %s eemaldatakse %s kasuks.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1372,110 +1372,110 @@ msgstr ""
"dpkg: mis puudutab pakki %2$s sisaldavat faili %1$s:\n"
"%3$s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: hoiatus - vastuolu eiratakse, jätkamine on võimalik !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %s eemaldamise otsustamine %s kasuks ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s pole korralikult paigaldatud - kõiki selle sõltuvusi eiratakse.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: %s eemaldamisega võib olla probleeme kuna see tagab %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr "dpkg: pakki %s ei eemaldata, see vajab taaspaigaldamist.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: pakki %s ei eemaldata, see vajab taaspaigaldamist.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pakil %s on liiga palju vastuolude/asenduste paare"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: jah, %s eemaldatakse %s kasuks.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "vastuolulised pakid, %.250s jäetakse paigaldamata"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: hoiatus - vastuolu eiratakse, jätkamine on võimalik !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr ""
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "tõrge --recursive jaoks käsu `find' käivitamisel"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "tõrge käsu `find' toru avamisel funktsiooniga fdopen"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "viga find'i torust lugemisel"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "viga find'i toru sulgemisel"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
"--recursive jaoks kasutatav käsk `find' tagastas käsitlematu veakoodi %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s vajab argumendiks vähemalt ühte pakiarhiivi nime"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1486,33 +1486,33 @@ msgstr "--%s vajab argumendiks vähemalt ühte pakiarhiivi nime"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Varem valimata paki %s valimine.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Valimata paki %s vahelejätmine.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr ""
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - hoiatus: paki %.250s versiooni alandamine %.250s -> %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2291,51 +2291,51 @@ msgstr ""
msgid "unable to setenv for maintainer script"
msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
-#: src/help.c:289
+#: src/help.c:290
#, 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:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr ""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "uus %s skript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "vana %s skript"
-#: src/help.c:402
+#: src/help.c:403
#, 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:412
#, 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:426
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:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr ""
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "faili `%.255s' pole võimalik luua"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "tõrge rm käivitamisel (puhastamiseks)"
@@ -2644,35 +2644,35 @@ msgstr ""
msgid "need an action option"
msgstr "tegevuse võti on vajalik"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr ""
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s vajab vähemalt ühte argumenti, mis oleks pakinimi"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
" in this run ! Only configuring it once.\n"
msgstr ""
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2681,76 +2681,76 @@ msgstr ""
"pakk %.250s pole seadistamiseks valmis\n"
" seadistamine pole võimalik (hetkeolek `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pakk %s, mis tagab %s, eemaldatakse.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pakk %s eemaldatakse.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Süsteemis olev %s versioon on %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pakk %s, mis tagab %s, eemaldatakse.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pakk %s eemaldatakse.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr ""
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pakk %s, mis tagab %s, pole veel seadistatud.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pakk %s pole veel seadistatud.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Pakk %s, mis tagab %s, pole paigaldatud.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pakk %s pole paigaldatud.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s tagab %.250s ja on ühtlasi %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (alamprotsess): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Süsteemis olev %s versioon on %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " sõltub pakist "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; igatahes:\n"
@@ -2758,38 +2758,38 @@ msgstr "; igatahes:\n"
msgid "(no description available)"
msgstr "(kirjeldus pole saadaval)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "arhiivile pole võimalik ligi pääseda"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr ""
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr ""
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Faili %s autentimine...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "tõrge debsig-verify käivitamisel (execl)"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Tõrge paki %s verifitseerimisel"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2798,196 +2798,196 @@ msgstr ""
"Paki %s verifitseerimine ei õnnestunud,\n"
"kuid Sinu nõudmisel paigaldatakse see ikkagi.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "läbitud\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "tõrge kataloogi loomisel"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "tõrge juhtandmete väljavõtmiseks dpkg-deb käivitamisel"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr ""
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "paki arhitektuur (%s) ei vasta süsteemile (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr ""
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "eelsõltuvuse probleem - %.250s jäetakse paigaldamata"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: hoiatus - eelsõltuvuse probleemi eiramine!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Ettevalmistused paki %s %s asendamiseks (%s abil) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Paki %s lahtipakkimine (failist %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "seadistusfaili nimi (algusega `%.250s') on liiga pikk (>%d märki)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr ""
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "viga %.250s sulgemisel"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr ""
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "Paki %s eemaldamine...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Paki %.250s asenduse lahtipakkimine ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "viga dpkg-deb tar väljundi lugemisel"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "vigase failisüsteemiga tar-fail - vigane pakiarhiiv"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr ""
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: hoiatus - vana kataloogi `%.250s' pole võimalik kustutada: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: hoiatus - vana seadistusfail `%.250s' oli tühi kataloog (ja on "
"nüüdseks kustutatud)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr ""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr ""
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "osafaili `%.250s' olekut pole võimalik fstat funktsiooniga lugeda"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "andmekataloogi pole võimalik lugeda"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr ""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr ""
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "paki juhtandmed sisaldavad kataloogi `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "Pakk `%s' ei sisalda ühtki faili (!)\n"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "juhtandmete kadunud faili `%.250s' pole võimalik kustutada"
@@ -3580,25 +3580,25 @@ msgstr "väli `%s', vigane pakinimi `%.255s': %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "väli `%s', vigane pakinimi `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Paki %s seadistusfailide eemaldamine ...\n"
diff --git a/po/eu.po b/po/eu.po
index fce64a5c6..307897bc3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg_po_eu\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-05-22 09:34+0200\n"
"Last-Translator: pi <pi>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -1166,7 +1166,7 @@ msgstr "ustekabeko fitxategi amaiera `%.250s'-(e)n"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "errorea dpkg-deb kanalizaziotik irakurtzean"
@@ -1182,12 +1182,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "errorea data-zigiluak ezartzean: `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "errorea jabetza ezartzean: `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "errorea baimenak ezartzean: `%.255s'"
@@ -1208,7 +1208,7 @@ msgstr ""
"Ezin da proposaturiko`%.250s' helburuaren egoera eskuratu `%.250s' lotura "
"sinbolikorako (erreferentzia kenduta)"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1217,19 +1217,19 @@ msgstr ""
"`%.250s' gainidazten saiatzen, zein `%.250s' desbideratutako bertsio bat da "
"(paketea: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"`%.250s' gaindiazten saiatzen , zein`%.250s'-en desbideratutako bertsio bat "
"den"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "ezin da `%.255s' atzitu (eta instalatzera nindoan)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1238,28 +1238,28 @@ msgstr ""
"ezin da garbitu `%.255s' inguruko nahastea, beste bertsio bat instalatu "
"aurretik"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"ezin da atzitu leheneratutako `%.255s' beste bertsio bat instalatu aurretik"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "artxiboko `%.255s' objektua mota ezezagunekoa da: 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "%s pakete zaharreko fitxategiak ordezten...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Instalaturiko %s paketeak ordezturiko fitxategiak...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1268,98 +1268,98 @@ msgstr ""
"%2$.250s paketeko `%1$.250s' direktorioa direktorioa ez den batekin "
"gainidazten saiatzen ari da"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "`%.250s' gainidazten saiatzen ari da; %.250s paketean ere badago"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "ezin da `%.255s' sortu (`%.255s' prozesatzean)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "atzealdeko dpkg-deb-en iraupena: `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "errorea `%.255s' ixtean/idaztean"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "errorea `%.255s' kanalizazioa sortzean"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "errorea `%.255s' gailua sortzean"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "errorea `%.255s' esteka fisikoa sortzean"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "errorea `%.255s' esteka sinbolikoa sortzean"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "errorea `%.255s' esteka sinbolikoaren jabetza ezartzean"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "errorea `%.255s' direktorioa sortzean"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "ezin da joan `%.255s'(e)ra bertsio berria instalatzeko"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "ezin da irakurri `%.255s' esteka"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "ezin da esteka sinbolikoaren babeskopia egin: `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "ezin da esteka sinbolikoaren babeskopiaren 'chown' egin: `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"bertsio berria instalatu aurretik ezin da estekaren babeskopia egin: `%.255s'"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "ezin da `%.255s' bertsio berria instalatu"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "ezin da`%.255s' sortu"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "ezin da`%.255s' bufferretik atera"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1368,7 +1368,7 @@ msgstr ""
"%s-ren dependentzia arazoari ezikusia egiten:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1377,7 +1377,7 @@ msgstr ""
"%s funtsezko paketea konfigurazioa kentzea\n"
" aztertzen, %s gaitu ahal izateko."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1386,7 +1386,7 @@ msgstr ""
"dpkg: ez, %s funtsezkoa da, ez da konfigurazioa kenduko\n"
" %s gaitu ahal izateko.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1395,17 +1395,17 @@ msgstr ""
"dpkg: ez, ezin da %s -rekin aurrera jarraitu (ikus --auto-deconfigure):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "%.250s ezabatzea"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "%.250s instalatzea"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1413,12 +1413,12 @@ msgstr ""
"dpkg: %s-ren konfigurazio kentzea kontutan hartzen, zein %s-ek apur "
"dezake ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: bai, %s konfigurazioa kenduko da, (%s-ek apurtua).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1427,11 +1427,11 @@ msgstr ""
"dpkg: %2$s daukan %1$s(r)i dagokionez:\n"
"%3$s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "apurketari ez ikusi egin zaio, hala ere aurrera jarraitzen!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1441,29 +1441,29 @@ msgstr ""
" konfigurazio kentzea ez da baimentzen (--auto-deconfigure lagungarri izan "
"daiteke)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "%.250s instalatzeak instalaturik dagoen softwarea apurtu dezake"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %s kentzea aztertzen, %s jartzeko...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s ez dago ondo instalatuta - mendekotasunei ez ikusi egingo zaie.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: beharbada arazoak egongo dira %s kentzeko, %s hornitzen\n"
" baitu...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1472,69 +1472,69 @@ msgstr ""
"dpkg: %s paketea berriro instalatu behar da, baina kendu egingo da eskatu "
"bezala.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: %s paketea berriro instalatu behar da, ez da kenduko.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "%s paketeak Elkar-jotze/Ordezte bikote gehiegi ditu"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: bai, %s kenduko da, eta %s jarri.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "gatazkan dauden paketeak - %.250s ez da instalatuko"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "gatazkari ez ikusi egin zaio, jarrai daiteke !"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive: bide-izenaren argumentu bat behar du gutxienez"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "--recursive: huts egin du bilaketa exekutatzean"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "fdopen-ek huts egin du find-en kanalizazioarekin"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "errorea find-en kanalizazioa irakurtzean"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "errorea find-en kanalizazioa ixtean"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "--recursive bilaketak maneiatu gabeko %i errorea itzuli du"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "bilatu bai, baina ez da paketerik aurkitu (*.deb fitxategiak)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s: pakete artxiboaren fitxategi argumentu bat behar du gutxienez"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1545,33 +1545,33 @@ msgstr "--%s: pakete artxiboaren fitxategi argumentu bat behar du gutxienez"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Aurrez ez hautaturiko %s paketea hautatzen.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Hautapena kendutako %s paketea saltatzen.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "%2$.250s %1$.250s bertsioa instalatuta dago, saltatu egingo da.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%.250s aurreko bertsiora itzultzen, %.250s-tik %.250s-ra."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2407,51 +2407,51 @@ msgstr "`%.250s': ezin da exekutatzeko baimenik ezarri"
msgid "unable to setenv for maintainer script"
msgstr "Ezin da mantenu skriptaren ingurunea ezarri (setenv)"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "%s script instalaturik"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "ezin da %s `%.250s' atzitu"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "%s script berria"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "%s script zaharra"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "ezin da %s `%.250s' atzitu: %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - pakete berriaren script-arekin saiatzen ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "ez dago script-ik paketearen bertsio berrian - uzten ari da"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... badirudi dena ondo joan dela.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "ezin da`%.255s' sortu"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "huts egin du rm garbitzeko exekutatzean"
@@ -2894,31 +2894,31 @@ msgstr "ustekabeko eof %d lerroa amaitu aurretik"
msgid "need an action option"
msgstr "ekintza aukera bat behar da"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"paketeen izenak zehaztu behar dituzu, ez paketeen barruko fitxategien izenak"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending: ez du hartzen aukerakoa ez den argumenturik"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s: pakete izenaren argumentu bat behar du gutxienez"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"paketeen izenak zehaztu behar dituzu, ez paketeen barruko fitxategien izenak"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"%s paketea behin baino gehiagotan azaltzen da, baina behin bakarrik "
"prozesatuko da.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2927,7 +2927,7 @@ msgstr ""
"%s paketearen kopia bat baino gehiago deskonprimitu da\n"
" exekuzio honetan! Behin bakarrik konfiguratuko da.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2936,76 +2936,76 @@ msgstr ""
"%.250s paketea ez dago prest abiarazle prozesurako\n"
" (uneko egoera: `%.250s' eta ez da abiarazlerik falta)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %s paketea, %s hornitzen duena kendu egingo da.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " %s paketea kendu egingo da.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " %s-ren sistemako bertsioa %s da.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %s paketea, %s hornitzen abiarzle prozesua itxoiten du.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %s paketeak abiarazle prozesua itxoiten du.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: `%s' ere konfiguratzen ari da (honek behar du: `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " %s paketea, %s hornitzen duena oraindik ez dago konfiguraturik.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " %s paketea ez dago konfiguratuta oraindik.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " %s paketea, %s hornitzen duena ez dago instalaturik.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " %s paketea ez dago instalatuta.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) -ek %s apurtzen du eta %s da.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) -ek %s hornitzen du.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Konfiguratuko den %s-ren bertsioa %s da.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " honen mendekoa da: "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; nolanahi ere:\n"
@@ -3013,40 +3013,40 @@ msgstr "; nolanahi ere:\n"
msgid "(no description available)"
msgstr "(azalpena ez dago erabilgarri)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "ezin da sartu artxiboan"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "errorea `%.250s' ez dagoela ziurtatzean"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"huts egin du dpkg-split exekutatzean fitxategi zatitu baten zati ote den "
"begiratzeko"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "pakete fitxategia berriz muntatu da"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "%s autentifikatzen...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "huts egin du debsig-verify exekutatzean (execl)"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Huts egin du %s paketea egiaztatzean!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3055,31 +3055,31 @@ msgstr ""
"Huts egin du %s paketea egiaztatzean,\n"
"baina eskatu bezala instalatuko da.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "gaindituta\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "huts egin du aldi baterako direktorio izena sortzean"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "huts egin du dpkg-deb exekutatzean kontrol-informazioa ateratzeko"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%s(r)i buruzko informazioa erregistratu da %s(e)tik.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "paketearen arkitektura (%s) ez dator bat sistemarekin (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3088,104 +3088,104 @@ msgstr ""
"dpkg: %2$s daukan %1$s: aurremendekotasun arazoa:\n"
"%3$s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "aurremendekotasun arazoa: %.250s ez da instalatuko"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "aurremendekotasun arazoari ez ikusi egingo zaio !"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "%s %s ordezteko prestatzen (%s erabiliz) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "%s (%s) deskonprimitzen...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"konf. fitxategiaren izena (`%.250s' hasten dena) luzeegia da (>%d karaktere)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250s: irakurketa errorea"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "errorea %.250s ixtean"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "errorea %.250s irekitzen saiatzean"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "%s konfigurazioa kentzen, %s kendu ahal izateko...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "%s konfigurazioa kentzen...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "%.250s ordeztea deskonprimitzen...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "ezin da exekutatu dpkg-deb fitxategi sistemaren artxiboa lortzeko"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "errorea dpkg-deb tar irteera irakurtzean"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
"fitxategi sistemaren tar fitxategia hondatu da - pakete artxiboa hondatuta "
"dago"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: kendu amaierako zero posibleak"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"Ezin da `%.250s' fitxategi zaharraren egoera eskuratu beraz ez da ezabatuko: "
"%s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "ezin da `%.250s' direktorio zaharra ezabatu: %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"`%.250s' konf. fitxategi zaharra direktorio huts bat da (eta ezabatua izango "
"da)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "ezin da beste `%.250s' fitxategiaren egoera eskuratu"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3194,70 +3194,70 @@ msgstr ""
"`%.250s' fitxategi zaharra zenbait fitxategi berrien berdina da! (bai `"
"%.250s' eta bai `%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "ezin da `%.250s' fitxategi zaharra %s: %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "ezin da irakurri informazio direktorioan"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"pakete bertsio zaharreko inf. fitxategiak izen luzeegia du;`%.250s' hasten da"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "ezin da kendu `%.250s' informazio fitxategi zaharkitua"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "ezin da instalatu `%.250s' (ustezko) informazio fitxategi berria"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "ezin da ireki aldi baterako kontrok direktorioa"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"paketeak kontroleko informazio fitxategi izen luzeegia dauka (`%.50s' hasten "
"da)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "paketearen kontrol informazioak `%.250s' direktorioa zeukan"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"`%.250s' rmdir paketearen kontrol informazioak ez du esaten direktorio bat "
"ez denik"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "%s paketeak zerrenda informazio fitxategi gisa zeukan"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "ezin da `%.250s' informazio fitxategi berria `%.250s' gisa instalatu"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Kontuan hartu %s desagertu dela, guztiz ordeztu delako.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "ezin da ezabatu desagertutako `%.250s' kontroleko inf. fitxategia"
@@ -3886,7 +3886,7 @@ msgstr "dpkg-trigger: legezkanpoko espero den `%.250s' pakete izena: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "`%.250s' abiarazle izen baliogabea: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3895,7 +3895,7 @@ msgstr ""
"%s: zikloa aurkitua abiarazlea prozesatzerakoan:\n"
" erantzule diren edo izan daitezkeen abiarazleen pakete katea:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3904,11 +3904,11 @@ msgstr ""
"\n"
" ebatzi ezin diren edo izan daitezkeen espero diren abiarazleen paketeak:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "abiarazle begizta, utzia"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "%s -ren abiarazleak prozesatzen ...\n"
diff --git a/po/fr.po b/po/fr.po
index 1820c61aa..111a5efcc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-03-25 19:07+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: fr <debian-l10n-french@lists.debian.org>\n"
@@ -258,7 +258,8 @@ msgstr "impossible d'ouvrir « %s » pour écrire la base de données %s"
#, c-format
msgid "unable to set buffering on %s database file"
msgstr ""
-"impossible de paramétrer la mise en tampon sur le fichier de base de données %s"
+"impossible de paramétrer la mise en tampon sur le fichier de base de données "
+"%s"
#: lib/dpkg/dump.c:391
#, c-format
@@ -278,7 +279,8 @@ msgstr "échec de la synchronisation de la base de données %s avec « %.250s 
#: lib/dpkg/dump.c:404
#, c-format
msgid "failed to close '%.250s' after writing %s database"
-msgstr "échec de clôture de « %.250s » après l'écriture de la base de données %s"
+msgstr ""
+"échec de clôture de « %.250s » après l'écriture de la base de données %s"
#: lib/dpkg/dump.c:408
#, c-format
@@ -379,7 +381,8 @@ msgstr "champ « %s » non autorisé dans le fichier d'états"
#: lib/dpkg/fields.c:106
#, c-format
msgid "too many values in file details field `%s' (compared to others)"
-msgstr "trop de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
+msgstr ""
+"trop de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
#: lib/dpkg/fields.c:120
#, c-format
@@ -449,7 +452,8 @@ msgstr "répertoire racine ou nul déclaré comme un « conffile »"
#: lib/dpkg/fields.c:333
#, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
msgstr ""
"champ « %s », nom de paquet manquant, ou absurdités à la place d'un nom de "
"paquet"
@@ -750,7 +754,8 @@ msgstr "le nom de champ « %.*s » doit être suivi de deux points (:)"
#: lib/dpkg/parse.c:181
#, c-format
msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "EOF avant la valeur du champ « %.*s » (il manque le saut de ligne final)"
+msgstr ""
+"EOF avant la valeur du champ « %.*s » (il manque le saut de ligne final)"
#: lib/dpkg/parse.c:185
#, c-format
@@ -1015,7 +1020,8 @@ msgstr ""
#: lib/dpkg/trigdeferred.l:216
#, c-format
msgid "unable to close new triggers deferred file `%.250s'"
-msgstr "impossible de fermer le nouveau fichier des actions différées « %.255s »"
+msgstr ""
+"impossible de fermer le nouveau fichier des actions différées « %.255s »"
#: lib/dpkg/trigdeferred.l:220
#, c-format
@@ -1087,8 +1093,8 @@ msgstr ""
#, c-format
msgid "unable to sync new trigger interest file '%.250s'"
msgstr ""
-"impossible de synchroniser le nouveau fichier des actions différées demandées "
-"« %.250s »"
+"impossible de synchroniser le nouveau fichier des actions différées "
+"demandées « %.250s »"
#: lib/dpkg/triglib.c:435
#, c-format
@@ -1228,26 +1234,27 @@ msgstr "fin de fichier inattendue pour « %.250s »"
msgid "error formatting string into varbuf variable"
msgstr "erreur de formatage de la chaîne dans la variable varbuf"
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "erreur de lecture du tube de dpkg-deb"
#: src/archives.c:202
#, c-format
msgid "skipped unpacking file '%.255s' (replaced or excluded?)"
-msgstr "omission de la décompression du fichier « %.255s » (remplacé ou exclu ?)"
+msgstr ""
+"omission de la décompression du fichier « %.255s » (remplacé ou exclu ?)"
#: src/archives.c:245
#, c-format
msgid "error setting timestamps of `%.255s'"
msgstr "erreur de paramétrage des cachets de date de « %.255s »"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "erreur de paramétrage des droits de « %.255s »"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "erreur de paramétrage des permissions de « %.255s »"
@@ -1267,7 +1274,7 @@ msgstr ""
"impossible d'analyser (déréférencer) la cible proposée du nouveau lien "
"symbolique « %.250s » pour le lien symbolique « %.250s »"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1276,20 +1283,20 @@ msgstr ""
"tentative de remplacement de « %.250s », qui est la version détournée de "
"« %.250s » (paquet : %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"tentative de remplacement de « %.250s », qui est la version détournée de "
"« %.250s »"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"impossible d'analyser « %.255s » (qui était sur le point d'être installé)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1298,28 +1305,28 @@ msgstr ""
"impossible de faire le ménage autour de « %.255s » avant d'installer une "
"autre version"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"impossible d'analyser « %.255s » restauré avant d'installer une autre version"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "l'archive contient un objet « %.255s » de type inconnu 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Remplacement de fichiers dans l'ancien paquet %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Remplacés par des fichiers du paquet %s déjà installé...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1328,105 +1335,105 @@ msgstr ""
"tentative de remplacement du répertoire « %.250s » dans le paquet %.250s "
"%.250s avec un élément de type différent"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"tentative de remplacement de « %.250s », qui appartient aussi au paquet "
"%.250s %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "impossible de créer « %.255s » (pendant le traitement de « %.255s »)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "backend dpkg-deb pendant « %.255s »"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "erreur pendant la fermeture/écriture de « %.255s »"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "erreur pendant la création du tube « %.255s »"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "erreur pendant la création du périphérique « %.255s »"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "erreur pendant la création du lien physique « %.255s »"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "erreur pendant la création du lien symbolique « %.255s »"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "erreur pendant la définition des droits du lien symbolique « %.255s »"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "erreur pendant la création du répertoire « %.255s »"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
"impossible de déplacer ailleurs « %.255s » afin d'en installer une nouvelle "
"version"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "impossible de lire le lien « %.255s »"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "impossible de créer un lien symbolique de secours pour « %.255s »"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"impossible de modifier les droits du lien symbolique de secours pour "
"« %.255s »"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"impossible de créer un lien symbolique de secours de « %.255s » avant "
"d'installer une nouvelle version"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "impossible d'installer une nouvelle version de « %.255s »"
-#: src/archives.c:831
+#: src/archives.c:839
#, c-format
msgid "unable to open '%.255s'"
msgstr "impossible d'ouvrir « %.255s »"
-#: src/archives.c:833
+#: src/archives.c:841
#, c-format
msgid "unable to sync file '%.255s'"
msgstr "impossible de synchroniser le fichier « %.255s »"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1435,7 +1442,7 @@ msgstr ""
"problème de dépendance avec %s :\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1444,7 +1451,7 @@ msgstr ""
"tentative de déconfiguration du paquet essentiel\n"
"%s pour activer %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1453,7 +1460,7 @@ msgstr ""
"dpkg : non, %s est essentiel, il ne sera pas déconfiguré\n"
" pour autoriser %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1462,28 +1469,29 @@ msgstr ""
"dpkg : non, impossible d'effectuer %s (voir --auto-deconfigure) :\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "la suppression de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "l'installation de %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
-msgstr "dpkg : tentative de déconfiguration de %s, qui serait cassé par %s ...\n"
+msgstr ""
+"dpkg : tentative de déconfiguration de %s, qui serait cassé par %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg : oui, déconfiguration de %s (cassé par %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1492,11 +1500,11 @@ msgstr ""
"dpkg : concernant %s contenant %s :\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "problème ignoré, il est peut-être possible de continuer !"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1506,29 +1514,29 @@ msgstr ""
" et la déconfiguration n'est pas autorisée (--auto-deconfigure pourrait "
"aider)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "l'installation de %.250s casserait un logiciel existant"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg : retirer %s en faveur de %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s n'est pas correctement installé - ses dépendances sont ignorées.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg : la suppression de %s peut être problématique, puisqu'il fournit%"
"s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1537,68 +1545,69 @@ msgstr ""
"dpkg : le paquet %s requiert une réinstallation mais sera supprimé quand "
"même, comme demandé.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
-msgstr "dpkg : le paquet %s requiert une réinstallation, suppression annulée.\n"
+msgstr ""
+"dpkg : le paquet %s requiert une réinstallation, suppression annulée.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "le paquet %s a trop de paires Conflicts/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg : oui, suppression de %s en faveur de %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "paquets en conflit - %.250s non installé"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "conflit ignoré, il est peut-être possible de continuer malgré tout."
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive a besoin d'au moins un chemin comme paramètre"
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr "« find » pour dpkg --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "échec de « fdopen » sur le tube de « find »"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "erreur pendant la lecture sur le tube de « find »"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "erreur pendant la fermeture du tube de « find »"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "Le find pour --recursive a renvoyé une erreur %i non gérée"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "recherché, mais aucun paquet trouvé (fichiers *.deb correspondant)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s a besoin d'au moins un fichier archive de paquet comme paramètre"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1609,33 +1618,33 @@ msgstr "--%s a besoin d'au moins un fichier archive de paquet comme paramètre"
msgid "<standard output>"
msgstr "<sortie standard>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<erreur standard>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Sélection du paquet %s précédemment désélectionné.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Paquet désélectionné %s ignoré.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Version %.250s de %.250s déjà installée, paquet ignoré.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "dégradation (« downgrade ») de %.250s depuis %.250s vers %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -1722,7 +1731,8 @@ msgstr "%s :échec de la liaison de « %.250s » à « %.250s » : %s"
#: src/configure.c:191
#, c-format
msgid "Installing new version of config file %s ...\n"
-msgstr "Installation de la nouvelle version du fichier de configuration %s ...\n"
+msgstr ""
+"Installation de la nouvelle version du fichier de configuration %s ...\n"
#: src/configure.c:197
#, c-format
@@ -2255,7 +2265,8 @@ msgstr ""
#: src/enquiry.c:386
#, c-format
msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr "ne peut satisfaire les pré-dépendances pour %.250s (réclamé par %.250s)"
+msgstr ""
+"ne peut satisfaire les pré-dépendances pour %.250s (réclamé par %.250s)"
#: src/enquiry.c:416
#, c-format
@@ -2263,7 +2274,8 @@ msgid "obsolete option '--%s', please use '--%s' instead."
msgstr "option obsolète « --%s », veuillez utiliser « --%s » à la place."
#: src/enquiry.c:457
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
msgstr ""
"--compare-versions prend trois paramètres : <version> <relation> <version>"
@@ -2286,7 +2298,8 @@ msgstr ""
" %s\n"
#: src/errors.c:67
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
msgstr ""
"dpkg : impossible d'allouer de la mémoire pour une nouvelle entrée dans la "
"liste des paquets en échec."
@@ -2313,7 +2326,8 @@ msgstr ""
#: src/errors.c:105
#, c-format
-msgid "Package %s is on hold, not touching it. Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it. Use --force-hold to override.\n"
msgstr ""
"Le paquet %s est à garder (on hold), et laissé tel quel. Utilisez --force-"
"hold pour passer outre.\n"
@@ -2496,52 +2510,52 @@ msgstr "impossible de paramétrer les permissions en exécution sur « %.250s 
msgid "unable to setenv for maintainer script"
msgstr "impossible d'utiliser « setenv » pour le script du responsable"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "script %s installé"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "impossible d'analyser %s « %.250s »"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nouveau script %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "ancien script %s"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "impossible d'analyser %s « %.250s » : %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr ""
"dpkg - tentative d'exécution du script du nouveau paquet à la place ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "il n'y a pas de script dans cette nouvelle version du paquet - abandon"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg : ... on dirait que tout a fonctionné correctement.\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "impossible de supprimer « %.255s » de façon sûre"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "échec de l'exécution de « rm » pour nettoyage"
@@ -3010,30 +3024,30 @@ msgstr "EOF inattendu avant la fin de la ligne %d"
msgid "need an action option"
msgstr "requiert une option d'action"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"vous devez spécifier les paquets par leur nom, et non par le nom des "
+"fichiers qui les contiennent"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending ne prend pas de paramètre non optionnel"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s a besoin d'au moins un nom de paquet comme paramètre"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"vous devez spécifier les paquets par leur nom, et non par le nom des "
-"fichiers qui les contiennent"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paquet %s listé plus d'une fois, mais traité une seule fois.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -3042,7 +3056,7 @@ msgstr ""
"Plus d'une copie du paquet %s ont été dépaquetées\n"
" lors de ce traitement. Une seule configuration effectuée.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -3052,78 +3066,78 @@ msgstr ""
"différées\n"
" ( état actuel « %.250s » sans action différée en attente)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Le paquet %s qui fournit %s doit être supprimé.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Le paquet %s doit être supprimé.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " La version de %s sur le système est %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" Le paquet « %s » qui fournit « %s » attend le traitement d'actions "
"différées.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Le paquet « %s » attend le traitement d'actions différées.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg : configuration additionnelle de « %s » (requise par « %s »)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Le paquet %s qui fournit %s n'est pas encore configuré.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Le paquet %s n'est pas encore configuré.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Le paquet %s qui fournit %s n'est pas installé.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Le paquet %s n'est pas installé.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) casse %s et est %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (%s) fournit %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " La version de %s à configurer est %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " dépend de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr " ; cependant :\n"
@@ -3131,40 +3145,40 @@ msgstr " ; cependant :\n"
msgid "(no description available)"
msgstr "(aucune description n'est disponible)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "ne peut pas accéder à l'archive"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "erreur obtenue en voulant s'assurer que « %.250s » n'existe pas"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"impossible d'exécuter dpkg-split pour voir s'il s'agit d'une partie d'un "
"fichier découpé"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "fichier du paquet rassemblé"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Authentification de %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "échec de l'exécution (par execl) de « debsig-verify »"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "La vérification du paquet %s a échoué."
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3173,31 +3187,32 @@ msgstr ""
"La vérification du paquet %s a échoué, mais traitement en cours malgré tout\n"
"comme demandé.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "réussi\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
msgid "unable to create temporary directory"
msgstr "impossible de créer un répertoire temporaire"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
"impossible d'exécuter dpkg-deb pour l'extraction des informations de contrôle"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Enregistrement de l'information sur %s de %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
-msgstr "l'architecture du paquet (%s) ne correspond pas à celle du système (%s)"
+msgstr ""
+"l'architecture du paquet (%s) ne correspond pas à celle du système (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3206,103 +3221,103 @@ msgstr ""
"dpkg : concernant %s contenant %s, problème de pré-dépendance :\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problème de pré-dépendance - %.250s non installé"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "problème de pré-dépendance ignoré"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Préparation du remplacement de %s %s (en utilisant %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Dépaquetage de %s (à partir de %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"le nom du conffile (commençant par « %.250s ») est trop long (>%d caractères)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "erreur de lecture dans %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "erreur de fermeture de %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "erreur survenue en essayant d'ouvrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Déconfiguration de %s, pour pouvoir supprimer %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Déconfiguration de %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Dépaquetage de la mise à jour de %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"impossible d'exécuter dpkg-deb pour obtenir l'archive du système de fichiers"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "erreur de lecture sur la sortie du « tar » de dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "archive du système de fichiers corrompue - archive du paquet corrompue"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb : suppression de possibles zéros finaux (i.e. de « trailing »)"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"impossible d'analyser l'ancien fichier « %.250s ». Il n'a donc pas été "
"effacé : %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "impossible de supprimer l'ancien répertoire « %.250s » : %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"l'ancien fichier de configuration « %.250s » était un répertoire vide et a "
"été supprimé"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "impossible d'analyser un autre nouveau fichier « %.250s »"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3311,72 +3326,72 @@ msgstr ""
"l'ancien fichier « %.250s » est identique à plusieurs nouveaux fichiers (à "
"la fois « %.250s » et « %.250s »)"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "impossible de supprimer l'ancien fichier « %.250s » de façon sûre : %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "ne peut pas lire le répertoire info"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"l'ancienne version du paquet a un nom de fichier d'information commençant "
"par « %.250s » trop long"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "impossible de supprimer le fichier info obsolète « %.250s »"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "impossible d'installer le (supposé) nouveau fichier info « %.250s »"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "impossible d'ouvrir le répertoire de contrôle temporaire"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"le paquet contient un nom de fichier de contrôle trop long (commençant par "
"« %.50s »)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "l'information de contrôle du paquet contient le répertoire « %.250s »"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"l'information de contrôle du paquet « rmdir » de « %.250s » ne dit pas que ce "
"n'est pas un répertoire"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "le paquet %s contient une liste comme fichier d'information"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"impossible d'installer le nouveau fichier info « %.250s » comme « %.250s »"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(À noter la disparition de %s, qui a été complètement remplacé.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "impossible de supprimer le fichier info de contrôle disparu « %.250s »"
@@ -3432,7 +3447,8 @@ msgstr "détournement localement en : %s\n"
#: src/query.c:238
msgid "--search needs at least one file name pattern argument"
-msgstr "--search a besoin d'au moins un motif de nom de fichier comme paramètre"
+msgstr ""
+"--search a besoin d'au moins un motif de nom de fichier comme paramètre"
#: src/query.c:279
#, c-format
@@ -3498,8 +3514,8 @@ msgstr "le fichier de contrôle contient %c"
#, c-format
msgid "Debian %s package management program query tool version %s.\n"
msgstr ""
-"Outil « %s » d'interrogation du programme de gestion de paquets Debian version "
-"%s\n"
+"Outil « %s » d'interrogation du programme de gestion de paquets Debian "
+"version %s\n"
#: src/query.c:589
#, c-format
@@ -4013,7 +4029,8 @@ msgstr "%s : registre des actions différées (« triggers ») pas encore pr
#: src/trigcmd.c:205
msgid "takes one argument, the trigger name"
-msgstr "a besoin d'un seul paramètre , le nom de l'action différée (« trigger »)"
+msgstr ""
+"a besoin d'un seul paramètre , le nom de l'action différée (« trigger »)"
#: src/trigcmd.c:210
msgid ""
@@ -4033,7 +4050,7 @@ msgstr "« dpkg-trigger » : nom de paquet illégal « %.250s » : « %.2
msgid "invalid trigger name `%.250s': %.250s"
msgstr "nom d'action différée non valable « %.250s » : « %.250s »"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -4042,7 +4059,7 @@ msgstr ""
"« %s » : boucle détectée durant le traitement des actions différées :\n"
" listes des paquets qui en sont responsables (normalement) :\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -4052,13 +4069,13 @@ msgstr ""
" paquets bloqués par le traitement impossible d'actions différées "
"requises :\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
"bloqué en boucle sur le traitement des actions différées (« triggers »), "
"abandon"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Traitement des actions différées (« triggers ») pour « %s »...\n"
@@ -4315,7 +4332,8 @@ msgstr "impossible d'exécuter « find »"
#: dpkg-deb/build.c:518 dpkg-deb/build.c:525
msgid "failed to write filename to tar pipe (data)"
-msgstr "l'écriture d'un nom de fichier à travers un tube tar (« data ») a échoué"
+msgstr ""
+"l'écriture d'un nom de fichier à travers un tube tar (« data ») a échoué"
#: dpkg-deb/build.c:529
msgid "<compress> from tar -cf"
@@ -4775,7 +4793,8 @@ msgstr "le fichier « %.250s » est corrompu - %.250s manquant"
#: dpkg-split/info.c:73
#, c-format
msgid "file `%.250s' is corrupt - missing newline after %.250s"
-msgstr "le fichier « %.250s » est corrompu - saut de ligne après %.250s manquant"
+msgstr ""
+"le fichier « %.250s » est corrompu - saut de ligne après %.250s manquant"
#: dpkg-split/info.c:107
msgid "info length"
@@ -5586,7 +5605,8 @@ msgstr "pas d'alternatives pour %s."
#: scripts/update-alternatives.pl:282
#, perl-format
msgid "%s is dangling, it will be updated with best choice."
-msgstr "%s pointe dans le vide et sera mis à jour avec le choix le plus adapté."
+msgstr ""
+"%s pointe dans le vide et sera mis à jour avec le choix le plus adapté."
#: scripts/update-alternatives.pl:286
#, perl-format
diff --git a/po/gl.po b/po/gl.po
index 892b6c3fe..c08ca4b21 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gl\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-12-17 21:51+0100\n"
"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -1211,7 +1211,7 @@ msgstr "fin de ficheiro inesperada ao ler \"%.250s\""
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "erro ao ler da canle de dpkg-deb"
@@ -1225,12 +1225,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "erro ao establecer as marcas de tempo de \"%.255s\""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "erro ao establecer o propietario de \"%.255s\""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "erro ao establecer os permisos de \"%.255s\""
@@ -1250,7 +1250,7 @@ msgstr ""
"non se puido atopar (desreferenciar) o novo destino proposto \"%.250s\" para "
"a ligazón simbólica \"%.250s\""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1259,18 +1259,18 @@ msgstr ""
"téntase sobrescribir \"%.250s\", que é a versión desviada de \"%.250s"
"\" (paquete: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"téntase sobrescribir \"%.250s\", que é a versión desviada de \"%.250s\""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "non se pode atopar \"%.255s\" (que se ía instalar)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1279,28 +1279,28 @@ msgstr ""
"non se pode limpar o barullo que rodea a \"%.255s\" antes de instalar outra "
"versión"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"non se pode atopar o \"%.255s\" restaurado antes de instalar outra versión"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "o arquivo contiña un obxecto \"%.255s\" de tipo 0x%x descoñecido"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "A substituír os ficheiros do paquete antigo %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Substituíronse por ficheiros do paquete instalado %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1309,100 +1309,100 @@ msgstr ""
"téntase sobrescribir o directorio \"%.250s\" do paquete %.250s con algo que "
"non é un directorio"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "téntase sobrescribir \"%.250s\", que tamén está no paquete %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "non se pode ler \"%.255s\" (en \"%.255s\")"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "back-end dpkg-deb durante \"%.255s\""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "erro ao pechar ou gravar en \"%.255s\""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "erro ao crear a canle \"%.255s\""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "erro ao crear o dispositivo \"%.255s\""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "erro ao crear a ligazón dura \"%.255s\""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "erro ao crear a ligazón simbólica \"%.255s\""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "erro ao establecer o propietario da ligazón simbólica \"%.255s\""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "erro ao crear o directorio \"%.255s\""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "non se pode apartar \"%.255s\" para instalar a nova versión"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "non se pode ler a ligazón \"%.255s\""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "non se pode facer unha copia da ligazón simbólica \"%.255s\""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"non se pode cambiar o propietario da copia da ligazón simbólica \"%.255s\""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"non se pode facer unha copia da ligazón simbólica \"%.255s\" antes de "
"instalar a nova versión"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "non se pode instalar unha nova versión de \"%.255s\""
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "non se pode crear \"%.255s\""
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "non se puido sacar do buffer \"%.255s\""
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1411,7 +1411,7 @@ msgstr ""
"dpkg: aviso - ignórase o problema de dependencias con %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1420,7 +1420,7 @@ msgstr ""
"dpkg: aviso - a considerar a desconfiguración do paquete esencial\n"
" %s, para activar %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1429,7 +1429,7 @@ msgstr ""
"dpkg: non, %s é esencial, non se ha desconfigurar para\n"
" activar %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1438,29 +1438,29 @@ msgstr ""
"dpkg: non, non se pode continuar con %s (--auto-deconfigure ha axudar):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "eliminación de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalación de %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: a considerar a desconfiguración de %s, que había romper por %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: si, hase desconfigurar %s (roto por %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1469,12 +1469,12 @@ msgstr ""
"dpkg: respecto a %s que contén %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: aviso - a ignorar a rotura, hase continuar igualmente\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1483,28 +1483,28 @@ msgstr ""
"a instalación de %.250s había romper %.250s, e\n"
" non se permite a desconfiguración (--auto-deconfigure pode axudar)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "a instalación de %.250s había romper software existente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: a considerar a eliminación de %s en favor de %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s non está instalado correctamente - ignóranse tódalas dependencias del.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: pode terse problemas para eliminar %s, xa que fornece %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1513,73 +1513,73 @@ msgstr ""
"dpkg: o paquete %s precisa dunha reinstalación, pero hase eliminar como "
"pide.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: o paquete %s precisa dunha reinstalación, non se ha eliminar.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "o paquete %s ten demasiadas parellas Conflicts/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: si, hase eliminar %s en favor de %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "paquetes con conflictos - non se instala %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: aviso - a ignorar o conflicto, hase continuar igualmente\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive precisa de alomenos un argumento de ruta"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "non se puido executar \"find\" para --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "non se puido abrir a canle de find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "erro ao ler da canle de find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "erro ao pechar a canle de find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "a execución de \"find\" para --recursive voltou o erro %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"buscouse, pero non se atopou ningún paquete (ficheiros que encaixan con *."
"deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
"--%s precisa de alomenos un argumento de ficheiro de arquivo de paquete"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1590,33 +1590,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "A escoller o paquete %s anteriormente deseleccionado.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "A omitir o paquete deseleccionado %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "A versión %.250s de %.250s xa está instalada, omítese.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - aviso: a desactualizar %.250s de %.250s a %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "Non se ha desactualizar %.250s da versión %.250s a %.250s, omítese.\n"
@@ -2462,51 +2462,51 @@ msgstr "non se poden establecer permisos de execución en \"%.250s\""
msgid "unable to setenv for maintainer script"
msgstr "non se pode modificar o ambiente para o script de mantedor"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "antigo script de %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "non se pode atopar o %s \"%s.250s\""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "novo script de %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "antigo script de %s"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "non se pode atopar o %s \"%s.250s\""
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - próbase o script do novo paquete no seu canto ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "non hai un script na nova versión do paquete - abandónase"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... semella que iso foi ben.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "non se pode crear \"%.255s\""
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "non se puido executar rm para a limpeza"
@@ -2942,30 +2942,30 @@ msgstr "fin de ficheiro inesperada antes da fin da liña %d"
msgid "need an action option"
msgstr "precísase dunha opción de acción"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"debe especificar os paquetes polos seus nomes, non polos nomes dos ficheiros "
+"nos que viñan"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending non toma ningún argumento que non sexa unha opción"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s precisa de alomenos un argumento de nome de paquete"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"debe especificar os paquetes polos seus nomes, non polos nomes dos ficheiros "
-"nos que viñan"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "O paquete %s aparece máis dunha vez, só se procesa unha vez.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2974,7 +2974,7 @@ msgstr ""
"Desempaquetouse máis dunha copia do paquete %s nesta execución.\n"
"Só se configura unha vez.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2983,77 +2983,77 @@ msgstr ""
"o paquete %.250s non está listo para o procesamento dos disparadores\n"
" (estado actual \"%.250s\" sen disparadores pendentes)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Hase eliminar o paquete %s, que fornece %s.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Hase eliminar o paquete %s.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " A versión de %s no sistema é %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" O paquete %s que fornece %s espera o procesamento dos disparadores.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " O paquete %s espera o procesamento dos disparadores.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: tamén se configura \"%s\" (requirido por \"%s\")\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " O paquete %s, que fornece %s, aínda non está configurado.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " O paquete %s aínda non está configurado.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " O paquete %s, que fornece %s, non está instalado.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " O paquete %s non está instalado.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) rompe %s e está %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) fornece %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " A versión de %s a configurar é %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depende de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; nembargantes:\n"
@@ -3061,39 +3061,39 @@ msgstr "; nembargantes:\n"
msgid "(no description available)"
msgstr "(non hai unha descrición dispoñible)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "non se pode acceder ao arquivo"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "erro ao asegurarse de que \"%.250s\" non existe"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"non se puido executar dpkg-split para ver se é parte dun arquivo multiparte"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "ficheiro de paquete reensamblado"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "A autenticar %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "non se puido executar debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "A verificación do paquete %s fallou"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3102,31 +3102,31 @@ msgstr ""
"A verificación do paquete %s fallou,\n"
"pero instálase igualmente como solicitou.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "aprobado\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "non se puido crear un nome para o directorio temporal"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "non se puido executar dpkg-deb para extraer a información de control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Rexistrouse a información sobre %s de %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "a arquitectura do paquete (%s) non coincide co sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3135,107 +3135,107 @@ msgstr ""
"dpkg: a propósito de %s que contén %s, problema de predependencias:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema de predependencias - non se instala %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: aviso - ignórase o problema de predependencias\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "A se preparar para substituír %s %s (emprégase %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "A desempaquetar %s (de %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"o nome do ficheiro de configuración (que comeza por \"%.250s\") é longo de "
"máis (máis de %d caracteres)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "erro de lectura en %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "erro ao pechar %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "erro ao tentar abrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "A desconfigurar %s, para poder eliminar %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "A desconfigurar %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "A desempaquetar o %.250s substituto ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"non se pode executar dpkg-deb para obter o arquivo do sistema de ficheiros"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "erro ao ler a saída de tar de dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
"arquivo tar do sistema de ficheiros corrompido - arquivo de paquete "
"corrompido"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: a borrar os posibles ceros finais"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: aviso - non se pode atopar o ficheiro antigo \"%.250s\", así que non "
"se borra: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: aviso - non se pode borrar o directorio antigo \"%.250s\": %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: aviso - o ficheiro de configuración antigo \"%.250s\" era un "
"directorio baleiro (e borrouse agora)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "non se atopou outro ficheiro novo \"%.250s\""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3244,76 +3244,76 @@ msgstr ""
"dpkg: aviso - o ficheiro antigo \"%.250s\" é o mesmo que varios ficheiros "
"novos (\"%.250s\" e \"%.250s\")\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: aviso - non se pode %s o ficheiro antigo \"%%.250s\": %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "non se pode ler o directorio de información"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"a antiga versión do paquete ten un nome de ficheiro de información longo de "
"máis, que comeza por \"%.250s\""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "non se pode eliminar o ficheiro de información obsoleto \"%.250s\""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
"non se pode instalar o (suposto) novo ficheiro de información \"%.250s\""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "non se pode abrir o directorio de control temporal"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"o paquete contén un nome de ficheiro de información de control longo de máis "
"(que comeza por \"%.50s\")"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "a información de control do paquete contiña o directorio \"%.250s\""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"a proba de borrar o ficheiro de control do paquete \"%.250s\" coma "
"directorio non deu un erro por non ser un directorio"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr ""
"dpkg: aviso - o paquete %s contiña unha lista coma ficheiro de información"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"non se pode instalar o novo ficheiro de información \"%.250s\" coma \"%.250s"
"\""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
"(Tense en conta a desaparición de %s, que foi substituido totalmente).\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3958,7 +3958,7 @@ msgstr "dpkg-trigger: nome de paquete agardado \"%.250s\" non válido: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: nome de disparador \"%.255s\" non válido: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3967,7 +3967,7 @@ msgstr ""
"%s: atopouse un ciclo ao procesar os disparadores:\n"
" cadea de paquetes dos que os disparadores son ou poden ser responsables:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3976,11 +3976,11 @@ msgstr ""
"\n"
" disparadores pendentes que son ou poderían ser irresolubles:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "os disparadores están nun ciclo, abandónanse"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "A procesar os disparadores de %s ...\n"
diff --git a/po/hu.po b/po/hu.po
index 74126f92c..94dc0338c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-05-02 15:45+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: hu\n"
@@ -1137,7 +1137,7 @@ msgstr "váratlan fájl vége jel itt: %.250s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "hiba a dpkg-deb cső olvasásakor"
@@ -1151,12 +1151,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "nem sikerült beállítani `%.255s' időpecsétjét"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "nem sikerült beállítani `%.255s' tulajdonosát"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "nem sikerült beállítani `%.255s' jogait"
@@ -1173,7 +1173,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1182,46 +1182,46 @@ msgstr ""
"kísérlet `%.255s' felülírására, ami a(z) `%.250s'%.10s%.100s%.10s eltérített "
"verziója."
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"kísérlet `%.255s' felülírására, ami a(z) `%.250s'%.10s%.100s%.10s eltérített "
"verziója."
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "nem találom `%.255s'-t (melyet telepítenem kéne)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "az archívum `%.255s' objektuma ismeretlen 0x%x típusú"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Fájlok cseréje a régi %s csomagban...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "A telepített %s csomag fájljai cserélték ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1229,99 +1229,99 @@ msgid ""
msgstr ""
"`%.250s' könyvtár felülírási kísérlete a csomagban: %.250s más fájltípussal"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"`%.250s' felülírási kísérlete, mely az alábbi csomagban is szerepel: %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "`%.255s' olvasási hiba (itt: `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "háttér dpkg-deb `%.255s' során"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "hiba az alábbi lezárásakor/írásakor: `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "hiba az alábbi cső létrehozásakor: `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "hiba az alábbi eszköz létrehozásakor: `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "hiba az alábbi merev lánc létrehozásakor: `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "hiba az alábbi jelképes lánc létrehozásakor: `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "hiba az alábbi jlánc tulajdonosának beállításakor: `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "hiba az alábbi könyvtár létrehozásakor: `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "nem tudom elmozdítani `%.255s'-t az új változat telepítéséhez"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "meghiúsult e lánc olvasása: `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"nem tudom elkészíteni `%.255s' mentő láncát az új változat telepítése előtt"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "nem tudom telepíteni `%.255s' új verzióját"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "`%.255s' nem hozható létre"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "e forrásfájl nem megnyitható: `%.250s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1331,7 +1331,7 @@ msgstr ""
"függőségi gondokat:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1340,7 +1340,7 @@ msgstr ""
"dpkg: figyelem - egy lényeges csomag: %s dekonfigurálását\n"
" választottad %s eltávolításáért.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1349,7 +1349,7 @@ msgstr ""
"dpkg: nem, %s lényeges, nem dekonfigurálom\n"
" %s eltávolításáért.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1358,28 +1358,28 @@ msgstr ""
"dpkg: nem, nem tudom törölni %s-t (--auto-deconfigure segít):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "olvasási hiba itt: %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "nem tudom telepíteni `%.255s' új verzióját"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: %s törlése %s javára...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: igen, törlöm %s-t %s javára.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1388,109 +1388,109 @@ msgstr ""
"dpkg: %s miatt %s-t is tartalmazza:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: figyelem - az ütközések figyelmen kívül hagyásával folytatom !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %s törlése %s javára...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s nincs rendben telepítve - kihagyom, amik tőle függenek.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: gond lehet %s törlésekor, mivel %s-t adja ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr "dpkg %s újratelepítést kíván, de kérésedre törlöm.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg %s újratelepítést kíván, nem törlöm.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: igen, törlöm %s-t %s javára.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "ütköző csomagok - nem telepítem %.250s-t"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: figyelem - az ütközések figyelmen kívül hagyásával folytatom !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive legalább 1 ösvény argumentumot vár"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "find futtatása a --recursive-hoz sikertelen"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "sikertelen fdopen a find csőhöz"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "hiba a find cső olvasásakor"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "hiba a find cső lezárásakor"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "a find a --recursive-hoz kezeletlen hibával tért vissza: %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "kerestem, de nem leltem csomagokat (*.deb fájlokat)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s legalább 1 csomagarchívum fájl argumentumot vár"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1501,33 +1501,33 @@ msgstr "--%s legalább 1 csomagarchívum fájl argumentumot vár"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Új csomag kiválasztása: %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Kijelöletlen %s csomag átugrása.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "E csomag %.250s veziója: %.250s már telepített, átugrom.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - figyelem: %.250s öregbítése innen: %.250s ide: %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2353,51 +2353,51 @@ msgstr "`%.250s' futtatási jogainak beállítása sikertelen"
msgid "unable to setenv for maintainer script"
msgstr "nem lehet stat-olni a vsnprintf-ben"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "régi %s szkript"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "nem lelem %s `%.250s'-t"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "új %s szkript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "régi %s szkript"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nem lelem %s `%.250s'-t"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - inkább megnézem az új csomag szkriptjét ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "nincs új szkript a csomag új változatában - feladom"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... úgy fest, rendben ment.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "`%.255s' nem hozható létre"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "az rm futtatása a tisztításhoz nem sikerült"
@@ -2829,28 +2829,28 @@ msgstr "váratlan eof e sor vége előtt: %d"
msgid "need an action option"
msgstr "egy művelet opciót igényel"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr "a csomagok sima nevét kell megadnod, nem az őket tartalmazó fájlokét"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "a --%s --pending nem fogad non-opcionális argumentumot"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "a --%s legalább 1 csomagnév argumentot vár"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr "a csomagok sima nevét kell megadnod, nem az őket tartalmazó fájlokét"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "E csomag: %s többször szerepel, csak egyszer dolgozom fel.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2859,7 +2859,7 @@ msgstr ""
"A(z) %s csomag több másolata kicsomagolt egy körben !\n"
" Csak egyszer állítom be.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2868,76 +2868,76 @@ msgstr ""
"A(z) %.250s csomag nem beállítható\n"
" (jelenlegi állapota: `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %.s, mely %s-t adja eltávolításra jelölt.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " %.s eltávolításra jelölt.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " %s rendszeren lévő verziója %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %.s, mely %s-t adja eltávolításra jelölt.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %.s eltávolításra jelölt.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: ez is beállításra kerül: `%s' (`%s' kéri)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " %.s, mely %s-t adja nincs beállítva.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " %s csomag még beállítatlan.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " `%s' csomag, mely %s-t adja nincs telepítve.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " `%s' csomag nincs telepítve.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s adja %.250s-t és %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (alfolyamat): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %s rendszeren lévő verziója %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " függőségek: "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; ám:\n"
@@ -2945,38 +2945,38 @@ msgstr "; ám:\n"
msgid "(no description available)"
msgstr "(nincs leírás)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "az archívum nem elérhető"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "hiba `%.250s' hiánya ellenőrzésekor"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "újrarendezett csomag fájl"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "%s hitelesítése ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "sikertelen debsig-verify futtatás"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "%s csomag hitelesítése meghiúsult!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2985,131 +2985,131 @@ msgstr ""
"%s csomag hitelesítése meghiúsult,\n"
"de telepítem, mert így akartad.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr ""
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "hiba az átmeneti könyvtárnév létrehozásakor"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "a dpkg-deb futtatása sikertelen az ellenőrző adatok kibontásához"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%s információit rögzítettem innen: %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "a csomag géptípusa (%s) eltér a rendszertől (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr ""
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "elő-függőségi gond - %.250s nem települ"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: figyelem - elő-függőségi gondok átlépése !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "%s %s cseréjének előkészítése (e csomaggal: %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Kicsomagolás: %s innen: %s ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "a konffájl neve (kezdete: `%.250s') túl hosszú (>%d karakter)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "olvasási hiba itt: %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "hiba %.250s bezárásakor"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "hiba %.250s megnyitásakor"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "%s dekonfigurálása, így %s eltávolíthatóvá válik...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "Eltávolítás: %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Csere kicsomagolása: %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "nem futtatható a dpkg-deb a fájlrendszer archívum eléréséhez"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "hiba a dpkg-deb tar kimenet olvasásakor"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "hibás fájlrendszer tarfájl -- hibás csomag archívum"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: lehetséges vezető 0-ák levágása"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg: figyelem - nem lelem a régi fájlt: `%.250s' így nem törlöm: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: figyelem - nem törölhető a régi könyvtár: `%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: figyelem - a régi konffájl: `%.250s' egy üres könyvtár volt (ezt most "
"törlöm)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "nem találom a másik `%.250s' új fájlt"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3118,66 +3118,66 @@ msgstr ""
"dpkg: figyelem - `%.250s' régi fájl új fájlokkal egyezik! (`%.250s' és `"
"%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: figyelem - nem tudom %s a régi fájlt `%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "az info könyvtár nem olvasható"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"a csomag régi verziójában túl hosszú info fájlnév van, kezdete: `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "nem tudom eltávolítani az elavult `%.250s' info fájlt"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "nem tudom telepíteni az (állítólagos) új `%.250s' info fájlt"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "nem tudom megnyitni az átmeneti ellenőrző könyvtárat"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "a csomagban túl hosszú control info fájlnév van (kezdete: `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr ""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: figyelem - %s csomag listát tartalmazott info fájlként"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "nem tudom telepíteni az új `%.250s' info fájlt, mint `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "nem tudom törölni az eltűnt `%.250s' kontroll info fájlt"
@@ -3794,25 +3794,25 @@ msgstr "`%s' mező, érvénytelen `%.255s' csomagnév: %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "`%s' mező, érvénytelen `%.255s' csomagnév: %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "%s beállító fájlok törlése ...\n"
diff --git a/po/id.po b/po/id.po
index d91b64f37..d40fbb273 100644
--- a/po/id.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2006-02-17 08:52+0200\n"
"Last-Translator: Parlin Imanuel <parlin_i@yahoo.com>\n"
"Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
@@ -1150,7 +1150,7 @@ msgstr "akhiran berkas dalam %.250s tidak diharapkan"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "ada kesalahan saat membaca pipe dpkg-deb"
@@ -1164,12 +1164,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "Ada kesalahan penyetelan tanda waktu pada `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "Ada kesalahan penyetelan kepemilikan pada `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "Ada kesalahan penyetelan perizinan pada `%.255s'"
@@ -1186,7 +1186,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1195,19 +1195,19 @@ msgstr ""
"mencoba menimpa `%.250s', yang merupakan versi `%.250s'%.10s%.100s%.10s yang "
"dialihkan"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"mencoba menimpa `%.250s', yang merupakan versi `%.250s'%.10s%.100s%.10s yang "
"dialihkan"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "tidak bisa melakukan 'stat' pada `%.255s' (yang ingin saya pasang)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1215,27 +1215,27 @@ msgid ""
msgstr ""
"gagal membersihkan kekacauan sekitar `%.255s' sebelum memasang versi lain."
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "gagal mengembalikan 'stat' pada `%.255s' sebelum memasang versi lain "
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arsip berisi obyek `%.255s' dari jenis 0x%x yang tak dikenal"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Sedang mengganti berkas-berkas dalam paket lama %s ... \n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Digantikan oleh berkas-berkas dalam paket terinstal %s ... \n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1244,98 +1244,98 @@ msgstr ""
"sedang mencoba menimpa direktori `%.250s' dalam paket %.250s dengan non-"
"direktori"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "sedang mencoba menimpa `%.250s', yang juga ada dalam paket %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "gagal membaca `%.255s' (dalam `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "backend dpkg-deb saat `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "Ada kesalahan menutup/menulis `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "Ada kesalahan saat membuat pipe `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "Ada kesalahan saat membuat piranti `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "ada kesalahan saat membuat 'hard link' `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "ada kesalahan saat membuat link simbolik `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "ada kesalahan saat menyetel kepemilikan symlink `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "Ada kesalahan saat membuat direktori `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "tidak bisa memindahkan `%.255s' untuk memasang versi yang baru"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "tidak bisa membaca link `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "tidak bisa membuat symlink cadangan untuk `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "tidak dapat melakukan 'chown' symlink cadangan untuk `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"tidak bisa membuat link cadangan untuk `%.255s' sebelum memasang versi baru"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "tidak bisa memasang versi baru dari `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "tidak bisa membuat `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "tidak bisa mematikan penyangga (buffer) `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1345,7 +1345,7 @@ msgstr ""
"s: \n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1354,7 +1354,7 @@ msgstr ""
"dpkg: PERINGATAN - sedang mencoba dekonfigurasi paket-paket sangat penting \n"
"%s, agar dapat membuang paket %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1363,7 +1363,7 @@ msgstr ""
"dpkg: tidak, %s sangat penting, tidak akan melakukan dekonfigurasi \n"
"agar dapat membuang paket %s. \n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1373,28 +1373,28 @@ msgstr ""
"membantu): \n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "Ada kesalahan saat membaca %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "tidak bisa memasang versi baru dari `%.255s'"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: sedang mencoba membuang %s sehubungan dengan paket %s ... \n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ya, akan membuang %s sehubungan dengan paket %s.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1403,43 +1403,43 @@ msgstr ""
"dpkg: memandang %s berisi %s: \n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: PERINGATAN - abaikan paket yang bentrok, proses dilanjutkan! \n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: sedang mencoba membuang %s sehubungan dengan paket %s ... \n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s tidak terpasang dengan benar - abaikan semua ketergantungan dengan paket "
"ini. \n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: mungkin ada masalah saat membuang %s, karena paket ini menyediakan %"
"s ... \n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1448,74 +1448,74 @@ msgstr ""
"dpkg: paket %s perlu dipasang ulang, tetapi akan dibuang sesuai dengan "
"permintaan Anda. \n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: paket %s perlu dipasang ulang, tidak akan dibuang.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ya, akan membuang %s sehubungan dengan paket %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "paket-paket berbenturan - tidak akan memasang %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: PERINGATAN - abaikan paket yang bentrok, proses dilanjutkan! \n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive perlu sedikitnya satu argumen path"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "gagal menjalankan perintah 'find' untuk --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "Gagal melakukan fdopen pipe 'find'"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "Ada kesalahan saat membaca pipe 'find'"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "Ada kesalahan saat menutup pipe 'find'"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
"perintah 'find' untuk --recursive menghasilkan kesalahan yang tak teratasi: %"
"i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"telah dicari, tetapi tidak menemukan suatu paket pun (berkas-berkas yang "
"cocok dengan *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s butuh sedikitnya satu argumen berkas arsip paket"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1526,34 +1526,34 @@ msgstr "--%s butuh sedikitnya satu argumen berkas arsip paket"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Memilih paket %s yang sebelumnya tidak dipilih. \n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Abaikan paket yang tak dipilih: %s. \n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versi %.250s dari paket %.250s telah dipasang, dilewati.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
"%s - PERINGATAN: menurunkan versi paket %.250s dari %.250s ke %.250s. \n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2382,51 +2382,51 @@ msgstr "tidak bisa menyetel izin eksekusi pada `%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "Tidak bisa melakukan 'stat' dalam vsnprintf"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "script %s lama"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "gagal melakukan 'stat' %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "skrip %s baru"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "script %s lama"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "gagal melakukan 'stat' %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - mencoba skrip dari paket baru saja ... \n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "tidak ada skrip dalam paket versi terbaru - menyerah"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... tampaknya semua berjalan BAIK.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "tidak bisa membuat `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "gagal menjalankan perintah 'rm' untuk membersihkan"
@@ -2775,30 +2775,30 @@ msgstr "eof tidak diharapkan sebelum akhir baris %d"
msgid "need an action option"
msgstr "butuh suatu pilihan aksi"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"Anda harus menentukan paket dengan namanya masing-masing, bukan dengan "
+"mengutip nama berkas-berkas yang dibawanya."
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending tidak butuh suatu argumen bukan-pilihan"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s butuh sedikitnya satu argumen nama paket"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"Anda harus menentukan paket dengan namanya masing-masing, bukan dengan "
-"mengutip nama berkas-berkas yang dibawanya."
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paket %s terdaftar lebih dari sekali, hanya memprosesnya sekali.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2807,7 +2807,7 @@ msgstr ""
"Lebih dari satu salinan paket %s yang telah dibuka\n"
" dalam pemasangan ini! Hanya akan mengonfigurasi sekali saja.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2816,76 +2816,76 @@ msgstr ""
"paket %.250s belum siap dikonfigurasi\n"
" tidak dapat dikonfigurasi (status sekarang `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, fuzzy, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %.250s menyediakan %.250s tetapi akan dibuang.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, fuzzy, c-format
msgid " Package %s is to be removed.\n"
msgstr " %.250s akan dibuang.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr ""
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %.250s menyediakan %.250s tetapi akan dibuang.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %.250s akan dibuang.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: juga mengonfigurasi `%s' (diperlukan oleh `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, fuzzy, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " %.250s menyediakan %.250s tetapi akan didekonfigurasi.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, fuzzy, c-format
msgid " Package %s is not configured yet.\n"
msgstr " belum dikonfigurasi. \n"
-#: src/packages.c:403
+#: src/packages.c:419
#, fuzzy, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr "Paket `%s' tidak terpasang. \n"
-#: src/packages.c:406
+#: src/packages.c:422
#, fuzzy, c-format
msgid " Package %s is not installed.\n"
msgstr "Paket `%s' tidak terpasang. \n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s menyediakan %.250s dan %s. \n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (subproses): %s \n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %.250s akan didekonfigurasi.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " bergantung pada "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; tetapi:\n"
@@ -2893,40 +2893,40 @@ msgstr "; tetapi:\n"
msgid "(no description available)"
msgstr "(tidak ada keterangan yang tersedia)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "tidak dapat mengakses arsip"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "ada kesalahan saat memastikan `%.250s' tidak ada"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"gagal menjalankan 'dpkg-split' untuk melihat jika bagiannya merupakan suatu "
"banyak-bagian (multiparter)"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "menyusun ulang berkas paket"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Melakukan otentikasi (%s) ... \n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "gagal menjalankan 'debsig'verify'"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Pemeriksaan paket %s gagal!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2935,31 +2935,31 @@ msgstr ""
"Verifikasi paket %s gagal,\n"
"tetapi tetap memasangnya sesuai permintaan.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "dilewati\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "gagal membuat nama direktori sementara"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "Gagal menjalankan 'dpkg-deb' untuk mengekstrak informasi 'control'"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Merekam info tentang %s dari %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "arsitektur paket (%s) tidak cocok dengan sistem (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2968,102 +2968,102 @@ msgstr ""
"dpkg: memandang %s berisi %s, masalah pra-ketergantungan:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "Ada masalah pra-ketergantungan - tidak akan memasang %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: PERINGATAN - mengabaikan masalah pra-ketergantungan! \n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Bersiap-siap mengganti %s %s (dengan %s) ... \n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Sedang membuka paket %s (dari %s) ... \n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"nama 'conffile' (dimulai dengan `%.250s') terlalu panjang (>%d karakter)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "Ada kesalahan saat membaca %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "Ada kesalahan saat menutup %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "Ada kesalahan saat membuka %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Sedang dekonfigurasi %s, sehingga kita dapat membuang %s ... \n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "Sedang membuang %s ... \n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Sedang membuka pengganti %.250s ... \n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"tidak bisa menjalankan 'dpkg-deb' untuk mendapatkan arsip berkas sistem"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "ada kesalahan saat membaca keluaran tar dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "berkas tar dari sistem berkas terkorupsi - arsip paket terkorupsi"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: kemungkinan 'zap' berakhiran banyak nol"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg: PERINGATAN - tidak bisa menghapus berkas lama `%.250s': %s\n"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: PERINGATAN - tidak bisa menghapus berkas lama `%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: %s: PERINGATAN - conffile `%.250s' bukan sebuah berkas normal atau "
"symlink (= `%s') \n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, fuzzy, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "tidak bisa melakukan 'fstat' berkas 'part' `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3072,70 +3072,70 @@ msgstr ""
"dpkg: %s: PERINGATAN - conffile `%.250s' bukan sebuah berkas normal atau "
"symlink (= `%s') \n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: PERINGATAN - tidak bisa menghapus berkas lama `%.250s': %s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "tidak dapat membaca direktori 'info'"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"versi lama paket ini memiliki nama berkas 'info' yang terlalu panjang mulai "
"dari `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "tidak bisa membuang berkas 'info' `%.250s' yang sudah usang"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "tidak bisa memasang berkas 'info' (tampaknya) baru `%.150s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "tidak bisa membuka direktori 'control' sementara"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"paket berisi nama berkas info 'control' yang terlalu panjang (mulai dari `"
"%.250s)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "info 'control' paket berisi direktori `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"proses rmdir dari info 'control' paket `%.250s' mengatakan ini bukan dir"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: PERINGATAN - paket %s berisi daftar sebagai berkas 'info'"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "tidak bisa memasang berkas 'info' baru `%.250s' sebagai `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Mencatat lenyapnya %s, yang telah diganti seutuhnya.) \n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "tidak bisa menghapus berkas info 'control' `%.250s' yang menghilang"
@@ -3740,25 +3740,25 @@ msgstr "ruas `%s', nama paket `%.255s': %s tidak sah"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "ruas `%s', nama paket `%.255s': %s tidak sah"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Sedang memusnahkan berkas konfigurasi untuk %s ... \n"
diff --git a/po/it.po b/po/it.po
index a2ed467ef..4415d88f8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg-1.15.4.1\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-01-29 17:16+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1217,7 +1217,7 @@ msgstr "eof non attesa in \"%.250s\""
msgid "error formatting string into varbuf variable"
msgstr "errore nel formattare la stringa in una variabile varbuf"
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "errore nel leggere dalla pipe dpkg-deb"
@@ -1231,12 +1231,12 @@ msgstr "estrazione del file \"%.255s\" saltata (sostituito o escluso?)"
msgid "error setting timestamps of `%.255s'"
msgstr "errore nell'impostare l'orario di \"%.255s\""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "errore nell'impostare il proprietario di \"%.255s\""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "errore nell'impostare i permessi di \"%.255s\""
@@ -1257,7 +1257,7 @@ msgstr ""
"esecuzione di stat (dereference) sul nuovo collegamento simbolico proposto "
"\"%.250s\" per \"%.250s\" non riuscita"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1266,19 +1266,19 @@ msgstr ""
"tentata sovrascrittura di \"%.250s\", la versione divergente di \"%.250s"
"\" (pacchetto: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"tentata sovrascrittura di \"%.250s\", la versione divergente di \"%.250s\""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "impossibile eseguire stat su \"%.255s\" (stava per essere installato)"
# (ndt) un po' molto libera, ma sistemata alla meno peggio
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1287,29 +1287,29 @@ msgstr ""
"impossibile risolvere i problemi con \"%.255s\" prima di installarne "
"un'altra versione"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"impossibile eseguire stat su \"%.255s\" appena ripristinato prima di "
"installarne un'altra versione"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "l'archivio contiene l'oggetto \"%.255s\" di tipo sconosciuto 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Sostituzione dei file nella versione precedente del pacchetto %s...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Sostituiti dai file nel pacchetto %s installato...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1318,108 +1318,108 @@ msgstr ""
"tentata sovrascrittura della directory \"%.250s\" nel pacchetto %.250s "
"%.250s con un oggetto non-directory"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"tentata sovrascrittura di \"%.250s\" presente anche nel pacchetto %.250s "
"%.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "impossibile creare \"%.255s\" (durante l'elaborazione di \"%.255s\")"
# (ndt) oscura...
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "dpkg-deb backend su \"%.255s\""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "errore nello scrivere/chiudere \"%.255s\""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "errore nel creare la pipe \"%.255s\""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "errore nel creare il device \"%.255s\""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "errore nel creare il collegamento fisico \"%.255s\""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "errore nel creare il collegamento simbolico \"%.255s\""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
"errore nell'impostare il proprietario del collegamento simbolico \"%.255s\""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "errore nel creare la directory \"%.255s\""
# (ndt) volutamente tolto 'aside' dalla traduzione
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "impossibile spostare \"%.255s\" per installarne la nuova versione"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "impossibile leggere il collegamento \"%.255s\""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
"impossibile creare il collegamento simbolico alla copia di backup di \"%.255s"
"\""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"impossibile impostare il proprietario del collegamento simbolico alla copia "
"di backup di \"%.255s\""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"impossibile creare il collegamento alla copia di backup di \"%.255s\" prima "
"di installarne la nuova versione"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "impossibile installare la nuova versione di \"%.255s\""
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "impossibile creare \"%.255s\""
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "impossibile rimuovere la bufferizzazione su \"%.255s\""
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1428,7 +1428,7 @@ msgstr ""
"ignorati i problemi di dipendenze con %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1437,7 +1437,7 @@ msgstr ""
"possibile deconfigurazione del pacchetto\n"
" essenziale %s per abilitare %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1446,7 +1446,7 @@ msgstr ""
"dpkg: %s è essenziale e non verrà deconfigurato\n"
" per poter abilitare %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1456,17 +1456,17 @@ msgstr ""
"%s"
# (ndt) queste due pare si aggancino a quelle precedenti
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "la rimozione di %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "l'installazione di %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1474,12 +1474,12 @@ msgstr ""
"dpkg: possibile deconfigurazione di %s che potrebbe essere rovinato a causa "
"di %s...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: %s viene deconfigurato (rovinato da %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1489,11 +1489,11 @@ msgstr ""
"%s"
# (ndt) mah....
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "danneggiamenti ignorati, è possibile procedere ugualmente."
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1503,31 +1503,31 @@ msgstr ""
" la deconfigurazione non è consentita (--auto-deconfigure potrebbe essere "
"utile)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "l'installazione di %.250s potrebbe danneggiare il software esistente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: possibile rimozione di %s al posto di %s...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s non è installato correttamente - le relative dipendenze verranno "
"ignorate.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: la rimozione di %s potrebbe causare dei problemi poiché fornisce %"
"s...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1536,70 +1536,70 @@ msgstr ""
"dpkg: il pacchetto %s richiede di essere reinstallato, ma verrà comunque "
"rimosso.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
"dpkg: il pacchetto %s richiede di essere reinstallato, non verrà rimosso.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "il pacchetto %s ha troppe coppie Conflicts/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: il pacchetto %s verrà rimosso al posto di %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "pacchetti in conflitto - %.250s non verrà installato"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "conflitti ignorati, è possibile procedere ugualmente."
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive richiede almeno un percorso come argomento"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "esecuzione di find per --recursive non riuscita"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "fdopen della pipe di find non riuscita"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "errore nel leggere la pipe di find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "errore nel chiudere la pipe di find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find per --recursive ha restituito l'errore non gestito %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "ricerca completata senza trovare alcun pacchetto (file *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s richiede almeno un archivio di pacchetto come argomento"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1610,33 +1610,33 @@ msgstr "--%s richiede almeno un archivio di pacchetto come argomento"
msgid "<standard output>"
msgstr "<standard output>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<standard error>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Selezionato il pacchetto %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Ignorato il pacchetto non selezionato %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versione %.250s di %.250s già installata, ignorata.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "retrocessione di %.250s dalla versione %.250s alla %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2509,51 +2509,51 @@ msgstr "impossibile impostare i permessi di esecuzione su \"%.250s\""
msgid "unable to setenv for maintainer script"
msgstr "impossibile eseguire setenv per lo script di maintainer"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "vecchio script di %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "impossibile eseguire stat su %s \"%.250s\""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nuovo script %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "vecchio script di %s"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "impossibile eseguire stat su %s \"%.250s\": %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - viene provato lo script dal nuovo pacchetto...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "non c'è alcuno script nella nuova versione del pacchetto - saltato"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... sembra tutto sia andato correttamente.\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "impossibile rimuovere in sicurezza \"%.255s\""
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "esecuzione di rm per ripulire non riuscita"
@@ -3008,30 +3008,30 @@ msgstr "eof inatteso prima della fine della riga %d"
msgid "need an action option"
msgstr "necessaria un'opzione che indichi un'azione"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"è necessario specificare i pacchetti con il loro nome, non riportando il "
+"nome dei file che li contengono"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending non accetta alcun argomento che non sia un'opzione"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s richiede il nome di almeno un pacchetto come argomento"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"è necessario specificare i pacchetti con il loro nome, non riportando il "
-"nome dei file che li contengono"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Il pacchetto %s è indicato più volte, viene elaborato una sola.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -3040,7 +3040,7 @@ msgstr ""
"È stata estratta più di una copia del pacchetto %s\n"
" durante questa sessione. Viene configurato una sola volta.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -3049,78 +3049,78 @@ msgstr ""
"il pacchetto %.250s non è pronto per l'elaborazione dei trigger\n"
" (stato attuale \"%.250s\" con nessun trigger in attesa)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Il pacchetto %s che fornisce %s sta per essere rimosso.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Il pacchetto %s sta per essere rimosso.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " La versione di %s nel sistema è %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" Il pacchetto %s che fornisce %s è in attesa dell'elaborazione dei "
"trigger.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Il pacchetto %s è in attesa dell'elaborazione dei trigger.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: viene configurato anche \"%s\" (richiesto da \"%s\")\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Il pacchetto %s che fornisce %s non è ancora configurato.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Il pacchetto %s non è ancora configurato.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Il pacchetto %s che fornisce %s non è installato.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Il pacchetto %s non è installato.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) danneggia %s ed è %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) fornisce %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " La versione di %s da configurare è %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " dipende da "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; comunque:\n"
@@ -3128,40 +3128,40 @@ msgstr "; comunque:\n"
msgid "(no description available)"
msgstr "(nessuna descrizione disponibile)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "impossibile accedere all'archivio"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "impossibile assicurarsi che \"%.250s\" non esista"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"esecuzione di dpkg-split per verificare se si tratta di un multi-porzioni "
"non riuscita"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "file pacchetto riassemblato"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autenticazione di %s...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "esecuzione di debsign-verify non riuscita"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verifica del pacchetto %s non riuscita."
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3170,33 +3170,33 @@ msgstr ""
"Verifica del pacchetto %s non riuscita,\n"
"ma viene installato lo stesso.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "superata\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "creazione di una directory temporanea non riuscita"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
"esecuzione di dpkg-deb per estrarre le informazioni di controllo non riuscita"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Informazioni riguardo %s provenienti da %s registrate.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
"l'architettura del pacchetto (%s) non corrisponde a quella del sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3205,105 +3205,105 @@ msgstr ""
"dpkg: problemi con le pre-dipendenze di %s contenente %s:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema con le pre-dipendenze - %.250s non viene installato"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "vengono ignorati i problemi con le pre-dipendenze."
# (ndt) il secondo è la versione
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Preparativi per sostituire %s v.%s (utilizzando %s)...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Estrazione di %s (da %s)...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"nome del file di configurazione (inizia per \"%.250s\") troppo lungo (>%d "
"caratteri)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "errore di lettura in %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "errore nel chiudere %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "errore nel cercare di aprire %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Deconfigurazione di %s per poter rimuovere %s...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Deconfigurazione di %s...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Estrazione del sostituto di %.250s...\n"
# (ndt) questo sembra attivato dall'opzione --fsys-tarfile
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "impossibile eseguire dpkg-deb per recuperare l'archivio in formato tar"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "errore nel leggere il file tar creato da dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "ile tar rovinato - l'archivio del pacchetto è danneggiato"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: rimozione di possibili caratteri nulli terminali"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"impossibile eseguire stat del vecchio file \"%.250s\", non viene eliminato: %"
"s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "impossibile eliminare la vecchia directory \"%.250s\": %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"il vecchio file di configurazione \"%.250s\" era una directory vuota (ora è "
"stata eliminata)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "impossibile eseguire stat sull'altro file nuovo \"%.250s\""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3312,76 +3312,76 @@ msgstr ""
"il vecchio file \"%.250s\" è lo stesso di molti nuovi file (sia \"%.250s\" "
"che \"%.250s\")"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "impossibile rimuovere in sicurezza il vecchio file \"%.250s\": %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "impossibile leggere la directory info"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"la vecchia versione del pacchetto ha un file di configurazione troppo lungo "
"che inizia per \"%.250s\""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "impossibile rimuovere il file di informazioni obsoleto \"%.250s\""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
"impossibile installare il (supposto) nuovo file di informazioni \"%.250s\""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "impossibile aprire la directory di controllo temporanea"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"il pacchetto contiene un nome troppo lungo per il file con le informazioni "
"di controllo (inizia per \"%.50s\")"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr ""
"le informazioni di controllo del pacchetto contenevano la directory \"%.250s"
"\""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"la rimozione (rmdir) di \"%.250s\" nelle informazioni di controllo del "
"pacchetto non indicavano una directory"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "il pacchetto %s conteneva un elenco come file di informazioni"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"impossibile installare il nuovo file di informazioni \"%.250s\" come \"%.250s"
"\""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Impossibile trovare %s che è stato completamente sostituito.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -4016,7 +4016,7 @@ msgstr "dpkg-trigger: nome del pacchetto atteso \"%.250s\" non valido: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "nome del trigger \"%.250s\" non valido: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -4025,7 +4025,7 @@ msgstr ""
"%s: trovato un ciclo nell'elaborazione dei trigger\n"
" elenco dei pacchetti i cui trigger sono o potrebbero essere responsabili:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -4034,11 +4034,11 @@ msgstr ""
"\n"
" trigger dei pacchetti in attesa che sono o potrebbero essere irresolubili:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "ciclo nei trigger, abbandono"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Elaborazione dei trigger per %s...\n"
diff --git a/po/ja.po b/po/ja.po
index 233fe14b8..71584a389 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg git\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-02-03 00:39+0200\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -1176,7 +1176,7 @@ msgstr "`%.250s' の読み取り中に予期しないファイルの終わりで
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "dpkg-deb パイプからの読み込みエラーです"
@@ -1190,12 +1190,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "`%.255s' のタイムスタンプ設定エラーです"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "`%.255s' の所有者設定エラーです"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "`%.255s' の許可属性設定エラーです"
@@ -1215,7 +1215,7 @@ msgstr ""
"シンボリックリンク `%2$.250s' の提案された新しいシンボリックターゲット `%1"
"$.250s' の状態 (逆参照) を取得できませんでした"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1224,46 +1224,46 @@ msgstr ""
"`%.250s' を上書きしようとしています。これは `%.250s' (パッケージ: %.100s) の"
"退避バージョンです"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"`%.250s' を上書きしようとしています。これは `%.250s' の退避バージョンです"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "(今インストールしようとしている) `%.255s' のステータスを得られません"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "別バージョンのインストール前の `%.255s' まわりのゴミ掃除に失敗しました"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "別バージョンのインストール前の復元された `%.255s' の状態を得られません"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "アーカイブに含まれるオブジェクト `%.255s' が不明な型 0x%x です"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "古いパッケージ %s 中のファイルを置換しています ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr ""
"インストールされたパッケージ %s の中のファイルで置き換えられました ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1272,101 +1272,101 @@ msgstr ""
"パッケージ %2$.250s に含まれるディレクトリ `%1$.250s' をディレクトリ以外のも"
"ので上書きしようとしています"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"`%.250s' を上書きしようとしています。これはパッケージ %.250s にも含まれていま"
"す"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "(`%2$.255s' にある) `%1$.255s' の読み取りに失敗しました"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "`%.255s' 間の dpkg-deb バックエンド"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "`%.255s' のクローズ/書き込み中にエラーが発生しました"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "パイプ `%.255s' の作成中にエラーが発生しました"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "デバイス `%.255s' の作成中にエラーが発生しました"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "ハードリンク `%.255s' の作成中にエラーが発生しました"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "シンボリックリンク `%.255s' の作成中にエラーが発生しました"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "シンボリックリンク `%.255s' の所有者設定中にエラーが発生しました"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "ディレクトリ `%.255s' の作成中にエラーが発生しました"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "新バージョンをインストールするための `%.255s' の退避ができませんでした"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "リンク `%.255s' を読めません"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "`%.255s' のバックアップ用シンボリックリンクを作成できません"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "`%.255s' のバックアップ用シンボリックリンクを chown できません"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"新バージョンのインストール前の `%.255s' のバックアップ用リンクを作成できませ"
"ん"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "`%.255s' の新しいバージョンをインストールできません"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "`%.255s' を作成できません"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "`%.255s' 用のバッファを開放できません"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1375,7 +1375,7 @@ msgstr ""
"dpkg: 警告 - %s の依存関係の問題を無視しています:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1384,7 +1384,7 @@ msgstr ""
"dpkg: 警告 - %2$s を有効にするため、不可欠パッケージ\n"
" %1$s の設定削除を考慮しています。\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1393,7 +1393,7 @@ msgstr ""
"dpkg: 失敗。%s は不可欠パッケージです。%s を有効に\n"
" するために、その設定削除を行いません。\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1402,29 +1402,29 @@ msgstr ""
"dpkg: 失敗。%s を処理できません (--auto-deconfigure を使いましょう):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "%.250s の削除"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "`%.250s' のインストール"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: %2$s によって壊れた %1$s の設定削除を考えています ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
"dpkg: 問題ありません。(%2$s によって壊れた) %1$s の設定削除をします。\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1433,12 +1433,12 @@ msgstr ""
"dpkg: %s が %s を含んでいることを考慮すると:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: 警告 - 破損を無視しています。続行します!\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1447,29 +1447,29 @@ msgstr ""
"%.250s のインストールは %.250s を壊す可能性があり、\n"
" 設定削除は許されていません (--auto-deconfigure が助けになります)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "%.250s のインストールは既存のソフトウェアを壊す可能性があります"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %2$s を選択するために %1$s の削除を考えています ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s は正しくインストールされていないため、すべての依存関係を無視します。\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: %s は %s を提供するため、削除すると問題があるかもしれません ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1477,72 +1477,72 @@ msgid ""
msgstr ""
"dpkg: パッケージ %s は再インストールが必要ですが、要求に従い削除します。\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: パッケージ %s は再インストールが必要です。削除しません。\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "パッケージ %s の衝突/置換の組み合わせが多すぎます"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: 問題ありません。%2$s を選択するために %1$s を削除します。\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "パッケージの競合 - %.250s のインストールは行いません"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: 警告 - 競合を無視しています。続行します!\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive は引数として最低 1 つのパスが必要です"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "--recursive のための find の実行に失敗しました"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "find のパイプの fdopen に失敗しました"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "find のパイプを読み込み中にエラーが発生しました"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "find のパイプのクローズ中にエラーが発生しました"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "--recursive のための find が、処理できないエラー %i を返しました"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"検索しましたが、パッケージ (*.deb にマッチするファイル) が見つかりませんでし"
"た"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s は引数として最低 1 つのパッケージアーカイブファイルが必要です"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1553,37 +1553,37 @@ msgstr "--%s は引数として最低 1 つのパッケージアーカイブフ
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "未選択パッケージ %s を選択しています。\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "未選択パッケージ %s をスキップします。\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr ""
"%2$.250s のバージョン %1$.250s がすでにインストールされています。スキップしま"
"す。\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
"%s - 警告: %.250s のバージョンを %.250s から %.250s にダウングレードしていま"
"す。\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2428,51 +2428,51 @@ msgstr "`%.250s' の実行許可を設定できません"
msgid "unable to setenv for maintainer script"
msgstr "メンテナスクリプトで setenv できません"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "古い %s スクリプト"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "%s `%.250s' のステータスを得られません"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "新 %s スクリプト"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "古い %s スクリプト"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "%s `%.250s' のステータスを得られません"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - 代わりに新規パッケージからスクリプトを実行してみます ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "このパッケージの新バージョンにはスクリプトがありません。終了します"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... OK のようです。\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "`%.255s' を作成できません"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "クリーンアップ用の rm の実行に失敗しました"
@@ -2898,30 +2898,30 @@ msgstr "%d 行目の行末までに予期しない eof があります"
msgid "need an action option"
msgstr "アクションを指定するオプションが必要です"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"パッケージ名として指定するのは、その中に含まれているファイルの名前ではなく、"
+"パッケージ名そのものでなければなりません"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending はオプション以外の引数をとりません"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s は引数に少なくとも 1 つのパッケージ名が必要です"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"パッケージ名として指定するのは、その中に含まれているファイルの名前ではなく、"
-"パッケージ名そのものでなければなりません"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "パッケージ %s が複数回列挙されました。一度だけ処理します。\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2930,7 +2930,7 @@ msgstr ""
"現在の実行中にパッケージ %s のコピーが複数展開されました!\n"
"1 回だけ設定を行います。\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2939,77 +2939,77 @@ msgstr ""
"パッケージ %.250s はトリガ処理の準備ができていません\n"
" (保留トリガを除いた現在のステータス `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " パッケージ %s は %s を提供していますが、削除されようとしています。\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " パッケージ %s は削除されようとしています。\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr "システム上の %s のバージョン は %s です。\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " パッケージ %s は %s を提供しており、トリガ処理を待っています。\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " パッケージ %s はトリガ処理を待っています。\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: (`%2$s' により要求される) `%1$s' も設定しています\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " パッケージ %s は %s を提供していますが、まだ設定されていません。\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " パッケージ %s はまだ設定されていません。\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr ""
" パッケージ %s は %s を提供しますが、まだインストールされていません。\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " パッケージ %s はまだインストールされていません。\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr "%s (%s) は %s を壊し、%s です。\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (%s) は %s を提供します。\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr "設定される %s のバージョン は %s です。\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " は以下に依存 (depends) します: "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr " ...しかし:\n"
@@ -3017,40 +3017,40 @@ msgstr " ...しかし:\n"
msgid "(no description available)"
msgstr "(説明 (description) がありません)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "アーカイブにアクセスできません"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "`%.250s' が存在しないためエラーが発生しました"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"マルチパートの一部であるかチェックするために dpkg-split を実行しましたが、失"
"敗しました"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "解釈できないパッケージファイル"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "%s を認証しています ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "debsig-verify の実行に失敗しました"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "パッケージ %s の検証に失敗しました!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3059,31 +3059,31 @@ msgstr ""
"パッケージ %s の検証に失敗しましたが、\n"
"要求どおりインストールを行います。\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "合格\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "一時ディレクトリ名の作成に失敗しました"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "コントロール情報を取得するための dpkg-deb の実行に失敗しました"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%s についての情報を %s から登録します。\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "パッケージアーキテクチャ (%s) がシステム (%s) と一致しません"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3092,105 +3092,105 @@ msgstr ""
"dpkg: %s が %s を含むことを考慮すると、先行依存の問題があります:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "先行依存問題 - %.250s をインストールしません"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: 警告 - 先行依存の問題を無視しています!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "%s %s を (%s で) 置換するための準備をしています ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "(%2$s から) %1$s を展開しています...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "(`%.250s' で始まる) 設定ファイル名が長すぎます (> %d 文字) "
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250s で読み取り時にエラーが発生しました"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "%.250s のクローズ時にエラーが発生しました"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "%.250s のオープン時にエラーが発生しました"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
"%2$s を削除できるようにするために %1$s の設定削除 (deconfigure) を行いま"
"す ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "%s を設定削除しています ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "%.250s を展開し、置換しています...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "ファイルシステムアーカイブを取得するための dpkg-deb の実行ができません"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "dpkg-deb tar 出力の読み取り時にエラーが発生しました"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
"壊れているファイルシステム上の tar ファイル - パッケージアーカイブが壊れてい"
"ます"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: 末尾の余計なゼロを取り除きます"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: 警告 - 古いファイル `%.250s' の状態を取得できないので、削除しません: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: 警告 - 古いディレクトリ `%.250s' を削除できません: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: 警告 - 古い設定ファイル `%.250s' が空のディレクトリでした (今削除されま"
"した)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "その他の新しいファイル `%.250s' の状態を取得できません"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3199,49 +3199,49 @@ msgstr ""
"dpkg: 警告 - 古いファイル `%.250s' がいくつかの新しいファイルと同一です! (`"
"%.250s' と `%.250s' の両方)\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: 警告 - 古いファイル `%%2$.250s' を%1$sできません: %%3$s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "情報ディレクトリを読み取れません"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"旧バージョンのパッケージに含まれる `%.250s' で始まる情報ファイル名はあまりに"
"も長すぎます"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "古い情報ファイル `%.250s' を削除できません"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "(おそらく) 新しい情報ファイル `%.250s' をインストールできません"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "一時コントロールディレクトリをオープンできません"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"パッケージに含まれる (`%.50s' で始まる) コントロール情報ファイル名はあまりに"
"も長すぎます"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "パッケージコントロール情報にディレクトリ `%.250s' が含まれています"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
@@ -3252,22 +3252,22 @@ msgstr ""
# #, c-format
# msgid "package control info rmdir of `%.250s' didn't say not a dir"
# msgstr "`%.250s' のパッケージコントロール情報 rmdir がディレクトリではないと言っています"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: 警告 - パッケージ %s が一覧を情報ファイルとして含んでいました"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "新規情報ファイル `%.250s' を `%.250s' としてインストールできません"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(%s は完全に置換されているため、消えていることに注意。)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "コントロール情報ファイル `%.250s' が見つからないため削除できません"
@@ -3901,7 +3901,7 @@ msgstr "dpkg-trigger: 無効な待ち受けパッケージ名 `%.250s': %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: 無効なトリガ名 `%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3910,7 +3910,7 @@ msgstr ""
"%s: トリガ処理中に循環が発見されました:\n"
" トリガをしたパッケージのチェインにおそらく原因があります:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3919,11 +3919,11 @@ msgstr ""
"\n"
" パッケージの保留トリガがおそらく解決不可能:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "トリガがループしており、捨てられました"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "%s のトリガを処理しています ...\n"
diff --git a/po/km.po b/po/km.po
index 63aacc4c2..f3d865840 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg_po_km\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2006-10-04 09:49+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: <en@li.org>\n"
@@ -1134,7 +1134,7 @@ msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹង​
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "កំហុស​ក្នុ​ងការ​អាន​ពី​បំពង់ dpkg-deb"
@@ -1148,12 +1148,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​កំណត់ត្រា​ពេល​វេលា​របស់ `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​កំណត់​ភាព​ជា​ម្ចាស់​របស់ `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​កំណត់​សិទ្ធិ​របស់ `%.255s'"
@@ -1170,7 +1170,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1178,142 +1178,142 @@ msgid ""
msgstr ""
"ព្យាយាម​សរសេរ​ជាន់​លើ `%.250s' ដែល​ជា​កំណែ​ដែល​បាន​បំបែរ​របស់ `%.250s'%.10s%.100s%.10s"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"ព្យាយាម​សរសេរ​ជាន់​លើ `%.250s' ដែល​ជា​កំណែ​ដែល​បាន​បំបែរ​របស់ `%.250s'%.10s%.100s%.10s"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "មិន​អាច​ចាប់ផ្ដើម `%.255s' (ដែល​ខ្ញុំ​រៀប​នឹង​ដំឡើង)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "មិន​អាច​សម្អាត​ភាព​រាយប៉ាយ​នៅ​ជុំវិញ `%.255s' មុនពេល​ដំឡើង​កំណែ​ផ្សេងៗ​ទៀត"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "មិន​អាច​ចាប់​ផ្ដើម​ស្ដារ `%.255s' មុន​ពេល​ដំឡើង​កំណែ​ផ្សេងៗ​ទៀត"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "ប័ណ្ណសារ​​បាន​ផ្ទុក​វត្ថុ `%.255s' នៃ​ប្រភេទ​ដែល​មិន​ស្គាល់ 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "កំពុង​ជំនួស​ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ចាស់ %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "បាន​ជំនួស​ដោយ​ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ដែល​បាន​ដំឡើង %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "ព្យាយាម​សរសេរជាន់​លើ​ថត `%.250s' នៅ​ក្នុង​កញ្ចប់ %.250s ដែល​គ្មាន​ថត"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "ព្យាយាម​សរសេរជាន់​លើ `%.250s' ដែល​មាន​នៅ​ក្នុង​កញ្ចប់ %.250s ផង​ដែរ"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន `%.255s' (នៅ​ក្នុង `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "កម្មវិធី​​​ខា​ងក្រោ​យ​របស់​ dpkg-deb​ កំឡុង​ពេល​ `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "កំហុស​ក្នុ​​ងការបិទ/សរសេរ `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​បង្កើត​បំពង់ `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ឧបករណ៍ `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណរឹង `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណ​និមិត្ត​សញ្ញា `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​កំណត់​ភាព​ជា​ម្ចាស់​របស់​តំណ​និមិត្ត​សញ្ញា `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ថត `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "មិន​អាច​ផ្លាស់ទី​ផ្នែក `%.255s' ដើម្បី​ដំឡើង​កំណែ​ថ្មី"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "មិន​អាច​អាន​តំណ `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា​ព័ត៌មាន​បម្រុង​ទុក​សម្រាប់ `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "មិន​អាច chown តំណ​និមិត្ត​សញ្ញា​ព័ត៌មាន​បម្រុង​ទុក​សម្រាប់ `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "មិន​អាច​បង្កើត​តំណ​ព័ត៌មាន​បម្រុងទុក​របស់ `%.255s' មុន​ពេល​ដំឡើង​កំណែ​ថ្មី"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "មិន​អាច​បង្កើត​ `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "មិន​អាច​កំណត់​សតិ​បណ្ដោះ​អាសន្ន `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1322,7 +1322,7 @@ msgstr ""
"dpkg ៖ ការព្រមាន - មិន​អើពើ​បញ្ហា​ភាព​អាស្រ័យ​ដោយ​ការ​យក %s ចេញ ៖\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1331,7 +1331,7 @@ msgstr ""
"dpkg ៖ ការព្រមាន - ចាត់ទុក​ការមិនកំណត់​រចនាសម្ព័ន្ធនៃ​កញ្ចប់ %s ចាំបាច់\n"
" ដើម្បីអនុញ្ញាត​ឲ្យ​យកចេញ​នៃ %s ។\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1340,7 +1340,7 @@ msgstr ""
"dpkg ៖ គ្មាន %s គឺចាំបាច់ នឹងមិនកំណត់​រចនា​សម្ព័ន្ធ\n"
" វា​ដើម្បីអនុញ្ញាត​ឲ្យយកចេញ​នៃ %s ។\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1349,28 +1349,28 @@ msgstr ""
"dpkg ៖ គ្មាន មិនអាច​យក %s ចេញ (--auto-deconfigure នឹងជួយ) ៖\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "អាន​កំហុស​នៅ​ក្នុង %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg ៖ ការពិនិត្យ​ការយកចេញ %s នៅក្នុងការពេញចិត្ត​នៃ %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg ៖ បាទ នឹង​យក %s ចេញ នៅក្នុង ការពេញចិត្ត​នៃ​ %s ។\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1379,109 +1379,109 @@ msgstr ""
"dpkg ៖ គិតថា​ %s មានចំណុះ​ %s ៖\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg ៖ ការ​ព្រមាន - មិន​អើពើ​ការ​ប៉ះទង្គិច ទោះ​ជា​យ៉ាងណាក៏​ដោយ​អាច​ធ្វើ​បន្ត​បាន !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg ៖ ការពិនិត្យ​ការយកចេញ %s នៅក្នុងការពេញចិត្ត​នៃ %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s មិន​ត្រូវ​បាន​ដំឡើង​យ៉ាង​ត្រឹមត្រូវ - មិន​អើពើ​ភាព​អាស្រ័យ​មួយ​ចំនួន​នៅ​លើ​វា ។\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg ៖ ប្រហែល​ជាមានបញ្ហា​ក្នុងការ​យក​ %s ចេញ នៅពេល​ដែល​វា​ផ្ដល់​ %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr "dpkg ៖ កញ្ចប់ %s ទាមទារ​ឲ្យ​ដំឡើង​ម្ដងទៀត ប៉ុន្តែ វា​នឹង​យកចេញ​ នៅពេល​ដែល​អ្នក​ស្នើ ។\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg ៖ កញ្ចប់ %s ទាមទារ​ការ​ដំឡើ​ងឡើង​វិញ នឹង​មិន​យកចេញ​ទេ ។\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg ៖ បាទ នឹង​យក %s ចេញ នៅក្នុង ការពេញចិត្ត​នៃ​ %s ។\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "ការ​ប៉ះទង្គិច​កញ្ចប់ - មិន​ដំឡើង %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg ៖ ការ​ព្រមាន - មិន​អើពើ​ការ​ប៉ះទង្គិច ទោះ​ជា​យ៉ាងណាក៏​ដោយ​អាច​ធ្វើ​បន្ត​បាន !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --រង្វិលជុំ ត្រូវការ​យ៉ាងហោចណាស់​​អាគុយម៉ង់​ផ្លូវ​មួ"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "បានបរាជ័យក្នុងការប្រតិបត្តិរក --រង្វិលជុំ"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "បរាជ័យ​ក្នុងការ​ fdopen បំពង់​របស់​ការរក"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "កំហុស​ក្នុង​ការអាន​បំពង់​របស់​ការ​រក"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "កំហុស​ក្នុង​ការ​បិទ​បំពង់​របស់​ការ​រក"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "រកមើល --រង្វិលជុំ បានត្រឡប់​កំហុស​ដែលមិនបាន​ដោះស្រាយ %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "បានស្វែងរក ប៉ុន្តែរកមិនឃើញកញ្ចប់ (ការផ្គូផ្គងឯកសារ *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s ត្រូវ​ការ​យ៉ាងហោច​ណាស់​អាគុយម៉ង់​ឯកសារ​ប័ណ្ណសារ​កញ្ចប់​មួយ"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1492,33 +1492,33 @@ msgstr "--%s ត្រូវ​ការ​យ៉ាងហោច​ណាស់
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "ជ្រើស​កញ្ចប់​ដែល​មិន​បាន​ជ្រើស​ពី​មុន %s ។\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "​រំលង​កញ្ចប់​ដែល​មិន​បាន​ជ្រើស​ %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "កំណែ %.250s នៃ %.250s បានដំឡើងរួចហើយ រំលង ។\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - ព្រមាន ៖ កំពុងបន្ទាប %.250s ពី %.250s ទៅ %.250s ។\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "នឹង​មិន​បន្ទាប %.250s ពី​កំណែ %.250s ទៅ %.250s រំលង ។\n"
@@ -2333,51 +2333,51 @@ msgstr "មិន​អាច​កំណត់​សិទ្ធិ​ប្រ
msgid "unable to setenv for maintainer script"
msgstr "មិន​អាច​ថ្លែង​ក្នុង vsnprintf"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "ស្គ្រីប %s ចាស់"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "មិន​អាច​ចាប់ផ្ដើម %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "ស្គ្រីប %s ថ្មី​"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "ស្គ្រីប %s ចាស់"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "មិន​អាច​ចាប់ផ្ដើម %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - សាកល្បង​ស្គ្រីប​ពី​កញ្ចប់​ថ្មី​ជំនួស​វិញ ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "គ្មាន​ស្គ្រីប​នៅ​ក្នុង​កំណែ​ថ្មី​របស់​កញ្ចប់ - បោះបង់"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg ៖ ... វា​មើល​ទៅ​ហាក់បី​ដូចជា​គ្មាន​បញ្ហា ។\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "មិន​អាច​បង្កើត​ `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ rm ដើម្បី​សម្អាត"
@@ -2778,29 +2778,29 @@ msgstr "ចុង​ឯកសា​រដែល​មិន​បាន​រំ
msgid "need an action option"
msgstr "ត្រូវ​ការ​ជម្រើស​សកម្មភាព​មួយ"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"អ្នក​ត្រូវតែ​បញ្ជាក់​កញ្ចប់​តាម​ឈ្មោះ​ផ្ទាល់​របស់​ពួកវា មិនមែន​តាម​សម្រង់​ឈ្មោះ​របស់​ឯកសារ​ដែល​ពួក​វា​មាន​ទេ"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --ការ​រង់ចាំមិន​ត្រូវការ​អាគុយម៉ង់​ដែល​គ្មាន​ជម្រើស"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s ត្រូវការ​យ៉ាងហោច​ណាស់​អាគុយម៉ង​ឈ្មោះ​កញ្ចប់​មួយ"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"អ្នក​ត្រូវតែ​បញ្ជាក់​កញ្ចប់​តាម​ឈ្មោះ​ផ្ទាល់​របស់​ពួកវា មិនមែន​តាម​សម្រង់​ឈ្មោះ​របស់​ឯកសារ​ដែល​ពួក​វា​មាន​ទេ"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "កញ្ចប់ %s ដែល​បាន​រាយ​ច្រើន​ជាង​មួយ ដំណើរ​ការ​តែម្ដង​ប៉ុណ្ណោះ ។\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2809,7 +2809,7 @@ msgstr ""
"មាន​ច្បាប់​ចម្លង​របស់​កញ្ចប់ %s ច្រើន​ជាង​មួយ​ត្រូវ​បាន​ពន្លា\n"
" នៅ​ក្នុង​ការ​រត់​នេះ ! កំណត់​រចនាសម្ព័ន្ធ​វា​តែម្ដង​ប៉ុណ្ណោះ ។\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2818,76 +2818,76 @@ msgstr ""
"កញ្ចប់ %.250s មិន​ទាន់​រួចរាល់ ដើម្បី​កំណត់​រចនាសម្ព័ន្ធ\n"
" មិន​អាច​កំណត់​រចនាសម្ព័ន្ធ (ស្ថានភាព​បច្ចុប្បន្ន `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " កញ្ចប់ %s ដែល​ផ្ដល់ %s ត្រូវតែ​បាន​យកចេញ ។\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " កញ្ចប់ %s ត្រូវតែបានយកចេញ ។\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " កំណែ​របស់ %s នៅ​លើ​ប្រព័ន្ធ​គឺ %s ។\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " កញ្ចប់ %s ដែល​ផ្ដល់ %s ត្រូវតែ​បាន​យកចេញ ។\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " កញ្ចប់ %s ត្រូវតែបានយកចេញ ។\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg ៖ កំណត់​រចនាសម្ព័ន្ធ​ផង​ដែរ `%s' (ទាមទារ​ដោយ `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " កញ្ចប់ %s ដែល​ផ្ដល់ %s មិន​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​នៅ​ឡើយ​ទេ ។\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " កញ្ចប់ %s មិន​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ​នៅ​ឡើយ​ទេ ។\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " កញ្ចប់ %s ដែល​ផ្ដល់ %s មិន​ត្រូវ​បាន​ដំឡើង​នៅ​ឡើយ​ទេ ។\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " កញ្ចប់ %s មិនត្រូវ​បាន​ដំឡើង​នៅ​ឡើយ​ទេ ។\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s ផ្ដល់ %.250s និង​គឺជា %s ។\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (ដំណើរ​កា​រ​រង​) ៖ %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " កំណែ​របស់ %s នៅ​លើ​ប្រព័ន្ធ​គឺ %s ។\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr "អាស្រ័យ​លើ​"
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; ទោះ​ជា​យ៉ាងណា​ក៏ដោយ ៖\n"
@@ -2895,38 +2895,38 @@ msgstr "; ទោះ​ជា​យ៉ាងណា​ក៏ដោយ ៖\n"
msgid "(no description available)"
msgstr "(គ្មាន​សេច​ក្តីពិពណ៌នា)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "មិន​អាច​ចូល​ដំណើរការ​ប័ណ្ណសារ"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "កំហុស​ដើម្បី​ឲ្យ​ប្រាកដថា `%.250s' មិន​ទាន់​មាន"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "បរាជ័យ​ដំណើរការ​ពុះ dpkg-ដើម្បី​មើល​បើ​វា​ជា​ផ្នែក​នៃអ្នក​អនុវត្ត"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "ឯកសារ​កញ្ចប់​ដែល​បាន​ផ្ដុំឡើង​វិញ"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "កំពុងផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "បរាជ័យ​ក្នុងការ​ execl debsig-មើល​បញ្ជាក់​"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "ការ​ផ្ទៀតផ្ទាត់​នៅលើ​កញ្ចប់ %s បាន​បរាជ័យ !"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2935,31 +2935,31 @@ msgstr ""
"ផ្ទៀងផ្ទាត់​នៅ​លើ​កញ្ចប់ %s បាន​បរាជ័យ\n"
"ប៉ុន្តែ​ទោះជា​យ៉ាងណាក៏ដោយ​ដំឡើង​ដូច​ដែល​អ្នក​ស្នើ ។\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "បានហុច\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ឈ្មោះ​ថត​បណ្ដោះ​អាសន្ន"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ dpkg-deb ដើម្បី​ស្រង់​ចេញ​ព័ត៌មាន​វត្ថុ​បញ្ជា"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "ព័ត៌មានដែលបានកត់ត្រាអំពី %s ពី %s ។\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "ស្ថាបត្យកម្ម​កញ្ចប់ (%s) មិន​ផ្គូផ្គង​នឹង​ប្រព័ន្ធ (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2968,98 +2968,98 @@ msgstr ""
"dpkg ៖ គិត​ថា %s មាន %s បញ្ហា​ភាព​អាស្រ័យ​ជា​មុន ៖\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "បញ្ហា​ភាព​អាស្រ័យ​ជា​មុន - មិន​ដំឡើង %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg ៖ ព្រមាន - មិន​អើពើ​បញ្ហា​ភាព​អាស្រ័យ​ជាមុន !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "កំពុង​រៀបចំ​ជំនួស %s %s (ដោយ​ប្រើ %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "កំពុង​ពន្លា %s (ពី %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "ឈ្មោះ conffile (ចាប់ផ្តើម​ `%.250s') គឺ វែង​ (>%d តួអក្សរ)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "អាន​កំហុស​នៅ​ក្នុង %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "កំហុស​ក្នុង​ការ​បិទ %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "កំហុស​ក្នុង​ការ​ព្យាយាម​បើក %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "មិន​កំពុង​កំណត់​រចនាសម្ព័ន្ធ %s ដូច្នេះ​យើង​មិន​អាច​យក %s ចេញ​បាន​ទេ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "កំពុងយក %s ចេញ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "កំពុង​ព​ន្លាការជំនួស %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "មិន​​​​អាច​ប្រតិបត្តិ​ dpkg-deb ដើម្បី​ទទួល​យក​បណ្ណសារ​ប្រព័ន្ធ​ឯកសារ​"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "កំហុស​ក្នុង​ការ​អាន​លទ្ធផល dpkg-deb tar"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "ឯកសារ tar របស់​ប្រព័ន្ធ​ឯកសារ​ដែល​ខូច - ប័ណ្ណសារ​កញ្ចប់​ដែល​ខូច"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb ៖ zap កំពុង​ទាញ​យក​សូន្យ​ដែល​អាច​ធ្វើ​ទៅ"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg ៖ ព្រមាន - មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ចាស់ `%.250s' ដូច្នេះ​មិនលុប​វា ៖ %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg ៖ ព្រមាន - មិនអាចលុបថតចាស់ `%.250s' ៖ %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr "dpkg ៖ ការព្រមាន- conffile ចាស់ៗ`%.250s' ជាថត​ទំនេ (​ឥឡូវ​បានលុប​វាហើយ​)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3068,65 +3068,65 @@ msgstr ""
"dpkg ៖ ព្រមាន - ឯកសារ​ចាស់ `%.250s' គឺ​ដូចគ្នា​នឹង​ឯកសារ​ថ្មី​ជា​ច្រើន ! (ទាំង `%.250s' និង `"
"%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg ៖ ព្រមាន - មិនអាចឲ្យឯកសារចាស់ %s `%%.250s' ៖ %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "មិន​អាច​អាន​ថត​ព័ត៌មាន"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr "កំណែ​ចាស់​របស់​កញ្ចប់​មាន​ឈ្មោះ​ឯកសារ​ព័ត៌មាន​វែង​ពេក ដោយ​ចាប់ផ្ដើម​ដោយ `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "មិន​អាច​យក​ឯកសារ​ព័ត៌មាន​ដែល​លែង​ប្រើ​ចេញ `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "មិន​អាច​ដំឡើង​ (សន្មតថា​) ឯកសារ​ព័ត៌មាន​ថ្មី​ `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "មិន​អាច​បើក​ថត​វត្ថុ​បញ្ជា temp បាន​ទេ"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "កញ្ចប់​មាន​ឈ្មោះ​ឯកសារ​ព័ត៌មាន​វែងពេក (ចាប់​ផ្តើម​ `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "ព័ត៌មាន​វត្ថុ​បញ្ជា​កញ្ចប់​មាន​ថត `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "ព័ត៌មាន​វត្ថុបញ្ជា​កញ្ចប់ rmdir របស់ `%.250s' មិនបាន​ចែង​ថាជា​ថត​ទេ"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg ៖ ព្រមាន - កញ្ចប់ %s មាន​បញ្ជា​ដូច​ឯកសារ​ព័ត៌មាន"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "មិន​អាច​ដំឡើង​ឯកសារ​ព័ត៌មាន​ថ្មី `%.250s' ជា `%.250s' បាន​ទេ"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(ចំណាំ​ថា ការ​មិន​បង្ហាញ​របស់ %s ដែល​ត្រូវបាន​ជំនួស​ដោយ​ជោគជ័យ ។)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "មិន​អាច​លុប​ឯកសារ​ព័ត៌មាន​វត្ថុបញ្ជា​ដែល​មិន​បង្ហាញ `%.250s'"
@@ -3739,25 +3739,25 @@ msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​មិន​ត្
msgid "invalid trigger name `%.250s': %.250s"
msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ `%.255s' ៖ %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "កំពុង​លុប​បំបាត់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់ %s ...\n"
diff --git a/po/ko.po b/po/ko.po
index b9eb9fc2f..6bc976b85 100644
--- a/po/ko.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-02-03 00:40+0200\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1155,7 +1155,7 @@ msgstr "`%.250s' 읽는데 예상치 못하게 파일이 끝났습니다"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "dpkg-deb 파이프에서 읽기 오류가 발생했습니다"
@@ -1169,12 +1169,12 @@ msgstr "'%.255s' 파일 풀기를 건너 뜁니다 (덮어 쓰거나 제외?)"
msgid "error setting timestamps of `%.255s'"
msgstr "`%.255s' 타임스탬프 설정하는 데 오류가 발생했습니다"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "`%.255s'의 소유권을 설정하는 데 오류가 발생했습니다"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "`%.255s'의 권한을 설정하는 데 오류가 발생했습니다"
@@ -1193,7 +1193,7 @@ msgstr ""
"`%2$.250s' 심볼릭 링크의 새 목적지 `%1$.250s'에 stat을 실행할 수 없습니다(참"
"조하지 못했습니다)"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1202,17 +1202,17 @@ msgstr ""
"`%.250s' 덮어쓰기를 시도합니다. 이 버전은 `%.250s'의 전환된 버전입니다(해당 "
"패키지: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "`%.250s' 덮어쓰기를 시도합니다. 이 버전은 `%.250s'의 전환된 버전입니다"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "`%.255s' 파일의 정보를 읽을 수 없습니다 (지금 설치하려는 파일)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1220,28 +1220,28 @@ msgid ""
msgstr ""
"다른 버전을 설치하기에 앞서 `%.255s' 관련 필요없는 파일들을 지울 수 없습니다"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"다른 버전을 설치하기에 앞서 복구한 `%.255s' 파일 정보를 읽을 수 없습니다"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "아카이브 안의 `%.255s' 오브젝트의 타입이 알 수 없는 0x%x입니다"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "과거 패키지 %s의 파일을 대체합니다...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "설치된 패키지 %s의 파일들로 대체합니다...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1250,98 +1250,98 @@ msgstr ""
"디렉토리가 없는 `%2$.250s' 패키지의 `%1$.250s' 디렉토리를 덮어쓰기를 시도합니"
"다"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"`%.250s'의 덮어쓰기를 시도합니다. 이 파일은 %.250s 패키지에도 들어있습니다"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "`%.255s' 파일을 만들 수 없습니다 (`%.255s' 처리 중)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "`%.255s' 작업을 하는 동안에 백엔드 dpkg-deb"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "`%.255s'을(를) 닫기/쓰기하는 데 오류가 발생했습니다"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "`%.255s' 파이프를 만드는 데 오류가 발생했습니다"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "`%.255s' 장치를 만드는 데 오류가 발생했습니다"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "`%.255s' 하드 링크를 만드는 데 오류가 발생했습니다"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "`%.255s' 심볼릭 링크를 만드는 데 오류가 발생했습니다"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "`%.255s' 심볼릭 링크의 소유권을 설정하는 데 오류가 발생했습니다"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "`%.255s' 디렉토리를 만드는 데 오류가 발생했습니다"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "새 버전을 설치할 때 `%.255s'을(를) 옮겨 놓을 수 없습니다"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "`%.255s' 링크를 읽을 수 없습니다"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "`%.255s'에 대한 백업 심볼릭 링크를 만들 수 없습니다"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "`%.255s'의 백업 심볼릭 링크의 소유자를 바꿀 수 없습니다"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "새 버전을 설치하기 전 `%.255s'의 백업 링크를 만들 수 없습니다"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "`%.255s'의 새 버전을 설치할 수 없습니다"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "`%.255s'을(를) 만들 수 없습니다"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "`%.255s'의 버퍼를 없앨 수 없습니다"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1350,7 +1350,7 @@ msgstr ""
"dpkg: 경고 - %s 패키지의 의존성 문제를 무시합니다:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1359,7 +1359,7 @@ msgstr ""
"dpkg: 경고 - 꼭 필요한 패키지 %s의 설정 해제 고려중\n"
" (%s 활성화하기 위해).\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1368,7 +1368,7 @@ msgstr ""
"dpkg: 불가, %s 패키지는 꼭 필요하므로 %s 활성화하기 위해 \n"
"설정 해제하지 않겠음.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1378,17 +1378,17 @@ msgstr ""
"할 수도 있습니다):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "%.250s 삭제"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "`%.255s' 설치"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1396,12 +1396,12 @@ msgstr ""
"dpkg: %2$s 패키지에 의해 망가질 수 있는 %1$s 패키지를 설정을 해제하려 합니"
"다...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: 네, %s 패키지 설정을 해제합니다. (%s 패키지에 의해 망가졌음.)\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1410,12 +1410,12 @@ msgstr ""
"dpkg: %2$s 패키지가 들어 있는 %1$s 파일 고려:\n"
"%3$s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: 경고 - 충돌 무시, 어쨌든 계속 진행할 수도 있습니다 !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1424,31 +1424,31 @@ msgstr ""
"%.250s 설치하시면 %.250s을(를) 망가뜨릴 수 있으며, 설정\n"
"해제를 할 수도 없습니다(--auto-deconfigure이 도움될 수도 있습니다)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "%.250s 설치하시면 기존 소프트웨어를 망가뜨립니다"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %s 패키지를 지우고 %s 패키지를 설치하려 합니다...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s은(는) 올바르게 설치되지 않았습니다 - 패키지에 대한 모든 의존관계 무시합니"
"다.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: %s 패키지를 지울 때 문제가 있을 수 있습니다. 이 패키지가 %s을(를) 제공"
"하기 때문입니다 ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1456,71 +1456,71 @@ msgid ""
msgstr ""
"dpkg: %s 패키지는 다시 설치해야 합니다. 하지만 어쨌든 요청한 대로 지웁니다.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: %s 패키지는 다시 설치해야 합니다. 지우지 않습니다.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "%s 패키지의 충돌/대체 목록이 지나치게 깁니다"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: 네, %s 패키지는 지우고 %s 패키지를 설치합니다.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "패키지 충돌 - %.250s 패키지를 설치하지 않습니다"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: 경고 - 충돌 무시, 어쨌든 계속 진행합니다 !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive 옵션은 적어도 하나의 경로 인수가 필요합니다"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "--recursive를 위해 find 실행 실패했습니다"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "find의 파이프를 fdopen하는 데 실패했습니다"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "find의 파이프를 읽는 데 오류가 발생했습니다"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "find의 파이프를 닫는 데 오류가 발생했습니다"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
"--recursive를 위한 find 프로그램이 처리할 수 없는 오류(%i)를 리턴했습니다"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "패키지를 찾을 수 없습니다 (*.deb과 일치하는 파일들)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s 옵션은 적어도 하나의 패키지 아카이브 파일 인수가 필요합니다."
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1531,36 +1531,36 @@ msgstr "--%s 옵션은 적어도 하나의 패키지 아카이브 파일 인수
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "전에 선택하지 않은 %s 패키지를 선택합니다.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "선택하지 않은 %s 패키지는 넘어갑니다.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr ""
"%2$.250s 패키지의 %1$.250s 버전이 이미 설치되어 있습니다. 넘어갑니다.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
"%s - 경고: %.250s 패키지를 %.250s 버전에서 %.250s 버전으로 다운그레이드 합니"
"다.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2392,53 +2392,53 @@ msgstr "`%.250s'에 실행 권한을 설정할 수 없습니다"
msgid "unable to setenv for maintainer script"
msgstr "메인테이너 스크립트에서 환경 변수를 설정할 수 없습니다"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "설치한 %s 스크립트"
# FIXME: bad msgid
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "%s `%.250s'의 정보를 읽을 수 없습니다"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "새로운 %s 스크립트"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "과거의 %s 스크립트"
# FIXME: bad msgid
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "%s `%.250s'의 정보를 읽을 수 없습니다"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - 대신에 새 패키지의 스크립트를 시도합니다 ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "패키지 새 버전에 스크립트가 없습니다 - 포기합니다"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... 문제 없는 것처럼 보입니다.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "`%.255s'을(를) 만들 수 없습니다"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "정리를 위해 rm 실행 실패"
@@ -2861,28 +2861,28 @@ msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습
msgid "need an action option"
msgstr "명령 옵션이 필요합니다"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr "패키지를 패키지 이름으로 지정해야 합니다. 패키지 파일 이름이 아닙니다"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending에서는 옵션과 관계없는 인수를 받지 않습니다"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s 옵션은 적어도 하나의 패키지 이름 인수가 필요합니다"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr "패키지를 패키지 이름으로 지정해야 합니다. 패키지 파일 이름이 아닙니다"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "%s 패키지가 두 번 이상 등장했습니다. 한 번만 처리합니다.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2891,7 +2891,7 @@ msgstr ""
"이번 실행할 때 %s 패키지를 두 번 이상 풀었습니다!\n"
"설정은 한 번만 합니다.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2900,77 +2900,77 @@ msgstr ""
"%.250s 패키지는 트리거 처리 준비가 되어 있지 않습니다.\n"
" (현재 상태: `%.250s', 밀린 트리거 없음)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %s 패키지는 %s을(를) 제공하지만 지울 예정입니다.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " %s 패키지는 지울 예정입니다.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " 시스템에 있는 %s의 버전은 %s입니다.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %s 패키지는 (%s을(를) 제공) 트리거 처리를 기다립니다.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %s 패키지는 트리거 처리를 기다립니다.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: `%s'도 설정합니다 (`%s'때문에 필요)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " %s 패키지는 %s을(를) 제공하지만 아직 설정하지 않았습니다.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " %s 패키지는 아직 설정하지 않았습니다.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " %s 패키지는 %s을(를) 제공하지만 설치하지 않았습니다.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " %s 패키지는 설치하지 않았습니다.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr "%s(%s) %s을(를) 망가뜨리며 %s입니다.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (%s) %s을(를) 제공합니다.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " 설정하려고 하는 %s의 버전은 %s입니다.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " 패키지는 다음 패키지에 의존: "
# FIXME: bad msgid - grammar
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ": 하지만:\n"
@@ -2978,39 +2978,39 @@ msgstr ": 하지만:\n"
msgid "(no description available)"
msgstr "(설명 없음)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "아카이브에 접근할 수 없습니다"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "`%.250s' 파일을 지우는 데 오류가 발생했습니다"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"다중 구성 파일의 일부인지 알아보기 위해 dpkg-split을 실행하는 데 실패했습니다"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "다시 합친 패키지 파일"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "%s 패키지를 확인하는 중입니다 ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "debsig-verify 실행이 실패했습니다"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "%s 패키지 확인이 실패했습니다!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3019,31 +3019,31 @@ msgstr ""
"%s 패키지 확인이 실패했습니다,\n"
"하지만 요청한 대로 설치합니다.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "통과\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "임시 디렉토리 이름을 만드는 데 실패했습니다"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "control 정보를 빼 내기 위해 dpkg-deb을 실행할 수 없습니다"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%2$s에서 %1$s에 관한 정보를 기록합니다.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "패키지의 아키텍처(%s)는 시스템(%s)과 맞지 않습니다."
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3053,102 +3053,102 @@ msgstr ""
"다:\n"
"%3$s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "미리 의존 문제 - %.250s 패키지를 설치할 수 없습니다"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: 경고 - 미리 의존 문제를 무시합니다 !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "%s %s 패키지를 대체할 준비하는 중입니다 (%s 사용) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "%s 패키지를 푸는 중입니다 (%s에서) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "설정 파일의 이름(`%.250s'(으)로 시작)이 너무 깁니다 (> %d 문자)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250s에서 읽기 오류가 발생했습니다"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "%.250s을(를) 닫기 오류가 발생했습니다"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "%.250s을(를) 열기 시도하는 데 오류가 발생했습니다"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "%2$s을(를) 지우기 위해 %1$s을(를) 설정 해제하는 중입니다 ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "%s 패키지를 지우는 중입니다 ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "대체되는 %.250s 패키지를 푸는 중입니다 ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "파일 시스템 아카이브를 얻기 위해 dpkg-deb을 실행할 수 없습니다"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "dpkg-deb tar 출력을 읽는 데 오류가 발생했습니다"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "망가진 파일 시스템 tar 파일 - 망가진 패키지 아카이브"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: 뒤에 나오는 0을 잘라 버립니다"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: 경고 - 오래된 파일 `%.250s'의 정보를 읽을 수 없으므로 지우지 않습니다: "
"%s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: 경고 - 오래된 디렉토리 `%.250s'을(를) 지울 수 없습니다: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: 경고 - 오래된 설정 파일 `%.250s'은(는) 빈 디렉토리였으며 이제 지워졌습"
"니다\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "새로운 파일 `%.250s'의 정보를 읽을 수 없습니다"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3157,73 +3157,73 @@ msgstr ""
"dpkg: 경고 - 오래된 파일 `%.250s' 몇가지 새로운 파일과 같습니다(%.250s와 "
"%.250s 모두)!\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: 경고 - %s할 수 없습니다 (오래된 파일 '%%.250s'에): %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "정보 디렉토리를 읽을 수 없습니다"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"패키지의 과거 버전에 들어 있는 정보 파일의 이름이 (`%.250s'(으)로 시작) 너무 "
"깁니다."
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "과거 정보 파일 `%.250s' 파일을 지울 수 없습니다"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "새 (예상) 정보 파일 `%.250s' 파일을 설치할 수 없습니다"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "임시 컨트롤 디렉토리를 열 수 없습니다"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"패키지에 들어 있는 정보 파일의 이름이 (`%.250s'(으)로 시작) 너무 깁니다."
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "패키지 컨트롤 정보에 `%.250s' 디렉토리가 들어 있습니다"
# FIXME: bad msgid -- jargon (NOTADIR)
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"패키지 컨트롤 정보 `%.250s'의 rmdir에서 디렉토리가 아니라는 결과가 나오지 않"
"았습니다"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: 경고 - %s 패키지는 정보 파일로 목록이 들어 있습니다"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "새 정보 파일 `%.250s'을(를) `%.250s'(으)로 설치할 수 없습니다"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
"(%s 패키지가 없어진 것에 유의하십시오. 완전히 다른 패키지로 대체되었습니"
"다.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "지워야 할 컨트롤 정보 파일 `%.250s'을(를) 지울 수 없습니다"
@@ -3857,7 +3857,7 @@ msgstr "dpkg-trigger: 대기중인 패키지 이름이 (`%.250s') 잘못되었
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: 트리거 이름이 (`%.250s') 잘못되었습니다: `%.250s'"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3866,7 +3866,7 @@ msgstr ""
"%s: 트리거를 처리하는 중 반복이 발견되었습니다:\n"
" 트리거가 있는 패키지의 연결에 문제가 있습니다:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3875,11 +3875,11 @@ msgstr ""
"\n"
" 해결이 불가능한 패키지의 밀린 트리거:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "트리거가 반복하고 있으므로 지웁니다"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "%s에 대한 트리거를 처리하는 중입니다 ...\n"
diff --git a/po/ku.po b/po/ku.po
index 083a167c2..9287f3a4a 100644
--- a/po/ku.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1121,7 +1121,7 @@ msgstr "di xwendina %.250s de çewtî"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr ""
@@ -1135,12 +1135,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr ""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr ""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr ""
@@ -1157,148 +1157,148 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr ""
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr ""
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr ""
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr ""
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr ""
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr ""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr ""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr ""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr ""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr ""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr ""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr ""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr ""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr ""
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "afirandina peldankê biserneket"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "afirandina peldankê biserneket"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1307,87 +1307,87 @@ msgstr ""
"dpkg: pirsgirêkên bindestiyê rakirina %s asteng dikin:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr ""
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr ""
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
"%s"
msgstr ""
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "pelê `%.250s' nayê rakirin"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr ""
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: `%s' jî tê veavakirin (`%s' vê dixwaze)\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
"%s"
msgstr ""
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr ""
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1396,68 +1396,68 @@ msgstr ""
"dpkg: %s: pirsgirêkên girêdayîbûnê, lê ser daxwaza te tê rakirin:\n"
"%s"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr ""
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr ""
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr ""
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr ""
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr ""
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr ""
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr ""
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1468,33 +1468,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Pakêta %s ku berê nehatiye hilbijartin tê hilbijartin.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Pakêta %s ku nehatiye hilbijartin tê derbaskirin.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Guhartoya %.250s a %.250s sazkirî ye, tê derbaskirin.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - hişyarî: %.205s ji %.205s tê nizimkirin û dibe %.205s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "%.205s ji guhartoya %.205s ber bi %.205s nizm nabe, tê derbaskirin.\n"
@@ -2261,51 +2261,51 @@ msgstr ""
msgid "unable to setenv for maintainer script"
msgstr "tmpfile bo vsnpritif nayê vekirin"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "sazkirî"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr ""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr ""
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr ""
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr ""
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr ""
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ...\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "afirandina peldankê biserneket"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr ""
@@ -2581,111 +2581,111 @@ msgstr ""
msgid "need an action option"
msgstr ""
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr ""
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr ""
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
" in this run ! Only configuring it once.\n"
msgstr ""
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
" (current status `%.250s' with no pending triggers)"
msgstr ""
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr ""
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pakêta %s dê were rakirin.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Guhartoya %s di pergalê de %s e.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pakêta %s ya ku %s tîne hê nehatiye veavakirin.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pakêta %s dê were rakirin.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: `%s' jî tê veavakirin (`%s' vê dixwaze)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pakêta %s ya ku %s tîne hê nehatiye veavakirin.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pakêta %s hê nehatiye veavakirin.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Pakêta %s ya ku %s tîne hê ne sazkirî ye.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pakêta %s ne sazkirî ye.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr ""
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr ""
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Guhartoya %s di pergalê de %s e.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr "jê giredayî ye"
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; lê belê:\n"
@@ -2693,234 +2693,234 @@ msgstr "; lê belê:\n"
msgid "(no description available)"
msgstr "(rave ne amade ye)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "arşîv nayê gihîştin"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr ""
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr ""
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr ""
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr ""
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr ""
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
"but installing anyway as you requested.\n"
msgstr ""
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr ""
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "afirandina peldankê biserneket"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr ""
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr ""
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr ""
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr ""
"dpkg: pirsgirêkên bindestiyê rakirina %s asteng dikin:\n"
"%s"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr ""
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "%s tê derxistin (ji %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr ""
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr ""
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr ""
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "%s tê rakirin ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Yêdeka %.250s tê derxistin ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr ""
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr ""
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "afirandina peldankê biserneket"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr ""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr ""
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "peldanka agahiyê nayê xwendin"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr ""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr ""
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr ""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr ""
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3469,25 +3469,25 @@ msgstr ""
msgid "invalid trigger name `%.250s': %.250s"
msgstr "navê pakêtê yê nederbasdar (%.250s)"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Pelên veavakirina %s bi tevahî tên rakirin ...\n"
diff --git a/po/lt.po b/po/lt.po
index d66061311..3ff46fe7c 100644
--- a/po/lt.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1148,7 +1148,7 @@ msgstr "netikėta %.250s failo pabaiga"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "klaida skaitant iš dpkg-deb pipe"
@@ -1162,12 +1162,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "klaida nustatant laiko žymę `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "klaida nustatant savininką `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "klaida nustatant teises `%.255s'"
@@ -1184,149 +1184,149 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr ""
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "negaliu patikrinti `%.255s' (kurį bandžiau įdiegti)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "prieš diegiant kitą versiją nepavyko patikrinti atstatyto `%.255s'"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "archyve esantis `%.255s' objektas yra nežinomo 0x%x tipo"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Keičiami failai iš senojo %s paketo ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Pakeista failais iš įdiegto %s paketo ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "bandoma perrašyti aplanką `%.250s' esantį pakete %.250s su ne aplanku"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "bandoma perrašyti „%.250s“, kuris taip pat yra pakete %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr ""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "klaida uždarant/rašant `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "klaida kuriant duomenų srautą `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "klaida kuriant įrenginį `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "klaida kuriant tvirtają nuorodą `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "klaida kuriant simbolinę nuorodą `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "klaida nustatant nuorodos savininką `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "klaida kuriant aplanką `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "nepavyksta perkelti atidėto `%.255s' norint įdiegti naują versiją"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "neįmanoma rasti nuorodos `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "neįmanoma sukurti atsarginės nuorodos į `%.255s' kopijos"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "negaliu pakeisti atsarginės nuorodos kopijos į `%.255s' savininko"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"neįmanoma sukurti nuorodos į `%.255s' kopijos prieš įdiegiant naują versiją"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "negaliu įdiegti naujos `%.255s' versijos"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "nepavyko sukurti `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "nepavyko sukurti `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1335,7 +1335,7 @@ msgstr ""
"dpkg: įspėjimas: ignoruojama %s priklausomybių problema:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1344,84 +1344,84 @@ msgstr ""
"dpkg: dėmesio: svarstoma esminio paketo %s\n"
" dekonfigūracija, kad būtų galima įdiegti %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr ""
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
"%s"
msgstr ""
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr ""
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr ""
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
"%s"
msgstr ""
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: įspėjimas: konfliktas ignoruojamas, bus tęsiama bet kokiu atveju !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: nuspręsta pašalinti %s keičiant jį į %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s paketas įdiegtas nekorektiškai - ignoruoju bet kokias jo priklausomybes.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: %s pašalinimas gali sukelti problemų, kadangi jis teikia %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1430,72 +1430,72 @@ msgstr ""
"dpkg: paketas %s reikalauja įdiegimo iš naujo, tačiau jis bus išmestas kaip "
"jūs prašėte.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: package %s requires reinstallation, will not remove.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: taip, pašalinsiu %s vietoj %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "konfliktuojantys paketai - neįdiegsiu %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
"dpkg: įspėjimas: konfliktas ignoruojamas, bus tęsiama bet kokiu atveju !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive pasirinkimui reikia bent vienos kelio reikšmės"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "nepavyko įvykdyti paieškos pasirinkimui --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "nepavyko atidaryti paieškos srauto"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "klaida skaitant paieškos srautą"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "klaida uždarant paieškos srautą"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "paieška pasirinkimui --recursive įvykdė neapdorojamą klaidą %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"ieškojau, tačiau neradau nei vieno paketo atitinkančio (*.deb) kriterijų"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s reikia nors vienos paketo archyvo failo reikšmės"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1506,33 +1506,33 @@ msgstr "--%s reikia nors vienos paketo archyvo failo reikšmės"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Pažymime anksčiau nepažymėtą paketą %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Praleidžiame nepasirinktą paketą %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versija %.250s paketui %.250s jau įdiegta, todėl praleidžiama.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s: perspėjimas: sendinamas %.250s iš %.250s į %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "Nesendinsiu %.250s įš versijos %.250s į %.250s, todėl praleidžiama.\n"
@@ -2354,51 +2354,51 @@ msgstr "nepavyko nustatyti vykdymo teisių „%.250s“"
msgid "unable to setenv for maintainer script"
msgstr "nepavyko gauti vsnprintf būsenos"
-#: src/help.c:289
+#: src/help.c:290
#, 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:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "nepavyksta patikrinti %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "naujas %s scenarijus"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "senas %s scenarijus"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nepavyksta patikrinti %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, 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:426
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:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... atrodo viskas praėjo GERAI.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "nepavyko sukurti `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "nepavyko įvykdyti rm išvalymui"
@@ -2789,31 +2789,31 @@ msgstr "netikėta failo pabaiga prieš %d eilutės pabaigą"
msgid "need an action option"
msgstr "reikia veiksmo parametro"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"turite nurodyti paketus jų vardais, o ne vardais failų, kuriuose jie yra"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending nereikia jokių ne parametro reikšmių"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s reikalinga bent viena paketo vardo reikšmė"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"turite nurodyti paketus jų vardais, o ne vardais failų, kuriuose jie yra"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"Paketas %s nurodytas daugiau nei vieną kartą, apdorotas bus tik vieną "
"kartą.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2822,7 +2822,7 @@ msgstr ""
"Buvo išpakuota daugiau nei viena paketo %s versija !\n"
" Konfigūruosiu tik kartą.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2831,76 +2831,76 @@ msgstr ""
"paketas %.250s neparuoštas konfigūravimui\n"
" negaliu konfigūruoti (dabartinė būsena `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Paketas %s kuris teikia %s bus pašalintas.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Paketas %s bus pašalintas.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Sistemoje esantičio %s paketo versija yra %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Paketas %s kuris teikia %s bus pašalintas.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Paketas %s bus pašalintas.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: taip pat konfigūruojamas `%s' (reikia paketui `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Paketas %s teikiantis %s dar nekonfigūruotas.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Paketas %s dar nekonfigūruotas.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Paketas %s teikiantis %s neįdiegtas.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Paketas %s neįdiegtas.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr ""
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) teikia %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Bus konfigūruojama paketo %s versija %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " priklauso nuo "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; tačiau:\n"
@@ -2908,38 +2908,38 @@ msgstr "; tačiau:\n"
msgid "(no description available)"
msgstr "(aprašymas neprieinamas)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "negaliu prieiti prie archyvo"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "klaida mano `%.250s' neegzistuoja"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "perrinktas paketo failas"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autentikuojamas %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "nepavyko įvykdyti debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Paketo %s tikrinimas nepavyko!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2948,31 +2948,31 @@ msgstr ""
"Paketo %s tikrinimas nepavyko,\n"
"tačiau diegiu kaip nurodyta.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "praėjo\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "nepavyko sukurti laikino aplanko vardo"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "nepavyko įvykdyti dpkg-deb valdymo informacijai gauti"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Įrašas apie %s iš %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "paketo architektūra (%s) netinka jūsų sistemai (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2981,175 +2981,175 @@ msgstr ""
"dpkg: dėl %s esančio %s, priklausomybių problema:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "priklausomybių problema - nediegiu %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: įspėjimas: ignoruojama prieš-priklausomybių problema!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Ruošiamasi pakeisti %s %s (naudojant %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Išpakuojamas archyvas %s (iš %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"konfigūracijos failo vardas (pradedant „%.250s“) yra per ilgas (>%d simbolių)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "skaitymo klaida %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "klaida uždarant %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "klaida bandant atidaryti %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Dekonfigūruojamas %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Išpakuojamas %.250s pakaitalas...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "nepavyko įvykdyti dpkg-deb ir gauti failų sistemos archyvo"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "klaida skaitant dpkg-deb tar išvestį"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "pažeistas failų sistemos tar failas - pažeistas paketų archyvas"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: naikinamos galimos tarpų sekos"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: įspėjimas: nepavyko patikrinti seno „%.250s“ failo, todėl jis "
"netrinamas: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: įspėjimas: nepavyko ištrinti seno aplanko „%.250s“: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: įspėjimas: senas nustatymų failas „%.250s“ buvo tuščias aplankas (ir "
"buvo ištrintas)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr ""
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: perspėjimas: nepavyko %s seno failo „%%.250s“: %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "negaliu perskaityti informacijos aplanko"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"sena paketo versija turi per daug didelę informacijos failą pradedant "
"„%.250s“"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "nepavyko pašalinti pasenusio „%.250s“ informacijos failo"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "nepavyko įdiegti informacijos failo „%.250s“ (nors reikėtų)"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "nepavyko atverti laikino valdymo aplanko"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pakete yra informacijos valdymo failas per ilgu pavadinimu (pradedant "
"„%.50s“)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "paketo valdymo informacijoje yra aplankas `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"paketo valdymo informacijoje nebuvo parašyta, kad rmdir `%.250s' yra ne "
"aplankas"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: įspėjimas: %s pakete informacijos failas yra sąrašas"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"nepavyko įdiegti naujo informacijos failo „%.250s“ su pavadinimu „%.250s“"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Pažymėtinas %s dingimas, kuris buvo visiškai pakeistas.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "nepavyko pašalinti dingusio informacijos valdymo failo „%.250s“"
@@ -3759,25 +3759,25 @@ msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Šalinami %s konfigūracijos failai...\n"
diff --git a/po/mr.po b/po/mr.po
index 48ddcf5ca..3b2c6f1a6 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2006-08-17 16:02+0200\n"
"Last-Translator: Priti Patil <prithisd@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -1128,7 +1128,7 @@ msgstr "%.250s मधील फाइलचा अनपेक्षित श
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "डिपिकेजी-डेब पाइप मधुन वाचन त्रुटी"
@@ -1142,12 +1142,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "`%.255s'चा समयशिक्का निर्धारीत करताना त्रुटी"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "`%.255s' ची मालकी निश्चित करताना त्रुटी"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "`%.255s' च्या परवानग्या निर्धारीत करताना त्रुटी"
@@ -1164,7 +1164,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1173,143 +1173,143 @@ msgstr ""
"`%.250s'%.10s%.100s%.10s ची वळवलेली आवृत्ती असलेल्या `%.250s' वर पुनर्लेखन करण्याच्या "
"प्रयत्नात"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"`%.250s'%.10s%.100s%.10s ची वळवलेली आवृत्ती असलेल्या `%.250s' वर पुनर्लेखन करण्याच्या "
"प्रयत्नात"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "`%.255s' स्टॅट करता येत नाही (जे मी आता अधिष्ठापित करणार होतो)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "अन्य आवृत्ती अधिष्ठापित करण्यापुर्वी `%.255s' भोवतालचा घोळ निस्तारता येत नाही"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "अन्य आवृत्ती अधिष्ठापित करण्यापुर्वी `%.255s' स्टॅट रिस्टोअर्ड करता येत नाही"
-#: src/archives.c:515
+#: src/archives.c:516
#, fuzzy, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "आर्काइवमधे 0x%x या अपरिचित प्रकाराचे `%.255s' ओॅब्जेक्ट होते"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "%s ... जुन्या पॅकेजमधील फायली बदलल्या जात आहेत \n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "%s ... अधिष्ठापित पॅकेजमधील फायलींनी बदलले \n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "%.250s पॅकेजमधील `%.250s' निर्देशिकेवर नाॅननिर्देशिकेने पुनर्लेखन करण्याच्या प्रयत्नात"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "%.250s पॅकेजमधेही असल्याने, `%.250s' वर पुनर्लेखन करण्याच्या प्रयत्नात"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "`%.255s' (`%.255s' मधील) वाचता आली नाही"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "`%.255s' दरम्यान बॅकएन्ड डिपिकेजी-डेब"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "`%.255s बंद करताना/लिहिताना त्रुटी "
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "`%.255s' पाइप बनवताना त्रुटी"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "`%.255s' उपकरण बनवताना त्रुटी"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "`%.255s' हार्ड साखळी बनवताना त्रुटी"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "`%.255s' प्रतीकात्मक साखळी बनवताना त्रुटी"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "`%.255s' सिमलिंकची मालकी निश्चित करताना त्रुटी"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "`%.255s' निर्देशिका बनवताना त्रुटी"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "नविन आवृत्ती स्थापन करण्यासाठी `%.255s' बाजूला करण्यास अशक्य"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "`%.255s' साखळी/लिंक वाचण्यास अशक्य"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "`%.255s'चे सिमलिंक बॅकप घेणे अशक्य"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "`%.255s'चे chown सिमलिंक बॅकप घेणे अशक्य"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "नविन आवृत्ती स्थापन करण्याआधी `%.255s'चे सिमलिंक बॅकप घेणे अशक्य"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "`%.255s' ची रचना करता येत नाही"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "`%.255s' अनबफर करता येत नाही"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1318,7 +1318,7 @@ msgstr ""
"डिपिकेजी: ताकिद - %s काढून टाकून अवलंबुन रहाण्याची समस्या दुर्लक्षित करित आहे:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1327,7 +1327,7 @@ msgstr ""
"डिपिकेजी: ताकिद - %s काढुन टकण्यासाठी जरुरी असलेल्या\n"
" %s पॅकेजची अजुळवणी विचारात घेत आहे.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1335,7 +1335,7 @@ msgid ""
msgstr ""
"डिपिकेजी: नाही, %s हे जरूरी आहे, %s काढुन टाकण्यासाठी त्याची अजुळवणी करणे शक्य नाही.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1344,28 +1344,28 @@ msgstr ""
"डिपिकेजी: नाही, %s काढू शकत नाही (--स्वयंचलीत-अजुळवणी मदत करू शकते):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "%.250sमध्ये वाचनाची समस्या"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "डिपिकेजी: %s च्या मर्जीनुसार %s काढून टाकण्याचा विचार करत आहे ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "डिपिकेजी: हो %sच्या मर्जीनुसार %s कढून टाकले जाइल.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1374,40 +1374,40 @@ msgstr ""
"डिपिकेजी: %s बद्दल ज्याच्यात %s आहे:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "डिपिकेजी: ताकिद - परस्परविरोधाकडे दुर्लक्ष करित आहे, तरी पुढे जाऊ शकता !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "डिपिकेजी: %s च्या मर्जीनुसार %s काढून टाकण्याचा विचार करत आहे ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s ची बरोबर स्थापना झालेली नाही - त्यावर अवलंबित असलेल्या बाबींकडे दुर्लक्ष करित आहे.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "डिपिकेजी: %s काढुन टकण्यास समस्या येइल कारण ती %s पुरवते ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1415,70 +1415,70 @@ msgid ""
msgstr ""
"डिपिकेजी: पॅकेज %sला पुर्नस्थापनेची जरूरी आहे, पण तुमच्या विनंती नुसार ते काढूनटाकले जाइल\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "डिपिकेजी: पॅकेज %sला पुर्नस्थापनेची जरूरी आहे, ते काढून टाकले जाणार नाही.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "डिपिकेजी: हो %sच्या मर्जीनुसार %s कढून टाकले जाइल.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "परस्परविरोधी पॅकेजेस - %.250sची स्थापना होत नाही"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "डिपिकेजी: ताकिद - परस्परविरोधाकडे दुर्लक्ष करित आहे, तरी पुढे जाऊ शकता !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --रिकर्सीव्ह/पुन्हा: पुन्हा: लागणारी गरज कमीतकमी एक पाथ आरग्युमेन्ट"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "--रिकर्सीव्हला लागणारा शोध अमलात आणण्यास अयशस्वी"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "फाइन्ड्स पाइप एफडीओपन करण्यास अयशस्वी"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "फाइन्ड्स पाइप वाचण्यास दोष येतोय"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "फाइन्ड्स पाइप बंद करण्यास दोष येतोय"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "--पुन्हाः पुन्हाः परत येणारी नादुरुस्त झालेली %i चूक शोधा"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "शोध घेतला, पण पॅकेजेस (फाइल *.deb) सापडले नाही"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s ला कमीतकमी एका पॅकेजच्या अर्काइव्ह फाइलच्या आरग्यूमेंटची गरज आहे"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1489,33 +1489,33 @@ msgstr "--%s ला कमीतकमी एका पॅकेजच्या
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "अगोदर निवड रद्द झालेल्या %s पॅकेजची निवड होत आहे.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "निवड रद्द झालेल्या %s पॅकेज वगळत आहे.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "%.250s ची %.250s आवृत्ती अगोदर स्थापन केलीली आहे, वगळत आहे.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - ताकिद : %.250s हे %.250sला %.250s वरून खाली आणते.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "%.250s हे %.250sला %.250s वरून खाली आणणार नाही, वगळत आहे.\n"
@@ -2336,51 +2336,51 @@ msgstr "`%.250s' वरिल एग्झिक्युट परवानग
msgid "unable to setenv for maintainer script"
msgstr "व्हीएसएनप्रिंटएफ़मधे सुरूवात करणे जमत नाही"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "जुनी %s स्क्रिप्ट"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "%s `%.250s' स्टॅट करण्यास असमर्थ आहे"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "नविन %s स्क्रिप्ट"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "जुनी %s स्क्रिप्ट"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "%s `%.250s' स्टॅट करण्यास असमर्थ आहे"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "डिपिकेजी: त्याऐवजी नविन पॅकेज मधल्या स्क्रिप्टचा प्रयत्न करते ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "पॅकेजच्या नव्या आवृत्तीमध्ये स्क्रिप्ट नाही आहे - सोडून देत आहे"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "डिपिकेजी: ... ते बरोबर झाल्यासरखे दिसत आहे.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "`%.255s' ची रचना करता येत नाही"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "एग्झेक आरएमने स्वछ करणे/क्लिन अप अशक्य"
@@ -2786,30 +2786,30 @@ msgstr "%d ओळीच्या शेवटाच्या अगोदर अ
msgid "need an action option"
msgstr "क्रियेच्या पर्यायाची आवश्यक्ता आहे"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"तुम्ही पॅकेजेसचा उल्लेख त्यांच्या स्वतःच्या नावानेच करा, ती ज्या फाइलमध्ये आहेतत्यांची "
+"अवतरणचिन्हांत नावे देऊ नका"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --पेन्डिंग कोणतिही अपर्यायी आर्ग्युमेन्ट घेत नाही"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s कमित कमी एका पॅकेजच्या नावाच्या आर्ग्युमेन्टची/पर्यायीची आवशक्यता आहे"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"तुम्ही पॅकेजेसचा उल्लेख त्यांच्या स्वतःच्या नावानेच करा, ती ज्या फाइलमध्ये आहेतत्यांची "
-"अवतरणचिन्हांत नावे देऊ नका"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "पॅकेज %s एकापेक्षा जास्त वेळा सुचित केले आहे, पण त्यावर एकदाच प्रक्रिया होते.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2818,7 +2818,7 @@ msgstr ""
"एकापेक्षा जास्त %s पॅकेजेसची प्रत या रनमध्ये अनपॅक केली आहे ! \n"
"फक्त एकदाच जुळवणी करून.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2827,76 +2827,76 @@ msgstr ""
"पॅकेज %.250s हे जुळवणीसाठी तयार नाही\n"
"जुळवणी शक्य नाही (सध्याची स्थिती `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %s पॅकेज जे %s देते ते काढुन टाकले पाहिजे.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " %s पॅकेज काढण्यात यावे.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " %sची सिस्टमवर/संगणकावर %s आवृत्ती आहे.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %s पॅकेज जे %s देते ते काढुन टाकले पाहिजे.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %s पॅकेज काढण्यात यावे.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "डिपिकेजी: `%s'ची जुळवणी केली जात आहे (`%s'साठी आवश्यक आहे)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " %s पॅकेज जे %s देते त्याची जुळवणी अद्याप केलेली नाही.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " %s पॅकेजची जुळवणी अद्याप केलेली नाही.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " %s पॅकेज जे %s देते त्याची स्थापना केलेली नाही.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " %s पॅकेजची स्थापना केलेली नाही.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s हे %.250s पुरवतात आणि ते %s आहे.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (उपप्रक्रिया): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %sची सिस्टमवर/संगणकावर %s आवृत्ती आहे.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " च्यावर अवलंबुन "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; तथापी:\n"
@@ -2904,38 +2904,38 @@ msgstr "; तथापी:\n"
msgid "(no description available)"
msgstr "(वर्णन उपलब्ध नाही)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "आर्काइव्हमध्ये प्रवेश करणे अशक्य"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "`%.250s'ची खात्री करणारा दोष अस्तित्वात नाही"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "तो अनेकविभाजकाचा भाग आहे हे पहाण्यासाठी डिपिकेजी-स्प्लिट अमलात आणण्यास अयशस्वी"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "पॅकेज फाइल पुन्हः एकत्र केली"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "%sचा खरेपणा सिद्ध करित आहे...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "डेबसिग-वेरिफाय अमलात आणण्यास अयशस्वी"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "%s पॅकेजची पडताळणी अयशस्वी"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2944,133 +2944,133 @@ msgstr ""
"%s पॅकेजची पडताळणी अयशस्वी,\n"
"परंतु तुमच्या मागणी/विनंती नुसार स्थापना करीत आहे.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr " मंजूर झाले\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "अस्थायी निर्देशिकानाव बनवता आले नाही"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "नियंत्रण/नियमन माहिती मिळवण्यास डिपिकेजी-डेब अमलात आणण्यास अयशस्वी"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%s मधुन %sच्या माहितीची नोंद केली.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "(%s) पॅकेज आर्किटेक्चर (%s) प्रणाली बरोबर जुळत नाही"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, fuzzy, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr "डिपिकेजी: %s बद्दल ज्यात %s आहे, प्रि-डिपेन्डन्सी समस्या:\n"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "प्रि-डिपेन्डन्सी समस्या - %.250s स्थापना करत नाही"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "डिपिकेजी: ताकिद - प्रि-डिपेन्डन्सी समस्यांकडे दुर्लक्ष करत आहे !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "%s %s बदली करण्याची तयारी करत आहे (%s उपयोगात आणा) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "%s अनपॅक करत आहे (%s मधुन) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "कॉन्फफाइलचे नाव (`%.250s' पासुन सुरवात) खूप मोठे आहे (>%d अक्षरे)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250sमध्ये वाचनाची समस्या"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "समस्या %.250s बंद करत आहे"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "समस्या %.250s उघडण्याचा प्रयत्न करत आहे"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "%sची अजुळवणी करत आहे, जेणे करुन आपण %s काढुन टाकू शकतो...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "%s काढून टाकत आहे...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "%.250sची अदलाबदली अनपॅक करत आहे ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "आर्काइव्ह फाइलप्रणाली मिळवण्यासाठी डिपिकेजी-डेब अमलात आणणे अशक्य"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "डिपिकेजी-डेब टार आउट्पुट/उत्पादन वाचनाची समस्या"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "दुषित फाइलप्रणाली टारफाइल - दुषित आर्काइव्ह पॅकेज"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "डिपिकेजी-डेब: शक्य असलेली मागिल शून्ये झॅप करा/ काढून टाका"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"डिपिकेजी: ताकिद - जुनी `%.250s' फाइल स्टॅट करण्यास अशक्य म्हणुन ती डिलिट करत नाही: %"
"s "
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "डिपिकेजी: ताकिद - जुनी `%.250s' डिरेक्टरी डिलिट करण्यास/काढण्यास अशक्य: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"डिपिकेजी: ताकिद - जुनी `%.250s' कॉन्फफाइल रिकामी डिरेक्टरी होती (आणि ती आता डिलिट "
"करण्यात /काढून टाकण्यात आली आहे)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3079,66 +3079,66 @@ msgstr ""
"डिपिकेजी: ताकिद - जुनी `%.250s' फाइल ही अनेक नविन फाइलींप्रमाणे आहे! (दोन्ही "
"%.250s' आणि `%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "डिपिकेजी: ताकिद - जुनी `%%.250s' फाइल %s करण्यास अशक्य : %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "माहितीची डिरेक्टरी वाचू शकत नाही"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr "जुन्य़ा पॅकेजच्या आवृत्तीत `%.250s'नी सुरुवात होणारे फारच मोठे माहिती फाइलचे नाव आहे"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "अप्रचलित माहिती फाइल `%.250s' काढण्यास अशक्य"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "`%.250s' नविन माहितीच्या फाइलची स्थापना(गृहीत धरलेले) करण्यास अशक्य"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "टेम्प/तात्पुर्ती नियंत्रण डिरेक्टरी उघडण्यास अशक्य "
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "(`%.50s'नी सुरुवात होणारे) फारच मोठे नियंत्रण माहिती फाइल नाव पॅकेजमध्ये आहे"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "`%.250s' डिरेक्टरी पॅकेजच्या नियंत्रण माहितीमध्ये समाविष्ट आहे"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"पॅकेजची नियंत्रण माहिती `%.250s'ची आरएमडिआयआर/rmdir डिआयआर नाही असे म्हंटले नाही"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "डिपिकेजी: ताकिद - पॅकेज %sमध्ये माहिती फाइलची सुची समाविष्ट आहे"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "नवी माहिती फाइल `%.250s' हिची `%.250s' म्हणून स्थापना करण्यास असमर्थ आहे"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(नोंद करत आहे %s नाहिसे झाले आहे, ते पुर्णपणे बदलले गेले आहेत.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "`%.250s' नियंत्रण माहिती फाइल जी नाहिशी होत आहे ती काढून टाकण्यास असमर्थ आहे"
@@ -3755,25 +3755,25 @@ msgstr "`%s' क्षेत्र, पॅकेजचे नाव अयोग
msgid "invalid trigger name `%.250s': %.250s"
msgstr "`%s' क्षेत्र, पॅकेजचे नाव अयोग्य `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "%sसाठी जुळवणी फाइल पर्ज करत आहे...\n"
diff --git a/po/nb.po b/po/nb.po
index b15f27438..c1e805fbc 100644
--- a/po/nb.po
+++ b/po/nb.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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-11-17 01:59+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -1148,7 +1148,7 @@ msgstr "uventet slutt på fil under lesing av «%.250s»"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "feil ved lesing fra dpkg-deb-rør"
@@ -1162,12 +1162,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "feil ved setting av tidsmerke for «%.255s»"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "feil ved setting av eierskap for «%.255s»"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "feil ved setting av rettigheter for «%.255s»"
@@ -1187,7 +1187,7 @@ msgstr ""
"klarte ikke (stat) finne informasjon om foreslått nytt symlenke mål «%.250s» "
"for symlenke «%.250s»"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1196,18 +1196,18 @@ msgstr ""
"prøver å skrive over «%.250s», som er den omdirigerte versjonen av "
"«%.250s» (pakke: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"prøver å skrive over «%.250s», som er den omdirigerte versjonen av «%.250s»"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "fant ikke «%.255s» (som jeg skulle til å installere)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1216,28 +1216,28 @@ msgstr ""
"klarte ikke rydde opp i rotet rundt «%.255s» før en annen versjon skulle "
"installeres"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"fant ikke gjenopprettet «%.255s» før en annen versjon skulle installeres"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arkivet inneholdt objektet «%.255s» med ukjent type 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Bytter ut filer i den gamle pakken %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Byttet ut med filer i den installerte pakken %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1246,99 +1246,99 @@ msgstr ""
"prøver å skrive over katalogen «%.250s» i pakken %.250s med noe annet enn en "
"katalog"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "prøver å skrive over «%.250s», som også finnes i pakken %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "klarte ikke lese «%.255s» (i «%.255s»)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "bakgrunnssystem dpkg-deb under «%.255s»"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "feil ved lukking/skriving av «%.255s»"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "feil ved oppretting av rør «%.255s»"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "feil ved oppretting av enhet «%.255s»"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "feil ved oppretting av hard lenke «%.255s»"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "feil ved oppretting av symbolsk lenke «%.255s»"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "feil ved setting av eierskap for den symbolske lenken «%.255s»"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "feil ved oppretting av katalogen «%.255s»"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "klarte ikke flytte «%.255s» for å installere en ny versjon"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "klarte ikke lese lenken «%.255s»"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "klarte ikke lage sikringskopi av den symbolske lenken «%.255s»"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "klarte ikke endre eierskap til den symbolske lenken «%.255s»"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"klarte ikke lage sikringskopi av lenken «%.255s» før en ny versjon skulle "
"installeres"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "klarte ikke installere ny versjon av «%.255s»"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "klarte ikke opprette «%.255s»"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "klarte ikke lukke mellomlager for «%.255s»"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1347,7 +1347,7 @@ msgstr ""
"dpkg: Advarsel - ignorerer kravproblem med %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1356,7 +1356,7 @@ msgstr ""
"dpkg: Advarsel - vurderer fjerning av oppsett for den nødvendige\n"
" pakken %s, for å kunne aktivere %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1365,7 +1365,7 @@ msgstr ""
"dpkg: Nei, %s er nødvendig. Vil ikke fjerne oppsettet\n"
" for å kunne aktivere %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1374,28 +1374,28 @@ msgstr ""
"dpkg: Nei, kan ikke fortsette med %s (--auto-deconfigure kan hjelpe):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "fjerning av %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "installering av %.255s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: Vurderer å fjerne oppsett for %s, som blir ødelagt av %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: Ja, fjerner oppsett for %s (ødelagt av %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1404,12 +1404,12 @@ msgstr ""
"dpkg: Knytt til %s, som inneholder %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: Advarsel - ignorerer ødeleggelse, men kan fortsette likevel.\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1418,27 +1418,27 @@ msgstr ""
"installering av %.250s vil ødelegge %.250s, og\n"
" fjerning av oppsett er ikke tillatt (--auto-deconfigure kan hjelpe)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "installering av %.250s vil ødelegge eksisterende programvare"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: Vurderer å fjerne %s til fordel for %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s er ikke skikkelig installert - ignorerer pakkekrav.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: Kan få problemer med å fjerne %s, siden den tilbyr %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1447,71 +1447,71 @@ msgstr ""
"dpkg: Pakken %s krever installasjon på nytt, men blir fjernet likevel, siden "
"du ønsker det.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
"dpkg: Pakken %s krever installasjon på nytt, så den blir ikke fjernet.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pakke %s har for mange konflikt/erstatt-par"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: Ja, fjerner %s til fordel for %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "pakker i konflikt - installerer ikke %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: Advarsel - ignorerer konflikt, men kan fortsette likevel.\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive trenger minst én sti-parameter"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "klarte ikke kjøre «find» for --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "klarte ikke utføre «fdopen» på find-røret"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "klarte ikke lese find-røret"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "klarte ikke lukke find-røret"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find for --recursive returnerte den uforutsette feilen %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "søkte, men fant ingen pakker (filer med navn *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s trenger minst én pakkearkivfil som parameter"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1522,33 +1522,33 @@ msgstr "--%s trenger minst én pakkearkivfil som parameter"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Velger den tidligere fravalgte pakken %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Hopper over den fravalgte pakken %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versjon %.250s av %.250s er installert fra før, hopper over.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - Advarsel: Nedgraderer %.250s fra %.250s til %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2381,51 +2381,51 @@ msgstr "klarte ikke sette kjøretillatelse på «%.250s»"
msgid "unable to setenv for maintainer script"
msgstr "klarte ikke setenv for maint-skript"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "gammelt %s-skript"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "fant ikke %s «%.250s»"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nytt %s-skript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "gammelt %s-skript"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "fant ikke %s «%.250s»"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - prøver i stedet et skript fra den nye pakken ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "det finnes ingen skript i den nye versjonen av pakken - gir opp"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... det ser ut til at det gikk fint.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "klarte ikke opprette «%.255s»"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "klarte ikke kjøre «rm» for opprydding"
@@ -2853,29 +2853,29 @@ msgstr "uventet slutt på fil før slutten av linje %d"
msgid "need an action option"
msgstr "trenger et handlingsvalg"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"du må gi selve navnet på pakkene, ikke navnene på filene som pakkene ligger i"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending tar ingen parametre som ikke er valg"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s trenger minst ett pakkenavn som parameter"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"du må gi selve navnet på pakkene, ikke navnene på filene som pakkene ligger i"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Pakken %s er nevnt flere ganger, behandler bare én gang.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2884,7 +2884,7 @@ msgstr ""
"Flere kopier av pakken %s er pakket ut i denne\n"
" omgangen. Setter bare opp én gang.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2893,76 +2893,76 @@ msgstr ""
"pakken %.250s er ikke klar for utløserbehandling\n"
" (nåværende status «%.250s» med ingen utestående utløsere)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pakke %s som gir %s skal fjernes.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pakke %s skal fjernes.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Versjon av %s på systemet er %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pakke %s som gir %s venter på utløserbehandling.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pakke %s venter på utløserbehandling.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: setter også opp «%s» (krevet av «%s»)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pakke %s som gir %s er ikke satt opp enda.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pakke %s er ikke satt opp enda.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr "Pakken %s som gir %s er ikke installert.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr "Pakken %s er ikke installert.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) ødelegger %s og er %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) tilbyr %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versjonen av %s som skal settes opp er %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " krever "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ". Men:\n"
@@ -2970,40 +2970,40 @@ msgstr ". Men:\n"
msgid "(no description available)"
msgstr "(ingen beskrivelse tilgjengelig)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "får ikke tilgang til arkivet"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "klarte ikke sikre at «%.250s» ikke finnes"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"klarte ikke kjøre «dpkg-split» for å se om pakken er en del av en flerdelt "
"pakke"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "pakkefil satt sammen igjen"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Godkjenner %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "klarte ikke kjøre debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verifisering av pakka %s mislyktes!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3012,31 +3012,31 @@ msgstr ""
"Verifisering av pakka %s mislyktes,\n"
"men installerer likevel siden du ønsker det.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "godkjent\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "klarte ikke lage midlertidig katalognavn"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "klarte ikke kjøre «dpkg-deb» for å hente ut kontrollinformasjon"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Tatt vare på informasjon om %s fra %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "pakkearkitekturen (%s) passer ikke til systemet (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3045,101 +3045,101 @@ msgstr ""
"dpkg: Vedrørende %s som inneholder %s, problem med førkrav:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problem med førkrav - installerer ikke %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: Advarsel - ignorerer problem med førkrav.\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Gjør klar til å bytte ut %s %s (ved bruk av %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Pakker ut %s (fra %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "navnet på oppsettsfila (starter med «%.250s») er for langt (>%d tegn)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "lesefeil i %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "feil ved lukking av %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "feil ved åpning av %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Fjerner oppsettet av %s, slik at %s kan fjernes ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Fjerner oppsettet av %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Pakker ut erstatningen %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "klarte ikke kjøre «dpkg-deb» for å hente filsystemarkiv"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "feil ved lesing av tar-utdata fra dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: Fjern eventuelle avsluttande nuller"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: Advarsel - fant ikke den gamle fila «%.250s» så den slettes ikke: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: Advarsel - klarte ikke slette den gamle katalogen «%.250s»: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg:Advarsel - den gamle oppsettsfila «%.250s» var en tom katalog (og er nå "
"slettet)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "fant ikke annen ny fil «%.250s»"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3148,68 +3148,68 @@ msgstr ""
"dpkg: Advarsel - den gamle fila «%.250s» er den samme som flere nye filer! "
"(Både «%.250s» og «%.250s».)\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: Advarsel - klarte ikke slette den gamle fila «%.250s»: %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "klarte ikke lese infokatalogen"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"den gamle versjonen av pakken har et altfor langt filnavn som startar på "
"«%.250s»"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "klarte ikke fjerne den foreldede informasjonsfila «%.250s»"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "klarte ikke installere den (visstnok) nye informasjonsfila «%.250s»"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "klarte ikke åpne den midlertidige kontrollkatalogen"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pakken inneholder et altfor langt informasjonsfilnavn (starter med «%.50s»)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "pakkekontrollinformasjonen inneholder katalogen «%.250s»"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "pakkekontrollinformasjon, rmdir av «%.250s» sa ikke «ingen katalog»"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: Advarsel - pakken %s inneholder en liste som informasjonsfil"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "klarte ikke installere ny informasjonsfil «%.250s» som «%.250s»"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Legg merke til at %s er forsvunnet, og fullstendig erstattet.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "klarte ikke slette den forsvinnende kontrollinformasjonsfila «%.250s»"
@@ -3843,7 +3843,7 @@ msgstr "dpkg-trigger: ugyldig ventende pakkenavn «%.255s»: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: ugyldig utløsernavn «%.255s»: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3852,7 +3852,7 @@ msgstr ""
"%s: sirkel funnet under behandling av utløsere:\n"
" kjede av pakker med utløsere som er eller kan være ansvarlige:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3861,11 +3861,11 @@ msgstr ""
"\n"
" pakkers utestående utløsere som er eller kan være uløselige:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "utløsere i løkke, forlatt"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Behandler utløsere for %s ...\n"
diff --git a/po/ne.po b/po/ne.po
index 4aabbde33..8fee5edfe 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg_po_ne\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2007-08-05 17:41+0545\n"
"Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -1138,7 +1138,7 @@ msgstr "%.250s मा अनपेक्षित फाइलको समा
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "dpkg-deb पाइपबाट पढ्दा त्रुटि"
@@ -1152,12 +1152,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "`%.255s' को टाइमस्टाम्पहरू सेटिङ् गर्दा त्रुटि"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "`%.255s' को स्यामित्व सेट गर्दा त्रुटि"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "`%.255s'को सेटिङ् अनुमति त्रुटि"
@@ -1174,7 +1174,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1183,143 +1183,143 @@ msgstr ""
"`%.250s' अधिलेखन गर्न प्रयास गर्दै, जुन `%.250s'%.10s%.100s%.10s को फेरिएको संस्करण "
"हो ।"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"`%.250s' अधिलेखन गर्न प्रयास गर्दै, जुन `%.250s'%.10s%.100s%.10s को फेरिएको संस्करण "
"हो ।"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "`%.255s' (जुन मैले स्थापना गर्न लागेको थिए) लाई तोक्न अक्षम"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "अन्य संस्करण स्थापना गर्नुभन्दा पहिले `%.255s' वरिपरिको वातावरणहरू हटाउन अक्षम"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "अन्य संस्करण स्थापना गर्नु पहिले पूर्वावस्थामा ल्याएको `%.255s' तोक्न अक्षम"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "सङ्ग्रहले अज्ञात प्रकारको वस्तु `%.255s' समावेश गर्यो 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "पुरानो संस्करणमा फाइलहरू बदल्दै %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "स्थापना गरिएको प्याकेजमा फाइलहरू द्रारा प्रतिस्थापित गरियो %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "डाइरेक्टरी बिनाको प्याकेज`%.250s'मा डाइरेक्टरी %.250s अधावधिक गर्न प्रयास गर्दै"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "`%.250s'अधावधिक गर्न प्रयास गर्दै, जुन प्याकेज %.250s मा पनि छ"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "`%.255s'लाई (`%.255s'मा ) पढ्न असफल"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "dpkg-deb `%.255s' बेलामा ब्याकइन्ड"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "बन्द गर्दा/लेख्दा `%.255s' त्रुटि"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "पाइप `%.255s' सिर्जना गर्दा त्रुटि"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "यन्त्र `%.255s' सिर्जना गर्दा त्रुटि"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "हार्ड लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "प्रतिकात्मक लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "सिमलिङ्क `%.255s'को स्वामित्व सेट गर्दा त्रुटि"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "डाइरेक्टरी `%.255s' सिर्जना गर्दा त्रुटि"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "नयाँ संस्करण स्थापना गर्न `%.255s' लाई छेउमा सार्न अक्षम"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "लिङ्क`%.255s' पढ्न अक्षम"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "सिमलिङ्क `%.255s' का लागि जगेडा बनाउन अक्षम"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "सिमलिङ्क `%.255s' का लागि जगेडा स्वामित्व परिवर्तन गर्न अक्षम"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "नयाँ संस्करण स्थापना गर्न पहिले जगेडा लिङ्क`%.255s' बनाउन अक्षम"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "`%.255s' सिर्जना गर्न अक्षम"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "`%.255s' बफर बन्द गर्न अक्षम"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1328,7 +1328,7 @@ msgstr ""
"dpkg: चेतावनी - %s को हटाउने सँग निर्भरता समस्या अवज्ञा गर्दै:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1337,7 +1337,7 @@ msgstr ""
"dpkg: चेतावनी - अत्यावश्यक\n"
" प्याकेज %s को डिकन्फिगरेसन ध्यान दिदै , %sको हटाउने सक्षम पार्न ।\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1346,7 +1346,7 @@ msgstr ""
"dpkg: होइन, %s आवश्यक छैन, डिकन्फिगर गरिएको छैन\n"
"यो हटाउने %s को सक्षम गर्न क्रममा छ ।\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1355,28 +1355,28 @@ msgstr ""
"dpkg: होइन, %s हटाउन सक्दैन (--स्वत डिकन्फिगरले मद्दत गर्नेछ):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "%.250s मा त्रुटि पढ्नुहोस्"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: %sको पक्षमा %s हटाउन विचार गर्दै ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: हो, %s को पक्षमा %s हट्नेछ ।\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1385,39 +1385,39 @@ msgstr ""
"dpkg: %s समावेश गर्दै %s ध्यान दिदै:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: चेतावनी - अवज्ञा विच परस्पर-विरोध, जे भए पनि बढ्न सक्नुहुन्छ !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: %sको पक्षमा %s हटाउन विचार गर्दै ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s राम्रो सँग स्थापना गरिएको छैन - यसमा कुनै निर्भरताहरू अवज्ञा गर्दै ।\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: %s हटाउदा झन्झट हुन सक्छ, यसले यस रुपमा प्रदान गर्दछ %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1426,70 +1426,70 @@ msgstr ""
"dpkg: प्याकेज %s लाई पून स्थापना आवश्यक छ, तर जे भए पनि तपाईँको अनुरोध अनुसार हटाउनुछ "
"।\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: प्याकेज %s लाई पून स्थापना आवश्यक छ, हट्ने छैन\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "प्याकेज %s सँग धेरै द्वन्द्व/विस्थापन जोडी छन्"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: हो, %s को पक्षमा %s हट्नेछ ।\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "परस्पर-विरोधी प्याकेजहरू %.250s स्थापना नगर्दै"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: चेतावनी - अवज्ञा विच परस्पर-विरोध, जे भए पनि बढ्न सक्नुहुन्छ !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --कम्तिमा एक मार्ग तर्क पुनरावृती आवश्यक छ"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "पुनरावृतिको लागि कार्यन्वयन गर्न असफल"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "'फेला पार्नुहोस' को पाइप fdopen गर्न असफल"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "'फेला पार्नुहोस' को पाइप पढ्दा त्रुटि"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "'फेला पार्नुहोस' को पाइप बन्द गर्दा त्रुटि"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "पुनरावृतिका लागि 'फेला पार्नुहोस' ले ह्यान्डल नगरिएको त्रुटि %i फिर्ता गर्यो"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "खोजिएको, तर फेला नपारिएको प्याकेजहरू ( *.deb सँग मिल्ने फाइलहरू)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s लाई कम्तिमा एउटा प्याकेज सङ्ग्रह फाइल तर्क आवश्यक छ"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1500,33 +1500,33 @@ msgstr "--%s लाई कम्तिमा एउटा प्याकेज
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "पहिल्यै चयन हटाएको प्याकेज %s चयन गर्दै \n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "चयन हटाएको प्याकेज %s फड्काउदै\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "संस्करण %.250s of %.250s पहिल्यै स्थापित छ, फड्काउदै\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - चेतावनी: %.250s बाट %.250s सम्म %.250s स्तरन्युन गर्दैछ ।\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "%.250s बाट संस्करण %.250s सम्म %.250s स्तरन्युन हुने छैन, फड्काउदै ।\n"
@@ -2342,51 +2342,51 @@ msgstr "`%.250s' मा कार्यन्वयन अनुमतिहर
msgid "unable to setenv for maintainer script"
msgstr "vsnprintf मा सुरू गर्न अक्षम"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "पुरानो %s स्क्रिप्ट"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr " %s `%.250s' लाई stat गर्न अक्षम"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "नयाँ %s स्क्रिप्ट"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "पुरानो %s स्क्रिप्ट"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr " %s `%.250s' लाई stat गर्न अक्षम"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - साट्टोमा नयाँ प्याकेजबाट टाइपिङ्ग स्क्रिप्ट ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "त्यहाँ प्याकेजको नयाँ संस्करणमा स्क्रिप्ट छैन - छोड्दै"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... यो गएको OK जस्तो देखिन्छ ।\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "`%.255s' सिर्जना गर्न अक्षम"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "खाली गर्नका लागि rm कार्यान्वयन गर्न असफल"
@@ -2816,30 +2816,30 @@ msgstr "लाइनको समाप्ती पहिले %d अप्र
msgid "need an action option"
msgstr "एउटा कार्य विकल्प आवश्यक"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"तपाईँले प्याकेजहरू तिनिहरुकै नामहरू द्धारा निर्दृष्ट गर्नु पर्दछ, भित्र आउने ति फाइलहरुको नाम "
+"उद्धरण गरेर होइन"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s -विचाराधिनले कुनै विकल्प बिहिन तर्कहरू लिदैन"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s लाई कम्तिमा पनि एउटा प्याकेज नाम तर्क आवश्यक पर्दछ"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"तपाईँले प्याकेजहरू तिनिहरुकै नामहरू द्धारा निर्दृष्ट गर्नु पर्दछ, भित्र आउने ति फाइलहरुको नाम "
-"उद्धरण गरेर होइन"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "प्याकेज %sले एक पटक भन्दा बढि सूचीबद्ध गर्दछ, प्रक्रिया गर्ने मात्र एक पटक ।\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2848,7 +2848,7 @@ msgstr ""
"प्याकेज %s को एक भन्दा बढि प्रतिलिपिहरु चालमा \n"
" खोलिएका छन् ! एक पटक मात्र कन्फिगर गर्नुहोस्\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2857,76 +2857,76 @@ msgstr ""
"प्याकेज %.250s कन्फिगरका लागि तयार छैन\n"
"कन्फिगर गर्न सकिदैन (हालको स्थिति `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " प्याकेज %s जसले %s हटाउन सक्ने प्रदान गर्दछ ।\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " प्याकेज %s हटाइनु पर्दछ ।\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " %s को संस्करणमा प्रणाली %s हो ।\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " प्याकेज %s जसले %s हटाउन सक्ने प्रदान गर्दछ ।\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " प्याकेज %s हटाइनु पर्दछ ।\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: `%s' पनि कन्फिगर गर्दै (`%s'द्धारा आवश्यक)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " प्याकेज %s जसले %s प्रदान गर्दछ अहिले सम्म कन्फिगर गरिएको छैन ।\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " प्याकेज %s अहिले सम्म कन्फिगर गरिएको छैन ।\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " प्याकेज %s जसले %s प्रदान गर्दछ अहिले सम्म स्थापना गरिएको छैन ।\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " प्याकेज %s स्थापना गरिएको छैन ।\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s ले %.250s प्रदान गर्दछ र %s हो ।\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (उपप्रक्रिया): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %s को संस्करणमा प्रणाली %s हो ।\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " यसमा निर्भर गर्दछ "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; यद्यपी:\n"
@@ -2934,38 +2934,38 @@ msgstr "; यद्यपी:\n"
msgid "(no description available)"
msgstr "(कुनै वर्णन उपलब्ध छैन)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "सङ्ग्रहमा पहुँच गर्न सकिदैन"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "त्रुटि सुनिश्चित गर्ने `%.250s' अवस्थित छैन"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "यदि यसको एउटा मल्टिपार्टर हो भने dpkg-split कार्यान्वयन गर्न असफल "
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "पून एकत्रित गरिएको प्याकेजा फाइल"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "प्रमाणित गर्दैछ %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "debsig-रुजु गर्नुहोस्"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "प्याकेज %s मा रुजु असफल!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2974,31 +2974,31 @@ msgstr ""
"प्याकेज %sमा रुजु असफल,\n"
"तर जे भए पनि तपाईँको अनुरोधको रुपमा स्थापना गर्दैछ ।\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "पास गर्यो\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "अस्थायी डाइरेक्टरी नाम बनाउन असफल"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "नियन्त्रण सूचना झिक्नलाई dpkg-deb कार्यान्वयन गर्न असफल"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "%s बाट %s का बारेमा रेर्कड गरिएको सूचना ।\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "प्याकेज बनावट (%s) प्रणाली (%s)संग मेल खादैन"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3007,100 +3007,100 @@ msgstr ""
"dpkg: %s ध्यानदिदै %s समाहित, पूर्व-निर्भरता समस्या:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "पूर्न-निर्भरता समस्या - अझ %.250s स्थापना गरिदै छैन"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: चेतावनी - पूर्व-निर्भरता समस्या अवज्ञा गर्दैछ !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "प्रतिस्थापन गर्न तयारी %s %s (प्रयोग गर्दै %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "खोल्दै %s (बाट %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "कन्फफाइलको नाम (सुरु `%.250s') धेरै लामो छ (>%d क्यारेक्टरहरू)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250s मा त्रुटि पढ्नुहोस्"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "%.250s बन्द गर्दा त्रुटि"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "%.250s खोल्न प्रयास गर्दा त्रुटि"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "%s डि-कन्फीगर गर्नुहोस्, जसले हामिले %s हटाउन सक्छौ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "हटाउँदैछ %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "प्रतिस्थापन खोल्दै %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "फाइलप्रणाली सङ्ग्रह पाउन dpkg-deb कार्यान्वयन गर्न अक्षम"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "dpkg-deb टार निर्गत पढ्दा त्रुटि"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "दुषित फाइलप्रणाली टारफाइल - दुषित प्याकेज सङ्ग्रह"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: ज्यापले सम्भवत शुन्यहरू ट्रायल गर्दै"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg:चेतावनी - पुरानो फाइल `%.250s' गर्न सकेन त्यसैले यसलाई नमेट्दै: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: चेतावनी - पुरानो फाइल `%.250s' मेट्न अक्षम: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: चेतावनी - पुरानो कन्फफाइल `%.250s' एउटा रित्तो डाइरेक्टरी हो (र अहिले कसरि "
"मेटिदै छ)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3109,65 +3109,65 @@ msgstr ""
"dpkg: चेतावनी - पूरानो फाइल `%.250s' विभिन्न नयाँ फाइलसँग समान छ! (दुवै `%.250s' र "
"`%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: चेतावनी - पुरानो फाइल %s अक्षम `%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "सूचना डाइरेक्टरी पढ्न सक्दैन"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr " प्याकेजको पुरानो संस्करणसँग `%.250s'सँग सुरुआत अति-लामो सूचना फाइल नाम छ"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "अप्रचलित सूचना फाइल `%.250s हटाउन अक्षम"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "नयाँ सूचना फाइल स्थापन (मानेको) गर्न अक्षम`%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "अस्थायी नियन्त्रण डाइरेक्टरी खोल्न अक्षम"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "प्याकेजले अति धेरै लामो नियन्त्रण सूचना फाइलनाम (सुरू`%.50s') समावेश गर्दछ"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "प्याकेज नियन्त्रण सूचनाले`%.250s' डाइरेक्टरी समाहित गर्दछ"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "rmdir को `%.250s' प्याकेज नियन्त्रण सूचनाले dir होइन भन्दैन"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: चेतावनी - प्याकेज %s ले सूचना फाइलको रुपमा समाहित गर्दछ"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "नयाँ सूचना फाइल `%.250s' को रुपमा `%.250s' स्थापना गर्न अक्षम"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "( %s को केहिपनि हराएको छैन, ति सम्पुर्ण रुपमा प्रतिस्थापन गरिएको छ)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "अदृश्य नियन्त्रण सूचना फाइल `%.250s' मेट्न अक्षम"
@@ -3782,25 +3782,25 @@ msgstr "`%s' फाँट, अवैध प्याकेज नाम `%.255s'
msgid "invalid trigger name `%.250s': %.250s"
msgstr "`%s' फाँट, अवैध प्याकेज नाम `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr " %s ... का लागि कन्फिगरेसन फाइलहरू पर्जगर्दै\n"
diff --git a/po/nl.po b/po/nl.po
index b2764665d..80030acd8 100644
--- a/po/nl.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2007-05-10 16:19+0100\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -1145,7 +1145,7 @@ msgstr "onverwachts bestandseinde in %.250s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "fout bij het lezen uit de 'dpkg-deb'-pijp"
@@ -1159,12 +1159,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "fout bij het instellen van de tijd van `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "fout bij het instellen van de eigenaar van `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "fout bij het instellen van de permissies op `%.255s'"
@@ -1181,7 +1181,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1190,20 +1190,20 @@ msgstr ""
"poging tot overschrijven van `%.250s', wat een omgeleide versie is van `"
"%.250s'%.10s%.100s%.10s"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"poging tot overschrijven van `%.250s', wat een omgeleide versie is van `"
"%.250s'%.10s%.100s%.10s"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"kan de status van `%.255s' niet opvragen (die ik net wilde gaan installeren)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1212,29 +1212,29 @@ msgstr ""
"kan de rommel rond `%.255s' niet opruimen alvorens een nieuwe versie te "
"installeren"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"kan de status van de teruggezette `%.255s' niet opvragen voor de installatie "
"van een nieuwe versie"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "archief bevatte een object `%.255s' van het onbekende type 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Overschrijven van de bestanden in het oude pakket %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Vervangen door bestanden in genstalleerd pakket %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1243,100 +1243,100 @@ msgstr ""
"poging tot overschrijven van map `%.250s' in pakket %.250s met iets dat geen "
"map is"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "poging tot overschrijven van `%.250s', wat ook in pakket %.250s zit"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "kan niet `%.255s' niet lezen (in `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "fout in dpkg-deb tijdens `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "fout bij het sluiten van/schrijven naar `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "fout bij het aanmaken van de pijp `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "fout bij het aanmaken van het apparaatbestand `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "fout bij het maken van de vaste koppeling `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "fout bij het maken van de symbolische koppeling `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
"fout bij het instellen van de eigenaar van de symbolische koppeling `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "fout bij het maken van de map `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "kun `%.255s' niet opzij zetten om een nieuwe versie te installeren"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "kan koppeling niet lezen uit `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "kan geen reservekoppeling maken voor `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "kan de eigenaar van de reservekoppeling niet instellen voor `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"kan geen reservekoppeling van `%.255s' maken voor de installatie van de "
"nieuwe versie"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "kan de nieuwe versie van `%.255s' niet installeren"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "kan `%.255s' niet aanmaken"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "kan `%.255s' niet ontbufferen"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1346,7 +1346,7 @@ msgstr ""
"genegeerd:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1355,7 +1355,7 @@ msgstr ""
"dpkg: waarschuwing - deconfiguratie van het essentile\n"
" pakket %s wordt overwogen teneinde %s te kunnen verwijderen.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1364,7 +1364,7 @@ msgstr ""
"dpkg: nee, %s is essentiel en wordt dus niet gedeconfigureerd\n"
" om de verwijdering van %s mogelijk te maken.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1373,28 +1373,28 @@ msgstr ""
"dpkg: nee, %s kan niet verwijderd worden (--auto-deconfigure kan helpen):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "leesfout in %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "kan de nieuwe versie van `%.255s' niet installeren"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: verwijdering van %s ten gunste van %s wordt overwogen...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ja, %s wordt verwijderd ten gunste van %s.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1403,42 +1403,42 @@ msgstr ""
"dpkg: betreffende %s die %s bevat:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: verwijdering van %s ten gunste van %s wordt overwogen...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s is niet goed genstalleerd - vereisten worden genegeerd.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: mogelijk geeft het verwijderen van %s problemen, aangezien het %s "
"voorziet ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1447,73 +1447,73 @@ msgstr ""
"dpkg: pakket %s behoeft herinstallatie, op uw aanvraag wordt het toch "
"verwijderd.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: pakket %s behoeft herinstallatie, zal het niet verwijderen.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pakket %s heeft teveel 'Conflicts/Replaces'-paren"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ja, %s wordt verwijderd ten gunste van %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "conflicterende pakketten - %.250s wordt niet genstalleerd"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
"dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive heeft op zijn minst n pad-argument nodig"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "uitvoeren van 'find' voor --recursive is mislukt"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "het toepassen van fdopen op de pijp naar find is mislukt"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "fout bij het lezen van de pijp naar find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "fout bij het sluiten van de pijp naar find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find voor --recursive gaf onafgehandelde fout %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"er is gekeken, maar er zijn geen pakketten gevonden (bestanden die "
"overeenkomen met *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s heeft op zijn minst n pakket-bestandsnaam argument nodig"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1524,33 +1524,33 @@ msgstr "--%s heeft op zijn minst n pakket-bestandsnaam argument nodig"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Selecteren van voorheen niet geselecteerd pakket %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Overslaan van niet geselecteerd pakket %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versie %.250s van %.250s is reeds genstalleerd, wordt overgeslagen.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - let op: %.250s wordt gedegradeerd van %.250s naar %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2399,52 +2399,52 @@ msgstr "kan `%.250s' niet uitvoerbaar maken"
msgid "unable to setenv for maintainer script"
msgstr "kan geen status opvragen in vsnprintf"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "verouderd %s script"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "kan de status van %s `%.250s' niet opvragen"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nieuw %s script"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "verouderd %s script"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "kan de status van %s `%.250s' niet opvragen"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - script uit het nieuwe pakket wordt geprobeerd ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr ""
"er is geen script in de nieuwe versie van het pakket - er wordt opgegeven"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... het lijkt er op dat dat goed ging.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "kan `%.255s' niet aanmaken"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "kan rm niet uitvoeren om op te ruimen"
@@ -2873,30 +2873,30 @@ msgstr "onverwacht bestandseinde voor einde regel %d"
msgid "need an action option"
msgstr "heb een actie-optie nodig"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam "
+"van het bestand waar ze inzitten"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending accepteert geen niet-optie argumenten"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s heeft ten minste een pakketnaam argument nodig"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam "
-"van het bestand waar ze inzitten"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Pakket %s is meer dan eens gegeven, slechts een keer behandeld.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2905,7 +2905,7 @@ msgstr ""
"Meer dan een kopie van pakket %s is uitgepakt in deze ronde!\n"
" Wordt slechts een keer geconfigureerd.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2914,76 +2914,76 @@ msgstr ""
"pakket %.250s is niet gereed voor configuratie\n"
" kan het niet configureren (huidige status `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pakket %s dat voorziet in %s zal verwijderd worden.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pakket %s zal verwijderd worden.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Versie van %s op dit systeem is %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pakket %s dat voorziet in %s zal verwijderd worden.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pakket %s zal verwijderd worden.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: ook `%s' wordt geconfigureerd (vereist door `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pakket %s dat voorziet in %s is nog niet geconfigureerd.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pakket %s is nog niet geconfigureerd.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr "Pakket %s dat %s voorziet is niet genstalleerd.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pakket `%s' is niet genstalleerd.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s bevat %.250s en is %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (subproces): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versie van %s op dit systeem is %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " is afhankelijk van "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; maar:\n"
@@ -2991,40 +2991,40 @@ msgstr "; maar:\n"
msgid "(no description available)"
msgstr "(geen beschrijving beschikbaar)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "kan archief niet benaderen"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "fout bij verifiren dat `%.250s' niet bestaat"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"kan dpkg-split niet uitvoeren om te zien of het een onderdeel is van "
"meerdere delen"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "pakketbestand weer samengesteld"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Authenticeren van %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "uitvoeren van debsig-verify is mislukt"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verificatie van pakket %s is mislukt!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3033,31 +3033,31 @@ msgstr ""
"Verificatie van pakket %s is mislukt,\n"
"maar wordt toch genstalleerd zoals gevraagd.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "correct\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "aanmaken van een tijdelijke bestandsnaam is mislukt"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "kan dpkg-deb niet uitvoeren om besturingsinformatie te extraheren"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Informatie over %s uit %s is opgenomen.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "pakket-architectuur (%s) komt niet overeen met het systeem (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3066,103 +3066,103 @@ msgstr ""
"dpkg: voor-vereistenprobleem met %s dat %s bevat:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "voor-vereistenprobleem - %.250s wordt niet genstalleerd"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: waarschuwing - voorafhankelijkheisprobleem wordt genegeerd !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Voorbereiden om %s %s te vervangen (door %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Uitpakken van %s (uit %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"naam van configuratiebestand (beginnend met `%.250s') is te lang (>%d tekens)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "leesfout in %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "fout bij sluiten van %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "fout bij openen van %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "De-configureren van %s, zodat %s verwijderd kan worden ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "%s wordt verwijderd ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Uitpakken van vervangende %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "kan dpkg-deb niet uitvoeren om bestandssysteem-archief te krijgen"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "fout bij lezen van dpkg-deb tar uitvoer"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "beschadigd bestandssysteem tarbestand - beschadigd pakketarchief"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zap mogelijke nakomende nullen"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: waarschuwing - kan geen stat uitvoeren op het oude bestand `%.250s', "
"bijgevolg wordt dit niet verwijdert: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: waarschuwing - kan de oude map `%.250s' niet verwijderen: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: waarschuwing - oud configuratiebestand `%.250s' was een lege map (en "
"is nu verwijderd)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3171,68 +3171,68 @@ msgstr ""
"dpkg: waarschuwing - het oude bestand `%.250s' is hetzelfde als "
"verschillende nieuwe bestanden! ('%.250s' en '%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: waarschuwing - kan oud bestand `%%.250s' niet %s: %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "kan info map niet lezen"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"oude versie van pakket heeft te lange infobestandsnaam beginnend met `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "kan verouderd infobestand `%.250s' niet verwijderen"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "kan (waarschijnlijk) nieuwe infobestand `%.250s' niet installeren"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "kan tijdelijke besturingsmap niet openen"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"bestandsnaam van het 'control'-infobestand van dit pakket is te lang "
"(beginnend met `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "pakket 'control'-infobestand bevat map `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "rmdir van pakket besturingsinfo `%.250s' zei niet dat het geen map is"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: waarschuwing - pakket %s bevat een lijst als infobestand"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "kan nieuwe infobestand `%.250s' niet installeren als `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Verdwijning van %s is opgemerkt, het is totaal vervangen is.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "kan oude verdwijnende besturings infobestand `%.250s' niet verwijderen"
@@ -3854,25 +3854,25 @@ msgstr "`%s'-veld, ongeldige pakketnaam `%.255s': %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "`%s'-veld, ongeldige pakketnaam `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Wissen van configuratiebestanden voor %s ...\n"
diff --git a/po/nn.po b/po/nn.po
index 52d5ba825..baded1e7d 100644
--- a/po/nn.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2006-02-17 08:52+0200\n"
"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1152,7 +1152,7 @@ msgstr "uventa slutt på fil i %.250s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "feil ved lesing frå dpkg-deb-røyr"
@@ -1166,12 +1166,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "feil ved setjing av tidsmerke for «%.255s»"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "feil ved setjing av eigarskap for «%.255s»"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "feil ved setjing av filrettar for «%.255s»"
@@ -1188,7 +1188,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1197,19 +1197,19 @@ msgstr ""
"prøver å skriva over «%.250s», som er den omdirigerte versjonen av "
"«%.250s»%.10s%.100s%.10s"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"prøver å skriva over «%.250s», som er den omdirigerte versjonen av "
"«%.250s»%.10s%.100s%.10s"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "fann ikkje «%.255s» (som eg skulle til å installera)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1218,28 +1218,28 @@ msgstr ""
"klarte ikkje rydda opp i rotet rundt «%.255s» før ein annan versjon skulle "
"installerast"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"fann ikkje gjenoppretta «%.255s» før ein annan versjon skulle installerast"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arkivet inneheldt objektet «%.255s» med ukjend type 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Byter ut filer i den gamle pakken %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Bytta ut med filer i den installerte pakken %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1248,99 +1248,99 @@ msgstr ""
"prøver å skriva over katalogen «%.250s» i pakken %.250s med noko anna enn ein "
"katalog"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "prøver å skriva over «%.250s», som òg finst i pakken %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "klarte ikkje lesa «%.255s» (i «%.255s»)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "bakgrunnssystem dpkg-deb under «%.255s»"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "feil ved lukking/skriving av «%.255s»"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "feil ved oppretting av røyr «%.255s»"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "feil ved oppretting av eining «%.255s»"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "feil ved oppretting av hard lenkje «%.255s»"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "feil ved oppretting av symbolsk lenkje «%.255s»"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "feil ved setjing av eigarskap for den symbolske lenkja «%.255s»"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "feil ved oppretting av katalogen «%.255s»"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "klarte ikkje flytta «%.255s» for å installera ein ny versjon"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "klarte ikkje lesa lenkja «%.255s»"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "klarte ikkje endra eigarskapen til den symbolske lenkja «%.255s»"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"klarte ikkje laga sikringskopi av lenkja «%.255s» før ein ny versjon skulle "
"installerast"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "klarte ikkje installera ny versjon av «%.255s»"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "klarte ikkje oppretta «%.255s»"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "klarte ikkje lukka mellomlager for «%.255s»"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1349,7 +1349,7 @@ msgstr ""
"dpkg: Åtvaring - ignorerer kravproblem ved fjerning av %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1358,7 +1358,7 @@ msgstr ""
"dpkg: Åtvaring - vurderer fjerning av oppsett for den nødvendige\n"
" pakken %s for å kunna fjerna %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1367,7 +1367,7 @@ msgstr ""
"dpkg: Nei, %s er nødvendig. Vil ikkje fjerna oppsettet\n"
" for å kunna fjerna %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1376,28 +1376,28 @@ msgstr ""
"dpkg: Nei, kan ikkje fjerna %s (--auto-deconfigure kan hjelpa):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "lesefeil i %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "klarte ikkje installera ny versjon av «%.255s»"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: Vurderer å fjerna %s til fordel for %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: Ja, fjernar %s til fordel for %s.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1406,39 +1406,39 @@ msgstr ""
"dpkg: Knytt til %s, som inneheld %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: Vurderer å fjerna %s til fordel for %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s er ikkje skikkeleg installert - ignorerer pakkekrav.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: Kan få problem med å fjerna %s, sidan han tilbyr %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1447,70 +1447,70 @@ msgstr ""
"dpkg: Pakken %s krev installasjon på nytt, men vert fjerna likevel, sidan du "
"ønskjer det.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: Pakken %s krev installasjon på nytt, så han vert ikkje fjerna.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: Ja, fjernar %s til fordel for %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "pakkar i konflikt - installerer ikkje %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive treng minst éin stigparameter"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "klarte ikkje køyra «find» for --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "klarte ikkje utføra «fdopen» på find-røyret"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "klarte ikkje lesa find-røyret"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "klarte ikkje lukka find-røyret"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find for --recursive returnerte den uforutsette feilen %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "søkte, men fann ingen pakkar (filer med namn *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s treng minst éi pakkearkivfil som parameter"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1521,33 +1521,33 @@ msgstr "--%s treng minst éi pakkearkivfil som parameter"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Tek i bruk pakken %s (tidlegare ikkje i bruk).\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Hoppar over pakken %s. (Ikkje valt)\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versjon %.250s av %.250s er installert frå før, hoppar over.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - Åtvaring: Nedgraderer %.250s frå %.250s til %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2378,51 +2378,51 @@ msgstr "klarte ikkje setja køyreløyve på «%.250s»"
msgid "unable to setenv for maintainer script"
msgstr "klarte ikkje få status i vsnprintf"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "gammalt %s-skript"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "finn ikkje %s «%.250s»"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nytt %s-skript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "gammalt %s-skript"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "finn ikkje %s «%.250s»"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - prøver i staden eit skript frå den nye pakken ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "det finst ingen skript i den nye versjonen av pakken - gjev opp"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... det ser ut til at det gjekk fint.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "klarte ikkje oppretta «%.255s»"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "klarte ikkje køyra «rm» for opprydding"
@@ -2773,29 +2773,29 @@ msgstr "uventa slutt på fil før slutten av linje %d"
msgid "need an action option"
msgstr "treng eit handlingsval"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"du må gi sjølve namnet på pakkane, ikkje namna på filene som pakkane ligg i"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending tek ingen ikkje-valparametrar"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s treng minst eitt pakkenamn som parameter"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"du må gi sjølve namnet på pakkane, ikkje namna på filene som pakkane ligg i"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Pakken %s er nemnt fleire gonger, behandlar berre éin gong.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2804,7 +2804,7 @@ msgstr ""
"Fleire kopiar av pakken %s er pakka ut i denne\n"
" omgangen. Set berre opp éin gong.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2813,76 +2813,76 @@ msgstr ""
"pakken %.250s er ikkje klar for oppsett\n"
" kan ikkje setja opp (noverande status «%.250s»)"
-#: src/packages.c:307
+#: src/packages.c:323
#, fuzzy, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %.250s tilbyr %.250s, men skal fjernast.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, fuzzy, c-format
msgid " Package %s is to be removed.\n"
msgstr " %.250s vil verta fjerna.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr ""
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %.250s tilbyr %.250s, men skal fjernast.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %.250s vil verta fjerna.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: set òg opp «%s» (kravd av «%s»)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, fuzzy, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, fuzzy, c-format
msgid " Package %s is not configured yet.\n"
msgstr " er ikkje sett opp enno.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, fuzzy, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr "Pakken «%s» er ikkje installert.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, fuzzy, c-format
msgid " Package %s is not installed.\n"
msgstr "Pakken «%s» er ikkje installert.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s tilbyr %.250s og er %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (underprosess): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Oppsettet av %.250s vil verta fjerna.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " krev "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ". Men:\n"
@@ -2890,40 +2890,40 @@ msgstr ". Men:\n"
msgid "(no description available)"
msgstr "(inga skildring tilgjengeleg)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "får ikkje tilgang til arkivet"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "klarte ikkje sikra at «%.250s» ikkje finst"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"klarte ikkje køyra «dpkg-split» for å sjå om pakken er ein del av ein "
"fleirdelt pakke"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "pakkefil sett saman att"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Godkjenner %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "klarte ikkje køyra debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Stadfestinga av %s mislukkast."
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2932,31 +2932,31 @@ msgstr ""
"Stadfestinga av %s mislukkast,\n"
"men installerer likevel sidan du ønskjer det.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "godkjent\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "klarte ikkje laga mellombels katalognamn"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "klarte ikkje køyra «dpkg-deb» for å henta ut kontrollinformasjon"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Teke vare på informasjon om %s frå %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "pakkearkitekturen (%s) passar ikkje til systemet (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2965,100 +2965,100 @@ msgstr ""
"dpkg: Vedrørande %s som inneheld %s, problem med førkrav:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problem med førkrav - installerer ikkje %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: Åtvaring - ignorerer problem med førkrav.\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Gjer klar til å byta ut %s %s (ved bruk av %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Pakkar ut %s (frå %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "namnet på oppsettsfila (startar med «%.250s») er for langt (>%d teikn)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "lesefeil i %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "feil ved lukking av %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "feil ved opning av %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Fjernar oppsettet av %s, slik at %s kan fjernast ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "Fjernar %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Pakkar ut erstattinga %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "klarte ikkje køyra «dpkg-deb» for å henta filsystemarkiv"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "feil ved lesing av tar-utdata frå dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "øydelagd filsystem-tarfil - øydelagt pakkearkiv"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: Fjern eventuelle avsluttande nullar"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: %s: Åtvaring - oppsettsfila «%.250s» er inga vanleg fil eller symbolsk "
"lenkje (= «%s»)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, fuzzy, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3067,68 +3067,68 @@ msgstr ""
"dpkg: %s: Åtvaring - oppsettsfila «%.250s» er inga vanleg fil eller symbolsk "
"lenkje (= «%s»)\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "klarte ikkje lesa infokatalogen"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"den gamle versjonen av pakken har eit altfor langt filnamn som startar på "
"«%.250s»"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "klarte ikkje fjerna den forelda informasjonsfila «%.250s»"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "klarte ikkje installera den (visstnok) nye informasjonsfila «%.250s»"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "klarte ikkje opna den mellombelse kontrollkatalogen"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pakken inneheld eit altfor langt informasjonsfilnamn (startar med «%.50s»)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "pakkekontrollinformasjonen inneheld katalogen «%.250s»"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "pakkekontrollinformasjon, rmdir av «%.250s» sa ikkje «ingen katalog»"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: Åtvaring - pakken %s inneheld ei liste som informasjonsfil"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "klarte ikkje installera ny informasjonsfil «%.250s» som «%.250s»"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Legg merke til at %s er forsvunnen, og fullstendig erstatta.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "klarte ikkje sletta den forsvinnande kontrollinformasjonsfila «%.250s»"
@@ -3733,25 +3733,25 @@ msgstr "«%s»-felt, ugyldig pakkenamn «%.255s»: %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "«%s»-felt, ugyldig pakkenamn «%.255s»: %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Reinskar ut oppsettsfiler for %s ...\n"
diff --git a/po/pa.po b/po/pa.po
index d72b94798..12ff304b8 100644
--- a/po/pa.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -1126,7 +1126,7 @@ msgstr "%.250s ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr ""
@@ -1140,12 +1140,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr ""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr ""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr ""
@@ -1162,148 +1162,148 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr ""
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr ""
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr ""
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr ""
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr ""
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr ""
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr ""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr ""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr ""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr ""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr ""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr ""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr ""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr ""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr ""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr ""
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1312,87 +1312,87 @@ msgstr ""
"dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr ""
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr ""
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
"%s"
msgstr ""
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "%.250s ਪੜ੍ਹਨ 'ਚ ਗਲਤੀ"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr ""
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
"%s"
msgstr ""
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr ""
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1401,68 +1401,68 @@ msgstr ""
"ਪੈਕੇਜ %s ਦੀ ਜਾਂਚ ਫੇਲ੍ਹ ਹੋਈ\n"
"ਪਰ ਤੁਹਾਡੀ ਮੰਗ ਅਨੁਸਾਰ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr ""
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr ""
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr ""
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr ""
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr ""
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr ""
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr ""
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1473,33 +1473,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr ""
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr ""
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr ""
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2246,51 +2246,51 @@ msgstr ""
msgid "unable to setenv for maintainer script"
msgstr ""
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "ਪੁਰਾਣੀ %s ਸਕ੍ਰਿਪਟ"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr ""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "ਨਵੀਂ %s ਸਕ੍ਰਿਪਟ"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "ਪੁਰਾਣੀ %s ਸਕ੍ਰਿਪਟ"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr ""
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr ""
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr ""
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr ""
@@ -2679,111 +2679,111 @@ msgstr ""
msgid "need an action option"
msgstr ""
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr ""
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr ""
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "ਪੈਕੇਜ %s ਇੱਕ ਤੋਂ ਵੱਧ ਵਾਰ ਵੇਖਾਇਆ ਗਿਆ ਹੈ, ਪਰ ਕਾਰਵਾਈ ਅਧੀਨ ਇੱਕ ਵਾਰ ਹੀ ਆਏਗਾ।\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
" in this run ! Only configuring it once.\n"
msgstr ""
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
" (current status `%.250s' with no pending triggers)"
msgstr ""
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr ""
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr ""
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr ""
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " ਪੈਕੇਜ %s ਹਾਲੇ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr ""
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s %.250s ਦਿੰਦਾ ਹੈ ਅਤੇ %s ਹੈ\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %.250s %s ਹੈ।\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " ਨਿਰਭਰ ਹੈ "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; ਪਰ:\n"
@@ -2791,38 +2791,38 @@ msgstr "; ਪਰ:\n"
msgid "(no description available)"
msgstr "(ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr ""
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr ""
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "ਪੈਕੇਜ ਫਾਇਲ ਮੁੜ-ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr ""
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr ""
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "ਪੈਕੇਜ %s ਦੀ ਜਾਂਚ ਫੇਲ੍ਹ ਹੋਈ!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2831,196 +2831,196 @@ msgstr ""
"ਪੈਕੇਜ %s ਦੀ ਜਾਂਚ ਫੇਲ੍ਹ ਹੋਈ\n"
"ਪਰ ਤੁਹਾਡੀ ਮੰਗ ਅਨੁਸਾਰ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "ਪਾਸ ਹੋਇਆ\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr ""
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr ""
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr ""
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
"%s"
msgstr ""
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr ""
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr ""
"dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
"%s"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr ""
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr ""
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "%.250s ਪੜ੍ਹਨ 'ਚ ਗਲਤੀ"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr ""
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "%s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr ""
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr ""
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr ""
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr ""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr ""
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "ਜਾਣਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr ""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr ""
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr ""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "ਪੈਕੇਜ `%s' 'ਚ ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਹੈ (!)\n"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr ""
@@ -3597,25 +3597,25 @@ msgstr ""
msgid "invalid trigger name `%.250s': %.250s"
msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index c7715cc34..46d3da137 100644
--- a/po/pl.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-11-14 17:45+0100\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10-n-polish@lists.debian.org>\n"
@@ -1189,7 +1189,7 @@ msgstr "nieoczekiwany koniec pliku podczas czytania \"%.250s\""
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "nie można odczytać potoku z \"dpkg-deb\""
@@ -1203,12 +1203,12 @@ msgstr "pominięcie rozpakowania pliku \"%.255s\" (zastąpiony lub wyłączony?)
msgid "error setting timestamps of `%.255s'"
msgstr "nie można zaktualizować czasu modyfikacji dla \"%.255s\""
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "nie można zmienić właściciela \"%.255s\""
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "nie można zmienić uprawnień \"%.255s\""
@@ -1227,7 +1227,7 @@ msgstr ""
"nie można ustalić stanu (rozwiązać) proponowanego nowego celu dowiązania "
"symbolicznego \"%.250s\" dla dowiązania \"%.250s\""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1235,17 +1235,17 @@ msgid ""
msgstr ""
"próba nadpisania \"%.250s\", który jest ominięciem \"%.250s\" (pakiet %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "próba nadpisania \"%.250s\", który jest ominięciem \"%.250s\""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "nie można ustalić stanu \"%.255s\" (który miał być zainstalowany)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1254,29 +1254,29 @@ msgstr ""
"nie można wykonać porządkowania dla \"%.255s\" dopóki nie zostanie "
"zainstalowana inna jego wersja"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"nie można ustalić stanu odzyskanego \"%.255s\" dopóki nie zostanie "
"zainstalowana inna jego wersja"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "archiwum zawiera obiekt \"%.255s\" nieznanego typu 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Zastąpienie plików z poprzedniego pakietu %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Zastąpienie przez pliki z instalowanego pakietu %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1285,101 +1285,101 @@ msgstr ""
"próba nadpisania katalogu \"%.250s\" w pakiecie %.250s %.250s przez obiekt "
"nie będący katalogiem"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"próba nadpisania \"%.250s\", który istnieje także w pakiecie %.250s %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "nie można utworzyć \"%.255s\" (podczas przetwarzania \"%.255s\")"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "uruchomiony dpkg-deb podczas \"%.255s\""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "nie można zamknąć/zapisać \"%.255s\""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "nie można utworzyć potoku \"%.255s\""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "nie można utworzyć urządzenia \"%.255s\""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "nie można utworzyć dowiązania \"%.255s\""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "nie można utworzyć dowiązania symbolicznego \"%.255s\""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "nie można zmienić właściciela dowiązania symbolicznego \"%.255s\""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "nie można utworzyć katalogu \"%.255s\""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "nie można przenieść \"%.255s\", aby zainstalować nową wersję"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "nie można odczytać dowiązania \"%.255s\""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "nie można zrobić kopii dowiązania symbolicznego dla \"%.255s\""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"nie można zmienić właściciela kopii dowiązania symbolicznego dla \"%.255s\""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"nie można zrobić kopii dowiązania dla \"%.255s\" dopóki nie zostanie "
"zainstalowana inna jego wersja"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "nie można zainstalować nowej wersji \"%.255s\""
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "nie można utworzyć \"%.255s\""
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "nie można wykonać funkcji \"setvbuf\" dla \"%.255s\""
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1388,7 +1388,7 @@ msgstr ""
"zignorowanie problemu z zależnościami w %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1397,7 +1397,7 @@ msgstr ""
"rozważanie dekonfiguracji istotnego\n"
" pakietu %s, aby włączyć %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1406,7 +1406,7 @@ msgstr ""
"dpkg: niestety, %s jest istotnym pakietem, który nie zostanie\n"
" zdekonfigurowany, aby włączyć %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1416,17 +1416,17 @@ msgstr ""
"może pomóc):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "usuwanie %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalowanie %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1434,13 +1434,13 @@ msgstr ""
"dpkg: rozważanie dekonfiguracji %s, którego zależności zostałyby naruszone "
"przez %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
"dpkg: tak, %s zostanie zdekonfigurowany (naruszenie zależności przez %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1449,11 +1449,11 @@ msgstr ""
"dpkg: w odniesieniu do %s zawierającego %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "zignorowanie naruszenia zależności, dalsze przetwarzanie!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1462,31 +1462,31 @@ msgstr ""
"instalacja %.250s narusza zależności %.250s, a\n"
"nie pozwolono na dekonfigurację (--auto-deconfigure może pomóc)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
"instalacja %.250s wprowadzi niespełnione zależności w istniejącym "
"oprogramowaniu"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: rozważanie usunięcia %s w zamian za %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s nie jest poprawnie zainstalowany - ignorowanie zależności od niego.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: mogą wystąpić problemy przy usuwaniu %s, jako że dostarcza %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1495,69 +1495,69 @@ msgstr ""
"dpkg: pakiet %s wymaga ponownej instalacji, ale zostanie usunięty według "
"żądania.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: pakiet %s wymaga ponownej instalacji i nie zostanie usunięty.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pakiet %s ma zbyt wiele par Conflits/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: tak, %s zostanie usunięty w zamian za %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "konflikt pakietów - nie będzie instalowany %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "zignorowanie konfliktu, dalsze przetwarzanie!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive wymaga co najmniej jednego argumentu będącego ścieżką"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "nie można wykonać polecenia \"find\" dla --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "nie można utworzyć potoku dla \"find\""
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "nie można odczytać z potoku dla \"find\""
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "nie można zamknąć potoku dla \"find\""
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "wyszukiwanie --recursive zwróciło nieobsługiwany błąd %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "przeszukane, ale nie znaleziono żadnych pakietów (plików *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s wymaga co najmniej jednego argumentu będącego plikiem archiwum"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1568,33 +1568,33 @@ msgstr "--%s wymaga co najmniej jednego argumentu będącego plikiem archiwum"
msgid "<standard output>"
msgstr "<standardowe wyjście>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<standardowe wyjście błędów>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Zaznaczenie poprzednio niezaznaczonego pakietu %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Pominięcie niezaznaczonego pakietu %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Wersja %.250s pakietu %.250s jest już zainstalowana.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "zastąpienie %.250s w wersji %.250s wcześniejszą wersją %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2429,51 +2429,51 @@ msgstr "nie można ustawić praw do wykonywania \"%.250s\""
msgid "unable to setenv for maintainer script"
msgstr "błąd ustawiania zmiennych środowiska dla skryptu od opiekuna pakietu"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "zainstalowany skrypt %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "nie można ustalić stanu %s \"%.250s\""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nowy skrypt %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "poprzedni skrypt %s"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nie można ustalić stanu %s \"%.250s\": %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - próba wywołania skryptu z nowego pakietu ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "brak skryptu w nowej wersji pakietu - zaniechanie wywołania skryptu"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... najprawdopodobniej wywołanie skryptu powiodło się.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "nie można utworzyć \"%.255s\""
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "nie można wywołać \"rm\", aby wyczyścić katalog"
@@ -2904,31 +2904,31 @@ msgstr "niespodziewany EOF przed końcem linii %d"
msgid "need an action option"
msgstr "należy określić działanie"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"należy podać nazwę pakietu, a nie nazwę pliku, z którego został zainstalowany"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending wymaga niepodawania argumentów nie będących opcją"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s wymaga co najmniej jednej nazwy pakietu"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"należy podać nazwę pakietu, a nie nazwę pliku, z którego został zainstalowany"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"Pakiet %s jest wymieniony kilkukrotnie, ale zostanie przetworzony tylko "
"raz.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2937,7 +2937,7 @@ msgstr ""
"Rozpakowana została więcej niż jedna kopia pakietu %s\n"
" w tym przebiegu! Konfiguracja odbędzie się tylko dla jednej.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2946,76 +2946,76 @@ msgstr ""
"pakiet %.250s jest nie gotowy na przetwarzanie wyzwalaczy\n"
" (bieżący stan \"%.250s\", bez zaplanowanych wyzwalaczy)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pakiet %s dostarcza %s, ale jest przeznaczony do usunięcia.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pakiet %s jest przeznaczony do usunięcia.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Wersją %s w systemie jest %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pakiet %s dostarczający %s czeka na przetwarzanie wyzwalaczy.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pakiet %s oczekuje na przetwarzanie wyzwalaczy.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: konfiguracja także dla \"%s\" (wymagana przez \"%s\")\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pakiet %s dostarcza %s, ale nie został jeszcze skonfigurowany.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pakiet %s nie jest jeszcze skonfigurowany.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Pakiet %s dostarczający %s nie jest zainstalowany.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pakiet %s nie jest zainstalowany.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) narusza zależności %s i jest %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) dostarcza %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Wersją %s do skonfigurowania jest %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " zależy od "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; jednakże:\n"
@@ -3023,40 +3023,40 @@ msgstr "; jednakże:\n"
msgid "(no description available)"
msgstr "(brak dostępnego opisu)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "brak dostępu do archiwum"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "nie można usunąć \"%.250s\""
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"nie można wywołać \"dpkg-split\", aby upewnić się czy plik nie jest częścią "
"wieloczęściowego zestawu"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "przebudowanie pliku pakietu"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Sprawdzanie %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "nie można wykonać \"debsig-verify\""
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Sprawdzenie pakietu %s nie powiodło się!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3065,31 +3065,31 @@ msgstr ""
"Nie udało się sprawdzić pakietu %s,\n"
"ale zostanie zainstalowany według żądania\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "powiodło się\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "nie można utworzyć nazwy tymczasowego katalogu"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "nie można wywołać \"dpkg-deb\", aby pobrać plik kontrolny"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Zapisane informacje o %s z %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "architektura pakietu (%s) nie zgadza się z architekturą systemu (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3098,103 +3098,103 @@ msgstr ""
"dpkg: problem ze wstępnymi wymaganiami %s zawierającego %s:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problem ze wstępnymi wymaganiami - %.250s nie będzie instalowany"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "zignorowanie problemu ze wstępnymi wymaganiami!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Przygotowanie do zastąpienia %s %s (wykorzystując %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Rozpakowanie %s (z %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"nazwa pliku konfiguracyjnego (rozpoczynająca się od \"%.250s\") jest zbyt "
"długa (>%d znaków)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "nie można odczytać %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "nie można zamknąć %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "nie można otworzyć %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Dekonfigurowanie %s, tak żeby można było usunąć %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Dekonfigurowanie %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Rozpakowanie pakietu zastępującego %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "nie można wywołać \"dpkg-deb\", aby pobrać archiwum z plikami"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "nie można odczytać potoku z \"dpkg-deb\" zawierającego archiwum tar"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "uszkodzone archiwum tar - uszkodzone archiwum pakietu"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: usunięcie prawdopodobnych zer na końcu"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"nie można ustalić stanu poprzedniego pliku \"%.250s\", plik nie będzie "
"usuwany: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "nie można usunąć poprzedniego katalogu \"%.250s\": %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"poprzedni plik konfiguracyjny \"%.250s\" był pustym katalogiem (i właśnie "
"został usunięty)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "nie można ustalić stanu nowego pliku \"%.250s\""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3203,71 +3203,71 @@ msgstr ""
"stary plik \"%.250s\" jest taki sam, jak kilka nowych plików! (zarówno "
"\"%.250s, jak i \"%.250s\")"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "nie można %s poprzedniego pliku \"%.250s\": %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "nie można odczytać katalogu informacyjnego"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"poprzednia wersja pakietu ma plik informacyjny o zbyt długiej nazwie "
"rozpoczynającej się od \"%.250s\""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "nie można usunąć nieaktualnego pliku informacyjnego \"%.250s\""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "nie można zainstalować nowego pliku informacyjnego \"%.250s\""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "nie można otworzyć tymczasowego katalogu kontrolnego"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pakiet zawiera plik kontrolny o zbyt długiej nazwie (rozpoczynającej się od "
"\"%.50s\")"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "archiwum kontrolne pakietu zawiera katalog \"%.250s\""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"próba usunięcia katalogu \"%.250s\" nie wykazała, że to nie jest katalog"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "pakiet %s zawierał listę plików jako plik informacyjny"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr ""
"nie można zainstalować nowego pliku informacyjnego \"%.250s\" jako \"%.250s\""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Stwierdzono zniknięcie %s, który został zupełnie zastąpiony.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "nie można usunąć brakującego pliku kontrolnego \"%.250s\""
@@ -3904,7 +3904,7 @@ msgstr ""
msgid "invalid trigger name `%.250s': %.250s"
msgstr "niewłaściwa nazwa wyzwalacza \"%.250s\": %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3913,7 +3913,7 @@ msgstr ""
"%s: wykryto cykl podczas przetwarzania wyzwalaczy:\n"
" lista pakietów, których wyzwalacze mogły to spowodować:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3922,11 +3922,11 @@ msgstr ""
"\n"
" zaplanowanych wyzwalaczy, które są lub mogą być nierozwiązywalne:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "zapętlenie wyzwalaczy, przerywanie"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Przetwarzanie wyzwalaczy dla %s...\n"
diff --git a/po/pt.po b/po/pt.po
index 559fed553..ece6a6488 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.14\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-02-03 00:40+0200\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1177,7 +1177,7 @@ msgstr "fim de ficheiro inesperado ao ler `%.250s'"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "erro ao ler do pipe dpkg-deb"
@@ -1191,12 +1191,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "erro ao definir timestamps de `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "erro ao definir dono de `%255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "erro ao definir permissões de `%.255s'"
@@ -1217,7 +1217,7 @@ msgstr ""
"falhou o fazer stat (anular referência) proposto novo alvo para a ligação "
"simbólica `%.250s' para a ligação simbólica `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1226,17 +1226,17 @@ msgstr ""
"a tentar sobre-escrever `%.250s', que é a versão divergida de `%"
"250s' (pacote: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "a tentar sobre-escrever %.250s', que é a versão divergida de `%250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "não foi possível fazer stat a `%.255s' (que eu ía instalar)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1245,29 +1245,29 @@ msgstr ""
"não foi possível efectuar uma limpeza à volta de `%.255s' antes de instalar "
"outra versão"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"não foi possível fazer stat ao recuperado `%.255s' antes de instalar outra "
"versão"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arquivo continha objecto `%.255s' de tipo desconhecido 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "A substituir ficheiros no pacote antigo %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Substituído por ficheiros no pacote instalado %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1276,99 +1276,99 @@ msgstr ""
"a tentar sobre-escrever o directório `%.250s' no pacote %.250s com um não "
"directório"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "a tentar sobre-escrever `%.250s', que também está no pacote %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "falhou ler `%.255s' (em `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "backend dpkg-deb durante `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "erro ao fechar/escrever `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "erro ao criar pipe `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "erro ao criar dispositivo `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "erro ao criar hard link `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "erro ao criar link simbólico `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "erro ao definir dono do link simbólico `%255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "erro ao criar o directório `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "não foi possível mover `%.255s' para instalar a nova versão"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "não foi possível ler link `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "não foi possível criar backup do link simbólico para `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "não foi possível fazer chown a backup do link simbólico para `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"não foi possível fazer backup link de `%.255s' antes de instalar a nova "
"versão"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "não foi possível instalar nova versão de `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "não foi possível criar `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "não foi possível retirar `%.255s' do buffer"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1377,7 +1377,7 @@ msgstr ""
"dpkg: aviso - a ignorar problema de dependências com %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1386,7 +1386,7 @@ msgstr ""
"dpkg: aviso - a considerar a desconfiguração do pacote essencial\n"
"%s, para permitir %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1395,7 +1395,7 @@ msgstr ""
"dpkg: não, %s é essencial, não irá desconfigurar\n"
" de modo a permitir %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1404,29 +1404,29 @@ msgstr ""
"dpkg: não, não pode proceder com %s (--auto-deconfigure irá ajudar):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "remoção de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalação de %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: a considerar a desconfiguração de %s, que seria estragada por %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: sim, irá desconfigurar %s (estragado por %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1435,12 +1435,12 @@ msgstr ""
"dpkg: acerca de %s contendo %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: aviso - a ignorar problema, pode proceder de qualquer modo !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1449,29 +1449,29 @@ msgstr ""
"instalar %.250s irá estragar %.250s, e\n"
"não é permitida a desconfiguração (--auto-deconfigure poderá ajudar)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "instalar %.250s irá estragar software existente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: a considerar remover %s em favorecimento de %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s não está instalado convenientemente - a ignorar quaisquer dependências "
"nele.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: pode ter problemas ao remover %s, como disponibiliza %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1480,71 +1480,71 @@ msgstr ""
"dpkg: o pacote %s necessita de reinstalação, mas vai ser removido de "
"qualquer modo conforme pediu.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: o pacote %s necessita de reinstalação, não irá remover.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "o pacote %s tem demasiados pares de Conflicts/Replaces"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: sim, irá remover %s em favorecimento de %s,\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "pacotes em conflito - não irá instalar %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: aviso - a ignorar conflito, pode proceder de qualquer modo !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive necessita de pelo menos um argumento de path"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "falhou executar find para --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "falhou fdopen ao pipe de find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "erro na leitura do pipe de find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "erro ao fechar o pipe de find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "a procura de --recursive retornou um erro %i não tratado"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "procurou, mas não encontrou pacotes (ficheiros coincidindo com *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
"--%s necessita pelo menos de um argumento de ficheiro de arquivo de pacote"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1555,33 +1555,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "A seleccionar pacote anteriormente não seleccionado %s\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "A passar à frente do pacote não seleccionado %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versão %.250s de %.250s já está instalado, passando à frente,\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - aviso: downgrade de %.250s de %.250s para %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2441,51 +2441,51 @@ msgstr "não foi possivel definir permissões de execução em `%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "não foi possível fazer setenv para o maint script"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "script %s antigo"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "não foi possível o stat a %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "novo script %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "script %s antigo"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "não foi possível o stat a %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - em vez disso a tentar script do novo pacote ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "não existe script na nova versão do pacote - a desistir"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... parece que tudo correu bem.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "não foi possível criar `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "falhou executar rm para limpeza"
@@ -2921,30 +2921,30 @@ msgstr "eof inesperado antes do fim da linha %d"
msgid "need an action option"
msgstr "é necessária uma opção de acção"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"tem de especificar pacotes pelos seus próprios nomes, não por transcrever os "
+"nomes dos ficheiros em que eles vêm"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending não leva quaisquer argumentos não-opção"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s necessita de pelo menos um argumento de nome de pacote"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"tem de especificar pacotes pelos seus próprios nomes, não por transcrever os "
-"nomes dos ficheiros em que eles vêm"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Pacote %s listado mais de uma vez, apenas processando uma vez.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2953,7 +2953,7 @@ msgstr ""
"Foi descompactada mais que uma cópia do pacote %s\n"
" nesta execução ! Apenas configurando uma vez.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2962,77 +2962,77 @@ msgstr ""
"o pacote %.250s não está pronto para processamento de trigger\n"
" (estado actual `%.250s' sem triggers pendentes)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " O pacote %s que disponibiliza %s vai ser removido.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " O pacote %s vai ser removido.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " A versão de %s no sistema é %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" O pacote %s que disponibiliza %s aguarda pelo processamento de trigger..\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " O pacote %s aguarda pelo processamento de trigger.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: também a configurar `%s' (necessário por `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " O pacote %s que disponibiliza %s ainda não está configurado.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " O pacote %s ainda não está configurado.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " O pacote %s que disponibiliza %s não está instalado.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " O pacote %s não está instalado.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) estraga %s e é %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) disponibiliza %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " A versão de %s a ser configurada é %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depende de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; no entanto:\n"
@@ -3040,39 +3040,39 @@ msgstr "; no entanto:\n"
msgid "(no description available)"
msgstr "(sem descrição disponível)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "não pode aceder ao arquivo"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "erro ao assegurar que `%.250s' não existe"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"falhou executar dpkg-split para verificar se é um arquivo dividido em partes"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "ficheiro de pacote re-montado"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "A autenticar %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "falhou o execl debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "A verificação do pacote %s falhou!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3081,31 +3081,31 @@ msgstr ""
"A Verificação do pacote %s falhou,\n"
"mas a instalar à mesma conforme você pediu.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "passou\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "falhou criar nome de directório temporário"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "falhou executar dpkg-deb para extrair a informaçção de controle"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Foi gravada informação sobre %s desde %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "a arquitectura do pacote (%s) não coincide com a do sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3114,108 +3114,108 @@ msgstr ""
"dpkg: acerca de %s contendo %s, problema de pre-dependência:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema de pré-dependência - a não instalar %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: aviso - a ignorar problema de pré-dependência !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "A preparar para substituir %s %s (a usar %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "A descompactar %s (desde %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"nome do ficheiro de configuração (começando `%.250s') é demasiado comprido (>"
"%d caracteres)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "erro de leitura em %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "erro a fechar %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "erro ao tentar abrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "A desconfigurar %s, para permitir a remoção de %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "A desconfigurar %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "A descompactar substituto %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"não foi possível executar o dpkg-deb para obter um arquivo do sistemade "
"ficheiros."
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "erro ao ler a saída do tar de dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
"sistema de ficheiros do ficheiro tar corrompido - arquivo de pacote "
"corrompido"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zap possível rasto de zeros"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: aviso - não foi possível fazer stat ao ficheiro antigo `%.250s' por "
"isso não será apagado: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: aviso - não foi possível apagar o ficheiro antigo `%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: aviso - ficheiro de configuração antigo `%.250s' era um directório "
"vazio (e agora foi apagado)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "Não foi possível fazer stat a outro novo ficheiro `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3224,70 +3224,70 @@ msgstr ""
"dpkg: aviso - o ficheiro antigo `%.250s' é o mesmo que vários novos "
"ficheiros! (ambos `%.250s' e `%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: aviso - não foi possível %s o ficheiro antigo `%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "não pode ler directório info"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"a antiga versão do pacote tem um nome de ficheiro demasiado comprido "
"começando por `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "não foi possível remover o ficheiro de info obsoleto `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "não foi possível instalar (o suposto) novo ficheiro info `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "não foi possível abrir o directório temporário de controle"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"o pacote contém um ficheiro de info de control com o nome de ficheiro "
"demasiado comprido (começando por `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "a informação de controle do pacote contém o directório `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"rmdir de info de controle do pacote `%.250s' não disse que não era um dir"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: aviso - o pacote %s continha lista como ficheiro info"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "não foi possível instalar o novo ficheiro info `%.250s' como `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(A notar o desaparecimento de %s, que foi totalmente substituído.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "não é possível apagar ficheiro de controle info desaparecido `%.250s'"
@@ -3930,7 +3930,7 @@ msgstr "dpkg-trigger: nome `%.250s' ilegal de pacote esperado: %-250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: nome `%.250s' de 'trigger' inválido: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3939,7 +3939,7 @@ msgstr ""
"%s: foi encontrado um ciclo ao processar os triggers:\n"
" a cadeia de pacotes desses triggers são ou poderão ser responsáveis:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3948,11 +3948,11 @@ msgstr ""
"\n"
" 'triggers' pendentes de pacotes que são ou poderão ser não solucionados:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "triggers em loop, abandonado"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "A processar 'triggers' para %s ...\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cccfc2809..ddd3d7b23 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.13\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-11-17 01:55-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -1178,7 +1178,7 @@ msgstr "fim de arquivo inesperado lendo '%.250s'"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "erro lendo do \"pipe\" dpkg-deb"
@@ -1192,12 +1192,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "erro estabelecendo registros de data de '%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "erro estabelecendo posse de '%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "erro estabelecendo permissões de '%.255s'"
@@ -1218,7 +1218,7 @@ msgstr ""
"falhou ao executar \"stat\" (\"dereference\") no novo alvo de ligação "
"simbólica proposto '%.250s' para ligação simbólica '%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1227,18 +1227,18 @@ msgstr ""
"tentando sobrescrever '%.250s', que é a versão desviada de '%.250s' (pacote: "
"%.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "tentando sobrescrever '%.250s', que é a versão desviada de '%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"impossível executar \"stat\" de '%.255s' (que eu estava prestes a instalar)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1247,29 +1247,29 @@ msgstr ""
"impossível limpar a sujeira em torno de '%.255s' antes de instalar outra "
"versão"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"impossível executar \"stat\"'%.255s' restaurado antes de instalar outra "
"versão"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arquivo continha objeto '%.255s' de tipo desconhecido 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Substituindo arquivos no pacote antigo %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Substituídos por arquivos no pacote instalado %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1277,100 +1277,100 @@ msgid ""
msgstr ""
"tentando sobrescrever diretório '%.250s' no pacote %.250s com não-diretório"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "tentando sobrescrever '%.250s', que também está no pacote %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "falhou ao ler '%.255s' (em '%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "mecanismo dpkg-deb durante '%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "erro fechando/escrevendo '%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "erro criando pipe '%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "erro criando dispositivo '%.255s'"
# NOTA: "hard link" = "link fixo" segundo a tradução do próprio `ln' - Carlos
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "erro criando ligação fixa (\"hard link\") '%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "erro criando ligação simbólica '%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "erro estabelecendo posse da ligação simbólica '%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "erro criando diretório '%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "impossível mover do caminho '%.255s' para instalar nova versão"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "impossível ler ligação '%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "impossível criar ligação simbólica de backup para '%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"impossível executar \"chown\" da ligação simbólica de backup para '%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"impossível criar ligação de backup de '%.255s' antes de instalar nova versão"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "impossível instalar nova versão de '%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "impossível criar '%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "impossível retirar '%.255s' do buffer"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1379,7 +1379,7 @@ msgstr ""
"dpkg: aviso - ignorando problema de dependência com %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1388,7 +1388,7 @@ msgstr ""
"dpkg: aviso - considerando desconfiguração do pacote essencial\n"
" %s, para habilitar %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1397,7 +1397,7 @@ msgstr ""
"dpkg: não, %s é essencial, não vou desconfigurá-lo\n"
" para habilitar %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1406,29 +1406,29 @@ msgstr ""
"dpkg: não, não posso continuar com %s (--auto-deconfigure ajudará):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "remoção de %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalação de %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: considerando desconfiguração de %s, que seria quebrado por %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: sim, vou desconfigurar %s (quebrado por %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1437,12 +1437,12 @@ msgstr ""
"dpkg: sobre %s contendo %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: aviso - ignorando quebra, posso continuar de qualquer modo!\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1451,27 +1451,27 @@ msgstr ""
"instalando %.250s quebrará %.250s, e\n"
" a desconfiguração não é permitida (--auto-deconfigure poderá ajudar)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "instalar %.250s quebrará software existente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: considerando remoção de %s em favor de %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s não está instalado corretamente - ignorando dependências a ele.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: pode haver problemas removendo %s, já que ele oferece %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1480,70 +1480,70 @@ msgstr ""
"dpkg: pacote %s precisa de reinstalação, mas vou removê-lo assim mesmo como "
"você pediu.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: pacote %s precisa de reinstalação, não vou removê-lo.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pacote %s possui muitos pares Conflita/Substitui"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: sim, vou remover %s em favor de %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "pacotes conflitantes - não instalando %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: aviso - ignorando conflito, posso continuar de qualquer modo!\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive precisa de ao menos um caminho como argumento"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "falhou ao executar find para --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "falhou ao executar \"fdopen\" no \"pipe\" do find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "erro lendo o \"pipe\" do find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "erro fechando o \"pipe\" do find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "procura por --recursive retornou erro não manipulado %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "procurei, mas não achei pacotes (arquivos casando com *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s precisa de ao menos um arquivo de pacote como argumento"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1554,33 +1554,33 @@ msgstr "--%s precisa de ao menos um arquivo de pacote como argumento"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Selecionando pacote previamente não selecionado %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Ignorando pacote não selecionado %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versão %.250s de %.250s já instalada, ignorando.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - aviso: revertendo %.250s de %.250s para %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "Não vou reverter %.250s da versão %.250s para %.250s, ignorando.\n"
@@ -2433,51 +2433,51 @@ msgstr "impossível definir permissões de execução em '%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "impossível executar \"setenv\" para script de mantenedor"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "antigo script %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "impossível executar \"stat\" em %s '%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "novo script %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "antigo script %s"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "impossível executar \"stat\" em %s '%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - tentando script do novo pacote em vez disso ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "não há script na nova versão do pacote - desistindo"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... parece que acabou tudo OK.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "impossível criar '%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "falhou ao executar rm para limpeza"
@@ -2916,30 +2916,30 @@ msgstr "fim de arquivo inesperado após fim da linha %d"
msgid "need an action option"
msgstr "necessário uma opção de ação"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"você deve especificar pacotes com seus próprios nomes, não pela citação dos "
+"nomes dos arquivos nos quais eles vêm"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending não aceita argumento que não seja opção"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s precisa de pelo menos um nome de pacote como argumento"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"você deve especificar pacotes com seus próprios nomes, não pela citação dos "
-"nomes dos arquivos nos quais eles vêm"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Pacote %s listado mais de uma vez, processando somente uma vez.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2948,7 +2948,7 @@ msgstr ""
"Mais de uma cópia do pacote %s foi desempacotada\n"
" nesta execução! Configurando-o somente uma vez.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2957,76 +2957,76 @@ msgstr ""
"pacote %.250s não está pronto para processamento de gatilho\n"
" (estado atual '%.250s' sem gatilhos pendentes)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pacote %s, o qual fornece %s está para ser removido.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pacote %s está para ser removido.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Versão de %s no sistema é %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Pacote %s, o qual fornece %s aguarda processamento de gatilho.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pacote %s aguarda processamento de gatilho.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: também configurando '%s' (necessário para '%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pacote %s, o qual fornece %s ainda não está configurado.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pacote %s não está configurado ainda.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Pacote %s, o qual fornece %s não está instalado.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pacote %s não está instalado.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) quebra %s e é %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) fornece %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versão de %s a ser configurada é %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depende de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; porém:\n"
@@ -3034,40 +3034,40 @@ msgstr "; porém:\n"
msgid "(no description available)"
msgstr "(nenhuma descrição disponível)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "impossível acessar arquivo"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "erro ao se certificar que '%.250s' não existe"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"falhou ao executar dpkg-split para ver se é parte de um arquivo em múltiplas "
"partes"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "arquivo de pacote remontado"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autenticando %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "falhou ao executar debsign-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verificação no pacote %s falhou!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3076,31 +3076,31 @@ msgstr ""
"Verificação no pacote %s falhou,\n"
"mas o instalarei de qualquer forma como você requisitou.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "passou\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "falhou ao criar nome de diretório temporário"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "falhou ao executar dpkg-deb para extrair informação de controle"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Informação registrada sobre %s a partir de %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "arquitetura do pacote (%s) não combina com a do sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3109,106 +3109,106 @@ msgstr ""
"dpkg: quanto a %s, contendo %s, problema de pré-dependência:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problema de pré-dependência - %.250s não será instalado"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: aviso - ignorando problema de pré-dependência!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Preparando para substituir %s %s (usando %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Desempacotando %s (de %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"nome do arquivo de configuração (começando '%.250s') é muito longo (>%d "
"caracteres)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "erro de leitura em %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "erro fechando %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "erro tentando abrir %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Desconfigurando %s, para permitir a remoção de %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Desconfigurando %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Desempacotando substituto %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"impossível executar dpkg-deb para obter um arquivo do sistema de arquivos"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "erro lendo a saída do tar do dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
"arquivo tar do sistema de arquivos corrompido - arquivo de pacote corrompido"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zap possivelmente com zeros no final"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: aviso - não foi possível executar \"stat\" em arquivo antigo '%.250s' "
"portanto não excluindo o mesmo: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: aviso - impossível excluir diretório antigo '%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: aviso - arquivo de configuração antigo '%.250s' era um diretório vazio "
"(e foi excluído)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "impossível executar \"fstat\" em outro arquivo novo '%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3217,72 +3217,72 @@ msgstr ""
"dpkg: aviso - arquivo antigo '%.250s' é o mesmo que diversos arquivos novos! "
"(ambos '%.250s' e '%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: aviso - impossível %s arquivo antigo '%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "não foi possível ler diretório info"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"versão antiga do pacote possui nome de arquivo info demasiadamente longo "
"iniciando '%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "impossível remover arquivo info obsoleto '%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "impossível instalar arquivo info (supostamente) novo '%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "impossível abrir diretório de controle temporário"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pacote contém nome de arquivo de controle demasiadamente longo (iniciando "
"'%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "informação de controle do pacote continha diretório '%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"remoção do diretório de informação de controle do pacote '%.250s' não disse "
"que não se tratava de um diretório"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: aviso - pacote %s continha lista como arquivo info"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "impossível instalar novo arquivo info '%.250s' como '%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr ""
"(Percebendo desaparecimento de %s, que foi completamente substituído).\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "impossível excluir arquivo info de controle desaparecendo '%.250s'"
@@ -3925,7 +3925,7 @@ msgstr "dpkg-trigger: nome de pacote em espera ilegal '%.250s': %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: nome de gatilho inválido '%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3934,7 +3934,7 @@ msgstr ""
"%s: ciclo encontrado durante o processamento dos gatilhos:\n"
" cadeia de pacotes cujos gatilhos são ou podem ser responsáveis:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3943,11 +3943,11 @@ msgstr ""
"\n"
" gatilhos dos pacotes pendentes que são ou podem ser insolúveis:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "gatilhos em \"loop\", abandonado"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Processando gatilhos para %s ...\n"
diff --git a/po/ro.po b/po/ro.po
index 62b91d16a..294903097 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-02-03 00:42+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -1211,7 +1211,7 @@ msgstr "sfârșit de fișier neașteptat la citirea lui „%.250s”"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "eroare la citirea din fluxul de date al lui dpkg-deb"
@@ -1225,12 +1225,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "eroare la setarea momentului actualizării lui „%.255s”"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "eroare la setarea apartenenței pentru „%.255s”"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "eroare la setarea permisiunilor pentru „%.255s”"
@@ -1249,7 +1249,7 @@ msgstr ""
"eșec la stat (dereferire) pentru ținta legăturii simbolice nou propuse "
"„%.250s” pentru legătura simbolică „%.250s”"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1258,19 +1258,19 @@ msgstr ""
"se încearcă suprascrierea lui „%.250s”, care este o versiune redirectată a "
"lui „%.250s” (pachetul: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"se încearcă suprascrierea lui „%.250s”, care este versiunea redirectată a "
"lui „%.250s”"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "imposibil a citi starea lui „%.255s” (care urma să fie instalat)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1279,29 +1279,29 @@ msgstr ""
"imposibil a curăța mizeria din jurul lui „%.255s” înainte de a instala altă "
"versiune"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"imposibil a citi starea copiei restaurate a lui „%.255s” înaintea instalării "
"altei versiuni"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arhiva conține obiectul „%.255s” de tip necunoscut 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Se înlocuiesc fișierele în pachetul vechi %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Înlocuite de fișierele din pachetul instalat %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1310,32 +1310,32 @@ msgstr ""
"încercare de suprascriere a directorului „%.250s” în pachetul %.250s cu ceva "
"care nu este director"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "încercare de suprascriere a „%.250s”, care este și în pachetul %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "eșec la citirea lui „%.255s” (în „%.255s”)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "dpkg-deb este împins în fundal în timpul „%.255s”"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "eroare în timpul închiderii/scrierii „%.255s”"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "eroare la crearea conexiunii „%.255s”"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "eroare la crearea dispozitivului „%.255s”"
@@ -1343,72 +1343,72 @@ msgstr "eroare la crearea dispozitivului „%.255s”"
# hard link este un alt nume pentru un target și spre
# deosebire de symbolic link, target obligatoriu trebuie
# să existe
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "eroare la crearea legăturii fizice „%.255s”"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "eroare la crearea legăturii simbolice „%.255s”"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "eroare la setarea apartenenței legăturii simbolice „%.255s”"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "eroare la crearea directorului „%.255s”"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "imposibil a îndepărta „%.255s” pentru instalarea noii versiuni"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "imposibil a citi legătura „%.255s”"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr ""
"imposibil a crea o copie de siguranță a legăturii simbolice pentru „%.255s”"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"nu se poate schimba apartenența copiei de siguranță a legăturii simbolice "
"pentru „%.255s”"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"imposibil a face o copie de siguranță a legăturii lui „%.255s” înainte de "
"instalarea noii versiuni"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "imposibil a instala noua versiune a lui „%.255s”"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "imposibil a crea „%.255s”"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "incapacitate de a renunța la memoria tampon „%.255s”"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1417,7 +1417,7 @@ msgstr ""
"dpkg: avertisment - se ignoră problema de dependență cu %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1426,7 +1426,7 @@ msgstr ""
"dpkg: avertisment - se ia în considerare deconfigurarea \n"
"pachetului esențial %s, pentru a permite %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1435,7 +1435,7 @@ msgstr ""
"dpkg: nu, %s este esențial, nu va fi deconfigurat\n"
"pentru a permite %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1444,17 +1444,17 @@ msgstr ""
"dpkg: nu, nu se poate purcede la %s (--auto-deconfigure vă va ajuta):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "ștergerea lui %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "instalarea lui „%.255s”"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1462,12 +1462,12 @@ msgstr ""
"dpkg: se ia în considerare deconfigurarea lui %s care va fi corupt de %"
"s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: da, se va deconfigura %s (corupt de %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1476,13 +1476,13 @@ msgstr ""
"dpkg: cu privire la %s conținând %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: avertisment - se ignoră coruperea, este permisă oricum continuarea!\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1491,27 +1491,27 @@ msgstr ""
"instalarea lui %.250s ar duce la coruperea lui %.250s, iar\n"
" deconfigurarea nu este permisă (--auto-deconfigure ar putea fi de ajutor)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "instalarea lui %.250s ar duce la coruperea programelor existente"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: se ia în considerare ștergerea lui %s în favoarea lui %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s nu este corect instalat - ignor orice dependență la el.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: puteți avea probleme eliminând %s, deoarece furnizează %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1520,72 +1520,72 @@ msgstr ""
"dpkg: pachetul %s necesită reinstalare, dar va fi oricum șters, așa cum "
"doriți.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: pachetul %s necesită reinstalare, nu va fi înlăturat.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "pachetul %s are prea multe perechi „În conflict cu/Înlocuiește”"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: da, va fi șters %s în favoarea lui %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "conflict între pachete - nu se instalează %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
"dpkg: avertisment - conflict ignorat, este permisă oricum continuarea!\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive necesită cel puțin o cale ca argument"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "eșec la execuția lui find pentru --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "eșec la fdopen pentru conexiunea cu find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "eroare la citirea conexiunii cu find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "eroare la închiderea conexiunii cu find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find pentru --recursive a returnat codul de eroare netratată %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"a fost căutat, dar nu a fost găsit nici un pachet (fișiere de tip *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s necesită cel puțin un fișier-arhivă de pachet ca argument"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1596,35 +1596,35 @@ msgstr "--%s necesită cel puțin un fișier-arhivă de pachet ca argument"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Se selectează pachetul %s, deselectat anterior.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Se omite pachetul deselectat %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Versiunea %.250s a lui %.250s este deja instalată, se omite.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
"%s - atenție: se instalează versiunea mai veche a lui %.250s pornind de la "
"%.250s către %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2482,51 +2482,51 @@ msgstr "imposibil a stabili drepturile de execuție la „%.250s”"
msgid "unable to setenv for maintainer script"
msgstr "setenv imposibil pentru scriptul de întreținere"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "script %s vechi"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "imposibil a citi starea lui %s „%.250s”"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "script %s nou"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "script %s vechi"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "imposibil a citi starea lui %s „%.250s”"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - încerc scriptul din noul pachet în loc ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "nu există nici un script în noua versiune a pachetului - renunț"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... pare să fi fost bine.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "imposibil a crea „%.255s”"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "eșec la execuția rm pentru curățare"
@@ -2976,31 +2976,31 @@ msgstr "sfârșit neașteptat de fișier înainte de terminarea liniei %d"
msgid "need an action option"
msgstr "e necesară o opțiune de acțiune"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"trebuie să specificați pachetele prin numele lor, nu prin citarea numelor "
+"fișierelor în care acestea vin"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending nu ia argumente care nu sunt opțiuni"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s necesită cel puțin un nume de pachet ca argument"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"trebuie să specificați pachetele prin numele lor, nu prin citarea numelor "
-"fișierelor în care acestea vin"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"Pachetul %s este listat de mai multe ori, va fi procesat doar o dată.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -3009,7 +3009,7 @@ msgstr ""
"Mai multe copii ale pachetului %s au fost despachetate\n"
" în această execuție! Va fi configurat doar o dată.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -3018,77 +3018,77 @@ msgstr ""
"pachetul %.250s nu este pregătit pentru procesarea declanșatorilor\n"
" (starea curentă e „%.250s” fără declanșatori în așteptare)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Pachetul %s care furnizează %s va fi șters.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Pachetul %s va fi șters.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Versiunea lui %s în sistem este %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" Pachetul %s care furnizează %s așteaptă procesarea declanșatorilor.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Pachetul %s așteaptă procesarea declanșatorilor.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: se configurează și „%s” (cerut de „%s”)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Pachetul %s care furnizează %s nu este configurat încă.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Pachetul %s nu este configurat încă.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Pachetul %s care furnizează %s nu este instalat.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Pachetul %s nu este instalat.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) îl corupe pe %s și este %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) furnizează %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versiunea lui %s care va fi configurată este %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " depinde de "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; oricum:\n"
@@ -3096,40 +3096,40 @@ msgstr "; oricum:\n"
msgid "(no description available)"
msgstr "(nici o descriere disponibilă)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "nu se poate accesa arhiva"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "eroare la asigurarea că „%.250s” nu există"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"eșec la execuția dpkg-split pentru a vedea dacă este parte dintr-un "
"multivolum"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "fișier pachet reasamblat"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autentific %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "eșec la execl în debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verificarea pachetului %s a eșuat!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3138,31 +3138,31 @@ msgstr ""
"Verificarea pachetului %s a eșuat,\n"
"dar va fi instalat așa cum ați cerut.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "verificat\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "eșec la crearea numelui de director temporar"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "eșec la execuția lui dpkg-deb pentru a extrage informația de control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Informații înregistrate despre %s de la %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "arhitectura pachetului (%s) nu se potrivește cu sistemul (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3171,107 +3171,107 @@ msgstr ""
"dpkg: legat de %s conținând %s, probleme de antedependență:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problemă de antedependență - nu se instalează %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: avertisment - se ignoră problema de antedependență !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Se pregătește înlocuirea lui %s %s (folosind %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Se despachetează %s (din %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"numele fișierului conffile (începând „%.250s”) este prea lung (>%d caractere)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "eroare de citire în %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "eroare la închiderea lui %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "eroare la încercarea de a deschide %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Se deconfigurează %s, pentru a fi permite ștergerea lui %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Se deconfigurează %s ...\n"
# este vorba despre un nume de pachet( vezi sursa)
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Se dezarhivează pachetul înlocuitor (%.250s) ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr ""
"imposibil a executa dpkg-deb pentru a obține arhiva sistemului de fișiere"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "eroare la citirea rezultatului tar al lui dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr ""
"sistemul de fișiere al fișierului tar este corupt - arhiva pachetului este "
"coruptă"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: ștergere a posibilelor zerouri de la sfârșit"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: avertisment - nu s-a putut obține starea fișierul vechi „%.250s” așa "
"încât nu s-a șters: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: avertisment - imposibil a șterge fișierul vechi „%.250s”: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: avertisment - vechiul fișier conffile „%.250s” era un director gol (și "
"a fost șters)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "imposibilitate de stat a altor fișiere noi „%.250s”"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3280,72 +3280,72 @@ msgstr ""
"dpkg: avertisment - vechiul fișier „%.250s” este același cu alte câteva "
"fișiere noi! (atât „%.250s” cât și „%.250s”)\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr ""
"dpkg: avertisment - imposibilitate de a %s vechiul fișier „%%.250s”: %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "nu se poate citi directorul cu informații"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"versiunea veche a pachetului are nume de fișier mult prea lung care începe "
"cu „%.250s”"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "imposibil a îndepărta fișierul vechi de informații „%.250s”"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "imposibil a instala (presupusul) fișier nou de informații „%.250s”"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "imposibil a deschide directorul temporar de control"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"pachetul conține un fișier cu informații de control care are nume mult prea "
"lung (începe cu „%.50s”)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "informațiile de control al pachetului conțin directorul „%.250s”"
# Analiza codului arată că traducerea asta este corectă
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "rmdir „%.250s” nu a semnalat că nu este director"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr ""
"dpkg: avertisment - pachetul %s a conținut listă ca și fișier de informații"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "imposibil a instala noul fișier de informații „%.250s” ca „%.250s”"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Se notează dispariția lui %s, care a fost complet înlocuit.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "imposibil a șterge fișierul cu informații de control dispărut „%.250s”"
@@ -4003,7 +4003,7 @@ msgstr "dpkg-trigger: nume nevalid de pachet așteptat „%.250s”: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: nume declanșat nevalid „%.250s”: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -4012,7 +4012,7 @@ msgstr ""
"%s: a fost găsit un ciclu în timpul procesării declanșatorilor:\n"
" lanțul de pachete ale căror declanșatori ar putea fi responsabili:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -4021,11 +4021,11 @@ msgstr ""
"\n"
" declanșatori în așteptare ai pachetelor care ar putea fi nerezolvabili:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "declanșatorii erau în buclă, se renunță"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Se procesează declanșatorii pentru %s ...\n"
diff --git a/po/ru.po b/po/ru.po
index 7173466bf..158e26213 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.3.1\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-08-18 21:15+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1174,7 +1174,7 @@ msgstr "неожиданный конец файла при чтении %.250s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "ошибка чтения данных из канала dpkg-deb"
@@ -1188,12 +1188,12 @@ msgstr "пропускается распакованный файл '%.255s' (
msgid "error setting timestamps of `%.255s'"
msgstr "ошибка при установке времени модификации %.255s"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "ошибка при установке владельца %.255s"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "ошибка при установке прав доступа к %.255s"
@@ -1213,7 +1213,7 @@ msgstr ""
"не удалось выполнить stat для предполагаемой новой символической цели `"
"%.250s' для символической ссылки `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1222,18 +1222,18 @@ msgstr ""
"попытка переписать `%.250s', являющийся изменённой версией `%.250s' (пакет: "
"%.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "попытка переписать `%.250s', являющийся изменённой версией `%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"не удалось получить информацию о %.255s (который должен быть установлен)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1242,29 +1242,29 @@ msgstr ""
"при установке новой версии не удалось разобраться со старой мешаниной в "
"%.255s"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"перед установкой новой версии не удалось получить информацию о "
"восстановленном файле %.255s"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "архив содержит объект %.255s неизвестного типа 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Замена файлов в старом пакете %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Заменено файлами из установленного пакета %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1273,100 +1273,100 @@ msgstr ""
"попытка переписать каталог %.250s в пакете %.250s файлом, не являющимся "
"каталогом"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "попытка перезаписать %.250s, который уже имеется в пакете %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "не удалось создать '%.255s' (при обработке '%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "обработка файла %.255s процессом dpkg-deb"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "ошибка при закрытии/записи %.255s"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "ошибка создания канала %.255s"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "ошибка создания устройства %.255s"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "ошибка создания жёсткой ссылки %.255s"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "ошибка создания символической ссылки %.255s"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "ошибка при установке владельца символической ссылки %.255s"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "ошибка создания каталога %.255s"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr ""
"не удалось переместить в другое место %.255s, что необходимо для установки "
"новой версии"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "не удалось прочитать символическую ссылку %.255s"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "не удалось создать резервную ссылку на %.255s"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "не удалось сменить владельца резервной ссылки на %.255s"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"не удалось создать резервную ссылку на %.255s перед установкой новой версии"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "не удалось установить новую версию %.255s"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "не удалось создать %.255s"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "не удалось отменить буферизацию %.255s"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1375,7 +1375,7 @@ msgstr ""
"игнорируются проблемы зависимостей с %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1384,7 +1384,7 @@ msgstr ""
"рассматривается перевод пакета первой\n"
" необходимости %s в ненастроенное состояние для активации %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1393,7 +1393,7 @@ msgstr ""
"dpkg: нет, пакет %s является пакетом первой необходимости и не будет\n"
" переведён в ненастроенное состояние для активации %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1402,17 +1402,17 @@ msgstr ""
"dpkg: нет, невозможно продолжить с %s (вам поможет --auto-deconfigure):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "удаление %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "установка %.255s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1420,13 +1420,13 @@ msgstr ""
"dpkg: рассматривается перевод %s в ненастроенное состояние,\n"
" который был бы сломан %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr ""
"dpkg: да, %s будет переведён в ненастроенное состояние (сломан из-за %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1435,11 +1435,11 @@ msgstr ""
"dpkg: относительно %s, содержащего %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "поломка игнорируется, можно продолжать!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1448,29 +1448,29 @@ msgstr ""
"установка %.250s сломает %.250s, и\n"
" деконфигурация не разрешена (--auto-deconfigure может помочь)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "установка %.250s сломает имеющееся ПО"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr ""
"dpkg: чтобы можно было установить пакет %2$s, необходимо удалить %1$s...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s не установлен корректно, все зависимости от него игнорируются.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: возможны проблемы с удалением %s, поскольку он предоставляет %s...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1479,73 +1479,73 @@ msgstr ""
"dpkg: пакет %s требует переустановки, но по вашему указанию всё равно будет "
"удалён.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: пакет %s требует переустановки и не будет удалён.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "пакет %s содержит слишком много Conflicts/Replaces пар"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: %s будет удалён, чтобы можно было установить %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "конфликт пакетов -- %.250s не будет установлен"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "конфликт игнорируется, можно продолжать!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive требует задания хотя бы одного имени каталога"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "не удалось запустить find для поиска файлов в каталогах"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "не удалось открыть дескриптор канала find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "ошибка чтения из канала find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "ошибка при закрытии канала find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
"при поиске файлов в каталогах программа find вернула неизвестный код ошибки %"
"i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr ""
"поиск завершён, пакеты (файлы с именами, удовлетворяющими шаблону *.deb) "
"найти не удалось"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s требует задания хотя бы одного имени файла"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1556,33 +1556,33 @@ msgstr "--%s требует задания хотя бы одного имени
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Выбор ранее не выбранного пакета %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Пропуск не выбранного пакета %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Версия %.250s пакета %.250s уже установлена, пропускаем пакет.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "снижение версии %.250s с %.250s до %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "Версия %.250s не будет снижена с %.250s до %.250s, пропускаем пакет.\n"
@@ -2417,51 +2417,51 @@ msgstr "не удалось сделать файл %.250s исполняемы
msgid "unable to setenv for maintainer script"
msgstr "не удалось выполнить setenv для сценария сопровождающего"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "установлен сценарий %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "не удалось получить информацию о %s в `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "новый сценарий %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "старый сценарий %s"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "не удалось получить информацию о %s в `%.250s': %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg: попытка использовать сценарий из нового пакета ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "в новой версии пакета нет этого сценария, отказ"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... похоже всё обошлось.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "не удалось создать %.255s"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "не удалось выполнить команду rm для очистки каталога"
@@ -2917,30 +2917,30 @@ msgstr "неожиданный конец файла, ещё не кончила
msgid "need an action option"
msgstr "укажите требуемое действие"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"пакеты задаются их собственными именами, а не именами файлов, из которых они "
+"установлены"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending не принимает аргументов, помимо параметров"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s требует указания хотя бы одного имени пакета"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"пакеты задаются их собственными именами, а не именами файлов, из которых они "
-"установлены"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Пакет %s перечислен несколько раз, обрабатывается только единожды.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2949,7 +2949,7 @@ msgstr ""
"На текущем проходе распаковано несколько копий пакета %s!\n"
" Настраивается только одна из них.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2958,77 +2958,77 @@ msgstr ""
"пакет %.250s не готов для обработки триггеров\n"
" (текущее состояние %.250s без триггеров рассмотрения)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Пакет %s предоставляет %s, но должен быть удалён.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Пакет %s будет удалён.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Версия %s в системе %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" Пакет %s, предоставляющий %s, ожидает обработки триггеров ожидания.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Пакет %s ожидает обработки триггеров ожидания.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: настраивается также пакет `%s' (необходимо для `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Пакет %s, предоставляющий %s, пока не настроен.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Пакет %s пока не настроен.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Пакет %s, предоставляющий %s, не установлен.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Пакет %s не установлен.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) ломает %s и %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) предоставляет %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Версия %s, которая будет настроена: %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " зависит от "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ", однако:\n"
@@ -3036,40 +3036,40 @@ msgstr ", однако:\n"
msgid "(no description available)"
msgstr "(описание недоступно)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "нет доступа к архиву"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "не удалось убедиться в том, что %.250s не существует"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"не удалось запустить dpkg-split и проверить, является ли файл частью "
"многотомного архива"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "собранный файл пакета"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Проверка подлинности файла %s...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "не удалось запустить debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Пакет %s не проходит проверку подлинности!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3078,31 +3078,31 @@ msgstr ""
"Пакет %s не проходит проверку подлинности,\n"
"но по вашему указанию всё равно будет установлен.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "пройдена\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "не удалось сгенерировать имя временного каталога"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "не удалось запустить dpkg-deb, чтобы извлечь управляющую информацию"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Записана информация о пакете %s из файла %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "архитектура пакета (%s) не соответствует архитектуре системы (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3111,99 +3111,99 @@ msgstr ""
"dpkg: не выполнены обязательные условия установки пакета %s из файла %s:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "не выполнены предварительные условия, пакет %.250s не будет установлен"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "игнорируются предварительные условия установки!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Подготовка к замене пакета %s %s (используется файл %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Распаковывается пакет %s (из файла %s)...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "имя conffile (начинается с %.250s) слишком длинное (>%d символов)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "ошибка чтения файла %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "ошибка при закрытии файла %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "ошибка при попытке открыть файл %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Деконфигурация %s, чтобы можно было удалить %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Деконфигурация %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Распаковывается замена для пакета %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "не удалось извлечь архив файловой системы с помощью dpkg-deb"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "ошибка чтения архива tar, возвращённого dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "повреждённый архив файловой системы: повреждён файл пакета"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: удаление возможных завершающих нулей"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"не удалось получить информацию о старом файл`%.250s', поэтому не удаляем "
"его: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "не удалось удалить старый каталог `%.250s': %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr "старый conffile `%.250s' является пустым каталогом (и был удалён)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "не удалось получить информацию о другом новом файле `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3212,72 +3212,72 @@ msgstr ""
"старый файл `%.250s' такой же как несколько новых файлов! (`%.250s' и `"
"%.250s')"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "не удалось %s старый файл `%.250s': %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "ошибка чтения информационного каталога"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"старая версия пакета содержит информационный файл с очень длинным именем, "
"начинающимся с `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "не удалось удалить устаревший информационный файл `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
"не удалось установить(предположительно) новый информационный файл `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "не удалось открыть временный каталог управляющей информации"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"пакет содержит очень длинное имя файла управляющей информации (начинается с `"
"%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "управляющая информация пакета содержит каталог `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"rmdir при попытке удалить управляющую информацию пакета `%.250s' не "
"утверждает, что это не было каталогом"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "пакет %s содержит в качестве информационного файла список"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "не удалось переименовать новый информационный файл `%.250s' в `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Пакет %s полностью заменён и фактически исчез.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "не удалось удалить файл управляющей информации `%.250s'"
@@ -3917,7 +3917,7 @@ msgstr "dpkg-trigger: неверное имя ожидаемого пакета
msgid "invalid trigger name `%.250s': %.250s"
msgstr "неверное имя триггера `%.250s': %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3926,7 +3926,7 @@ msgstr ""
"%s: при обработке триггеров обнаружено зацикливание:\n"
" цепочка пакетов с такими триггерами может не отвечать:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3935,11 +3935,11 @@ msgstr ""
"\n"
" пакеты с триггерами рассмотрения могут могут быть не определены:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "зацикливание триггеров, отмена работы"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Обрабатываются триггеры для %s ...\n"
diff --git a/po/sk.po b/po/sk.po
index b649216cd..2a3de5f41 100644
--- a/po/sk.po
+++ b/po/sk.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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-12-03 10:34+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1164,7 +1164,7 @@ msgstr "neočakávaný koniec súboru pri čítaní „%.250s“"
msgid "error formatting string into varbuf variable"
msgstr "chyba pri formátovaní reťazca do premennej varbuf"
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "chyba pri čítaní z rúry dpkg-deb"
@@ -1178,12 +1178,12 @@ msgstr "preskočené rozbaľovanie súboru „%.255s“ (nahradený alebo vynech
msgid "error setting timestamps of `%.255s'"
msgstr "chyba pri nastavovaní časovej značky u „%.255s“"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "chyba pri nastavovaní vlastníckych práv u „%.255s“"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "chyba pri nastavovaní prístupových práv u „%.255s“"
@@ -1204,7 +1204,7 @@ msgstr ""
"nepodarilo sa vykonať stat() (dereferencovanie) na navrhovanom novom cieli "
"symbolického odkazu „%.250s“ symbolického odkazu „%.250s“"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1213,17 +1213,17 @@ msgstr ""
"pokus o prepísanie „%.250s“, ktorý je odklonenou verziou „%.250s“ (balík: "
"„%.100s“)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "pokus o prepísanie „%.250s“, ktorý je odklonenou verziou „%.250s“"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "nie je možné zistiť stav „%.255s“ (ktorý bude práve nainštalovaný)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1232,28 +1232,28 @@ msgstr ""
"nie je možné upratať odpad obklopujúci „%.255s“ pred nainštalovaním inej "
"verzie"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"nie je možné zistiť stav obnoveného „%.255s“ pred nainštalovaním inej verzie"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "archív obsahoval objekt „%.255s“ neznámeho typu 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Nahradzujú sa súbory v starom balíku %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Nahradzujú sa súbory v nainštalovanom balíku %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1261,100 +1261,100 @@ msgid ""
msgstr ""
"pokus o prepísanie adresára „%.250s“ v balíku %.250s %.250s neadresárom"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "pokus o prepísanie „%.250s“, ktorý je tiež v balíku %.250s %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "nie je možné vytvoriť „%.255s“ (počas spracovania „%.255s“)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "backend dpkg-deb počas „%.255s“"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "chyba pri uzatváraní/zápise „%.255s“"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "chyba pri vytváraní rúry „%.255s“"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "chyba pri vytváraní zariadenia „%.255s“"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "chyba pri vytváraní pevného odkazu „%.255s“"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "chyba pri vytváraní symbolického odkazu „%.255s“"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "chyba pri nastavovaní vlastníckych práv symbolického odkazu „%.255s“"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "chyba pri vytváraní adresára „%.255s“"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "nie je možné odsunúť „%.255s“ aby sa dala nainštalovať nová verzia"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "nie je možné prečítať odkaz „%.255s“"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "nie je možné vytvoriť záložný symbolický odkaz na „%.255s“"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"nie je možné zmeniť vlastnícke práva na záložnom symbolickom odkaze na "
"„%.255s“"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"nie je možné vytvoriť záložný odkaz „%.255s“ pred nainštalovaním novej verzie"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "nie je možné nainštalovať novú verziu „%.255s“"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "nedá sa vytvoriť „%.255s“"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "nie je možné odbufferovať „%.255s“"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1363,7 +1363,7 @@ msgstr ""
"ignoruje sa problém so závislosťami balíka %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1372,7 +1372,7 @@ msgstr ""
"uvažuje sa o odkonfigurovaní nevyhnutného\n"
" balíka %s, ktoré umožní %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1381,7 +1381,7 @@ msgstr ""
"dpkg: nie, %s je nevyhnutný, nebude odkonfigurovaný,\n"
" aby sa umožnil %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1390,28 +1390,28 @@ msgstr ""
"dpkg: nie, nie je možné pokračovať v %s (--auto-deconfigure pomôže):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "odstránení %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "inštalácii %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: uvažuje sa o odstránení %s, ktorý by %s pokazil ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: áno, odkonfiguruje sa %s (pokazený balíkom %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1420,11 +1420,11 @@ msgstr ""
"dpkg: ohľadom %s obsahujúci %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "ignoruje sa pokazenie, je možné pokračovať!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1433,28 +1433,28 @@ msgstr ""
"nainštalovanie %.250s by pokazilo %.250s a\n"
" odkonfigurovanie nie je povolené (--auto-deconfigure by mohlo pomôcť)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "nainštalovanie %.250s by pokazilo existujúci softvér"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: uvažuje sa o odstránení %s v prospech %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"%s nie je správne nainštalovaný - ignorujú sa všetky závislosti na ňom.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: možné problémy s odstránením %s, pretože poskytuje %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1463,70 +1463,70 @@ msgstr ""
"dpkg: balík %s vyžaduje reinštaláciu, ale bude odstránený ako ste "
"požadovali.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr ""
"dpkg: balík %s vyžaduje reinštaláciu, nepokračuje sa v odinštalovaní.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "balík %s má príliš veľa dvojíc V konflikte s/Nahrádza"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: áno, odstránim %s v prospech %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "konflikt balíkov - nebude sa inštalovať %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "ignoruje sa konflikt, je možné pokračovať!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive vyžaduje aspoň jednu cestu ako argument"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "zlyhalo spustenie príkazu find pre --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "zlyhalo vykonanie funkcie fdopen na rúre príkazu find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "chyba pri čítaní z rúry príkazu find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "chyba pri uzatváraní rúry príkazu find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "príkaz find pre --recursive vrátil nespracovanú chybu %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "prehľadané, nebol ale nájdený žiadny balík (súbory vyhovujúce *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s vyžaduje ako argument aspoň jeden súbor s balíkom"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1537,33 +1537,33 @@ msgstr "--%s vyžaduje ako argument aspoň jeden súbor s balíkom"
msgid "<standard output>"
msgstr "<štand. výstup>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<štand. chybový>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Vyberá sa predtým zrušený balík %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Preskakuje sa zrušený balík %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Verzia %.250s %.250s je uz nainštalovaná, preskakuje sa.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "inštaluje sa staršia verzia %.250s; z %.250s na %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2396,51 +2396,51 @@ msgstr "nie je možné nastaviť práva na spustenie na „%.250s“"
msgid "unable to setenv for maintainer script"
msgstr "nie je možné nastaviť premennú prostredia pre skript údržby"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "nainštalovaný skript %s"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "nie je možné zistiť stav %s „%.250s“"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nový skript %s"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "starý %s skript"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "nie je možné zistiť stav %s „%.250s“: %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - skúša sa radšej skript z nového balíka ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "v novej verzii balíka nie je žiaden skript - ukončuje sa"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... vyzerá to tak, že sa to podarilo.\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "nedá sa bezpečne odstrániť „%.255s“"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "rm sa nedá spustiť na čistenie"
@@ -2877,30 +2877,30 @@ msgstr "nečakaný koniec súboru pred koncom riadka %d"
msgid "need an action option"
msgstr "vyžaduje sa zadanie voľby určujúcej operáciu"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"musíte označiť balíky ich vlastnými názvami, nie citovaním názvov súborov z "
+"ktorých pochádzajú"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending neprijíma žiadne argumenty"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s vyžaduje ako parameter aspoň jeden názov balíka"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"musíte označiť balíky ich vlastnými názvami, nie citovaním názvov súborov z "
-"ktorých pochádzajú"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Balík %s uvedený viac ako jedenkrát, spracuje sa len raz.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2909,7 +2909,7 @@ msgstr ""
"Viac ako jedna kópia balíka %s bola rozbalená\n"
" v tomto behu! Konfiguruje sa len jedenkrát.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2919,76 +2919,76 @@ msgstr ""
" (súčasný stav „%.250s“, nečaká sa na žiadne spúšťače\n"
" (triggers-pending))"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Balík %s, ktorý poskytuje %s, sa odstráni.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Balík %s sa odstráni.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Verzia %s na systéme je %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Balík %s, ktorý poskytuje %s, očakáva spracovanie spúšťačov..\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Balík %s očakáva spracovanie spúšťačov.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: taktiež sa konfiguruje „%s“ (vyžaduje ho „%s“)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Balík %s, ktorý poskytuje %s, ešte nie je nakonfigurovaný.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Balík %s ešte nie je nakonfigurovaný.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Balík „%s“, ktorý poskytuje %s, nie je nainštalovaný.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Balík %s nie je nainštalovaný.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) kazí %s a je %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) poskytuje %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Verzia %s, ktorá sa má konfigurovať, je %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " závisí na "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; aj keď:\n"
@@ -2996,40 +2996,40 @@ msgstr "; aj keď:\n"
msgid "(no description available)"
msgstr "(popis nie je k dispozícii)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "nie je možné vstúpiť do archívu"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "chyba potvrdzujúca, že „%.250s“ neexistuje"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"nepodarilo sa spustiť dpkg-split na kontrolu či je časťou archívu "
"skladajúceho sa z viacerých častí"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "znovuzostavený súbor balíka"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Overuje sa %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "zlyhalo spustenie funkcie execl na debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verifikácia balíka %s zlyhala!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3038,31 +3038,31 @@ msgstr ""
"Verifikácia balíka %s zlyhala,\n"
"napriek tomu sa inštaluje podľa vašej požiadavky.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "prešiel\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "zlyhalo vytvorenie dočasného názvu adresára"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "zlyhalo spustenie dpkg-deb na extrakciu riadiacich informácií"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Zaznamenané informácie o %s z %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "architektúra balíka (%s) nezodpovedá systému (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3071,99 +3071,99 @@ msgstr ""
"dpkg: problém s pred-závislosťami v súvislosti s %s, obsahujúcim %s:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problém s pred-závislosťami - neinštaluje sa %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "ignoruje sa problém s pred-závislosťami!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Pripravuje sa nahradenie %s %s (pomocou %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Rozbaľuje sa %s (z %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"názov konfiguračného súboru (začínajúci „%.250s“) je príliš dlhý (>%d znakov)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "chyba pri čítaní v %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "chyba pri zatváraní %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "chyba pri pokuse otvoriť %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Dekonfiguruje sa %s, aby sa umožnilo odstránenie %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Dekonfiguruje sa %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Rozbaľuje sa náhrada %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "nie je možné spustiť dpkg-deb pre získanie obsahu archívu súborov"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "chyba pri čítaní dpkg-deb tar výstupu"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "poškodený systémový tar súbor - poškodený archív balíkov"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: zrušiť možné koncové nuly"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "nedá sa zistiť stav starého súboru „%.250s“, takže sa nebude mazať: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "nedá sa zmazať starý adresár „%.250s“: %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"starý konfiguračný súbor „%.250s“ je prázdny adresár (a teraz bol zmazaný)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "nedá sa zistiť stav ďalšieho nového súboru „%.250s“"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3172,69 +3172,69 @@ msgstr ""
"starý súbor „%.250s“ je rovnaký ako niekoľko nových súborov! („%.250s“ aj "
"„%.250s“)"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "nedá sa bezpečne odstrániť starý súbor „%.250s“: %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "nedá sa prečítať informácia o adresári"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"stará verzia balíka má príliš dlhý názov info súboru, ktorý začína „%.250s“"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "nie je možné odstrániť zastaralý info súbor „%.250s“"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "nie je možné nainštalovať (navrhovaný) nový info súbor „%.250s“"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "nie je možné otvoriť dočasný riadiaci adresár"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"balík obsahuje príliš dlhý názov riadiaceho info súboru (začínajúci „%.50s“)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "riadiaci info balík obsahoval adresár „%.250s“"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"funkcia rmdir u informácií o riadení balíka „%.250s“ nepovedala, že to nie "
"je adresár"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "balík %s obsahoval zoznam ako info súbor"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "nie je možné nainštalovať nový info súbor „%.250s“ ako „%.250s“"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Vyskytlo sa zmiznutie balíka %s, ktorý bol úplne nahradený.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "nie je možné zrušiť zmiznutie riadiaceho info súboru „%.250s“"
@@ -3857,7 +3857,7 @@ msgstr "dpkg-trigger: neplatné meno očakávaného balíka „%.250s“: %.250s
msgid "invalid trigger name `%.250s': %.250s"
msgstr "neplatný názov spúšťača „%.250s“: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3866,7 +3866,7 @@ msgstr ""
"%s: pri spracovaní spúšťačov bol nájdený cyklus:\n"
" reťazec balíkov, ktorých spúšťače sú alebo môžu byť za to zodpovedné:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3875,11 +3875,11 @@ msgstr ""
"\n"
" očakávané spúšťače (triggers-pending) balíkov, ktoré nemožno vyriešiť:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "spúšťače v slučke, ignorujú sa"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Spracúvajú sa spúšťače %s ...\n"
diff --git a/po/sv.po b/po/sv.po
index 103a520ee..6c6efb260 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.6.1\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-03-15 12:24+0100\n"
"Last-Translator: Peter Krefting <peterk@debian.org>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -1151,7 +1151,7 @@ msgstr "oväntat filslut vid läsning av \"%.250s\""
msgid "error formatting string into varbuf variable"
msgstr "felaktig formateringssträng i varbuf-variablen"
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "fel vid läsning från dpkg-deb-rör"
@@ -1165,12 +1165,12 @@ msgstr "hoppade över uppackning av filen \"%.255s\" (ersatt eller utesluten?)"
msgid "error setting timestamps of `%.255s'"
msgstr "fel när tidsstämplingarna på \"%.255s\" skulle ställas in"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "fel när ägandeskap för \"%.255s\" skulle ställas in"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "fel när behörighet för \"%.255s\" skulle ställas in"
@@ -1190,7 +1190,7 @@ msgstr ""
"kunde inte ta status på (avreferera) föreslaget nytt mål \"%.250s\" för "
"symbolisk länk \"%.250s\""
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1199,21 +1199,21 @@ msgstr ""
"försökte skriva över \"%.250s\", vilket är den omdirigerade varianten av "
"\"%.250s\" (paket: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"försökte skriva över \"%.250s\", vilket är den omdirigerade varianten av "
"\"%.250s\""
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr ""
"kunde inte läsa status för \"%.255s\" (vilket var vad jag just skulle "
"installera)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1221,28 +1221,28 @@ msgid ""
msgstr ""
"kunde inte rensa upp i röran runt \"%.255s\" innan en ny version installeras"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"kunde inte ta status på återställd \"%.255s\" innan en ny version installeras"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "arkivet innehåller objektet \"%.255s\" av okänd typ 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Ersätter filer i det gamla paketet %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Ersätta av filer i det installerade paketet %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1251,101 +1251,101 @@ msgstr ""
"försöker skriva över katalogen \"%.250s\" från paketet %.250s %.250s med "
"icke-katalog"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr ""
"försöker skriva över \"%.250s\" som också finns i paketet %.250s %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "kunde inte skapa \"%.255s\" (vid hantering av \"%.255s\")"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "bakändan dpkg-deb under \"%.255s\""
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "fel vid stängning/skrivning \"%.255s\""
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "fel vid skapande av röret \"%.255s\""
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "fel vid skapande av enheten \"%.255s\""
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "fel vid skapande av hårda länken \"%.255s\""
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "fel vid skapande av symboliska länken \"%.255s\""
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "fel vid inställning av ägandeskap av symboliska länken \"%.255s\""
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "fel vid skapande av katalogen \"%.255s\""
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "kunde inte flytta undan \"%.255s\" för att installera ny version"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "kunde inte läsa länken \"%.255s\""
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "kunde inte säkerhetskopiera symbolisk länk för \"%.255s\""
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"kunde inte byta ägare på säkerhetskopierad symbolisk länk för \"%.255s\""
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"kunde inte skapa säkerhetskopierad länk av \"%.255s\" innan den nya "
"versionen installeras"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "kunde inte installera ny version av \"%.255s\""
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "kunde inte skapa \"%.255s\""
-#: src/archives.c:833
+#: src/archives.c:841
#, c-format
msgid "unable to sync file '%.255s'"
msgstr "kunde inte synkronisera filen \"%.250s\""
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1354,7 +1354,7 @@ msgstr ""
"ignorerar beroendeproblem med %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1363,7 +1363,7 @@ msgstr ""
"funderar på att avkonfigurera det systemkritiska\n"
" paketet %s för att aktivera %s."
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1372,7 +1372,7 @@ msgstr ""
"dpkg: nej, %s är systemkritiskt, kommer inte att avkonfigurera\n"
" det för att aktivera %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1381,29 +1381,29 @@ msgstr ""
"dpkg: nej, kan fortsätta med %s (--auto-deconfigure hjälper):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "borttagning av %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "installation av \"%.255s\""
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr ""
"dpkg: funderar på att avkonfigurera %s, vilket skulle förstöras av %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ja, kommer att avkonfigurera %s (förstörs av %s).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1412,11 +1412,11 @@ msgstr ""
"dpkg: angående %s som innehåller %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "ignorerar förstörelse, kan ändå fortsätta!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1425,28 +1425,28 @@ msgstr ""
"installation av %.250s skulle förstöra %.250s, och\n"
" avkonfigurering tillåts inte (--auto-deconfigure kanske hjälper)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "installation av %.250s skulle förstöra befintliga program"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: funderar på att ta bort %s till förmån för %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s är ej korrekt installerat - ignorerar dess beroenden.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: kan ha problem att ta bort %s, eftersom det tillhandahåller %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1455,68 +1455,68 @@ msgstr ""
"dpkg: paketet %s måste ominstalleras, men tar bort det ändå enligt ditt "
"önskemål.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: paketet %s kräver återinstallation, tar inte bort.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "paketet %s har för många konflikt/ersätter-par"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ja, kommer att ta bort %s till förmån för %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "paketkonflikt - installerar inte %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "ignorerar konflikt, kan ändå fortsätta!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive kräver åtminstone ett sökvägsargument"
-#: src/archives.c:1123
+#: src/archives.c:1131
msgid "find for dpkg --recursive"
msgstr "find för dpkg --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "kunde inte ansluta fil till finds rör"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "kunde inte läsa från finds rör"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "fel vid stängning av finds rör"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find för --recursive returnerade ohanterat fel %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "sökte, men hittade inga paket (filer som matchar *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s kräver åtminstone ett argument som är en paketfil"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1527,33 +1527,33 @@ msgstr "--%s kräver åtminstone ett argument som är en paketfil"
msgid "<standard output>"
msgstr "<standard ut>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<standard fel>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Väljer tidigare ej valt paket %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Hoppar över ej valt paket %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Version %.250s av %.250s redan installerat, hoppar över.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "nedgraderar %.250s från %.250s till %.250s."
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2375,51 +2375,51 @@ msgstr "kunde inte ställa in körrättigheter på \"%.250s\""
msgid "unable to setenv for maintainer script"
msgstr "kunde inte utföra setenv för utvecklarskript"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "installerade %s-skript"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "kunde inte ta status på %s \"%.250s\""
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "nytt %s-skript"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "gammalt %s-skript"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "kunde inte ta status på %s \"%.250s\": %s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - försöker skript från det nya paketet istället ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "det finns inget skript i den nya versionen av paketet - ger upp"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... det verkar ha fungerat.\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "kunde inte säkert ta bort \"%.255s\""
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "kunde inte utföra rm för upprensning"
@@ -2825,30 +2825,30 @@ msgstr "oväntat filslut före slut på rad %d"
msgid "need an action option"
msgstr "behöver en åtgärd att utföra"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"du måste ange paket med sina egna namn, inte genom att ange namnen på de "
+"filer de kommer i"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending tar inga argument som inte är flaggor"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s behöver åtminstone ett paket som argument"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"du måste ange paket med sina egna namn, inte genom att ange namnen på de "
-"filer de kommer i"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Paketet %s är listat mer än en gång, hanterar det bara en gång.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2857,7 +2857,7 @@ msgstr ""
"Mer än en kopia av paketet %s har packats upp\n"
" under körningen! Konfigurerar det bara en gång.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2866,77 +2866,77 @@ msgstr ""
"paketet %.250s är inte redo för hantering av utlösare\n"
" (aktuell status är \"%.250s\" med inga förestående utlösare)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Paketet %s, som tillhandahåller %s, kommer att tas bort.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Paketet %s kommer att tas bort.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Versionen av %s på systemet är %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr ""
" Paketet %s, som tillhandahåller %s, väntar på hantering av utlösare.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Paketet %s väntar på hantering av utlösare.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: konfigurerar även \"%s\" (krävs av \"%s\")\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Paketet %s, som tillhandahåller %s, har inte konfigurerats ännu.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Paketet %s har inte konfigurerats ännu.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Paketet %s, som tillhandahåller %s, är ej installerat.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Paketet %s är ej installerat.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) förstör %s och är %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) tillhandahåller %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Versionen av %s som skall konfigureras är %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " är beroende av "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ", men:\n"
@@ -2944,39 +2944,39 @@ msgstr ", men:\n"
msgid "(no description available)"
msgstr "(beskrivning saknas)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "kan inte komma åt arkivet"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "fel då det skulle säkerställas att \"%.250s\" ej existerar"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"kunde inte köra dpkg-split för att se om det är en del av ett flerdelat paket"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "återskapade paketfil"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Autentiserar %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "kunde inte köra debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Verifiering av paket %s misslyckades!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2985,30 +2985,30 @@ msgstr ""
"Verifiering av paket %s misslyckades,\n"
"men installerar ändå enligt önskemål.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "lyckades\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
msgid "unable to create temporary directory"
msgstr "kunde inte skapa temporär katalog"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "kunde inte köra dpkg-deb för att extrahera kontrollinformationen"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Lagrade information om %s från %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "paketarkitekturen (%s) matchar inte systemets (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3017,100 +3017,100 @@ msgstr ""
"dpkg: angående %s innehållandes %s, problem med för-beroenden:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "för-beroendeproblem - installerar inte %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "ignorerar för-beroendeproblem!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Förbereder att ersätta %s %s (med %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Packar upp %s (från %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"namn på konfigurationsfil (som börjar på \"%.250s\") är för lång (>%d tecken)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "läsfel i %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "fel vid stängning av %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "fel vid öppning av %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Avkonfigurerar %s, så att vi kan ta bort %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Avkonfigurerar %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Packar upp ersättande %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "kunde inte köra dpkg-deb för att få filsystemsarkiv"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "kunde inte läsa dpkg-debs tar-utdata"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "trasig filsystemstarfil - trasigt paketarkiv"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: dödar möjliga avslutande nollor"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "kunde inte ta status på gammal fil \"%.250s\" så den tas inte bort: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "kunde inte ta bort gammal katalog \"%.250s\": %s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"gammal konfigurationfil \"%.250s\" var en tom katalog (och har nu tagits "
"bort)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "kunde inte ta status på andra ny fil \"%.250s\""
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3119,72 +3119,72 @@ msgstr ""
"gammal fil \"%.250s\" är samma som ett flertal nya filer! (både \"%.250s\" "
"och \"%.250s\")"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "kunde inte säkert ta bort gammal fil \"%.250s\": %s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "kan inte läsa infokatalog"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"gammal version av paketet har för lång informationsfilnamn som börjar på "
"\"%.250s\""
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "kunde inte ta bort gammal informationsfil \"%.250s\""
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr ""
"kunde inte installera (vad som antas vara) ny informationsfil \"%.250s\""
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "kunde inte öppna temporär kontrollkatalog"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"paketet innehåller för långt kontrollinformationsfilnamn (börjar på \"%.50s"
"\")"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "paketets kontrollinformation innehåller katalogen \"%.250s\""
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"\"rmdir\" på paketets kontrollinformation \"%.250s\" svarade inte \"ej "
"katalog\""
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "paketet %s innehåller list som informationsfil"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "kunde inte installera ny informationsfil \"%.250s\" som \"%.250s\""
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Noterar att %s försvunnit, vilken helt har ersatts.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "kunde inte ta bort försvinnande kontrollfil \"%.250s\""
@@ -3802,7 +3802,7 @@ msgstr "dpkg-trigger: ogiltigt namn \"%.250s\" på paket som väntas på: %.250s
msgid "invalid trigger name `%.250s': %.250s"
msgstr "ogiltigt utlösarnamn \"%.250s\": %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3811,7 +3811,7 @@ msgstr ""
"%s: cykel upptäckt vid hantering av utlösare:\n"
" paketkedja vars utlösare är eller kan vara orsak:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3820,11 +3820,11 @@ msgstr ""
"\n"
" paketens förestående utlösare som är eller kanske inte kan analyseras:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "utlösare i slinga, avbryts"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Hanterar utlösare för %s ...\n"
diff --git a/po/th.po b/po/th.po
index 3d28a38b4..e274839a1 100644
--- a/po/th.po
+++ b/po/th.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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-06-26 16:34+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -1134,7 +1134,7 @@ msgstr "พบจุดจบแฟ้มก่อนกำหนดขณะอ
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "เกิดข้อผิดพลาดขณะอ่านจากไปป์ของ dpkg-deb"
@@ -1148,12 +1148,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะลงเวลาของ `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะกำหนดเจ้าของของ `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะกำหนดการอนุญาตสิทธิ์ของ `%.255s'"
@@ -1171,148 +1171,148 @@ msgid ""
msgstr ""
"ไม่สามารถ stat (ชี้ตามลิงก์) ปลายทาง symlink ใหม่ `%.250s' สำหรับ symlink `%.250s'"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr "กำลังพยายามเขียนทับ `%.250s' ซึ่งเป็นฉบับเบนของ `%.250s' (แพกเกจ: %.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "กำลังพยายามเขียนทับ `%.250s' ซึ่งเป็นฉบับเบนของ `%.250s'"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "ไม่สามารถ stat `%.255s' (ซึ่งกำลังจะติดตั้ง)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "ไม่สามารถเก็บกวาดสิ่งตกค้างเกี่ยวกับ `%.255s' ก่อนที่จะติดตั้งอีกรุ่นได้"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "ไม่สามารถ stat แฟ้ม `%.255s' ที่เพิ่งฟื้นคืน ก่อนที่จะติดตั้งอีกรุ่นได้"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "แพกเกจมีออบเจกต์ `%.255s' เป็นชนิด 0x%x ซึ่งไม่รู้จัก"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "กำลังแทนที่แฟ้มในแพกเกจเก่าของ %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "ถูกแทนที่โดยแฟ้มในแพกเกจติดตั้งใหม่ของ %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "กำลังพยายามเขียนทับไดเรกทอรี `%.250s' ในแพกเกจ %.250s ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "กำลังพยายามเขียนทับ `%.250s' ซึ่งอยู่ในแพกเกจ %.250s เช่นกัน"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "อ่าน `%.255s' ไม่สำเร็จ (ใน `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "แบ็กเอนด์ dpkg-deb ระหว่าง `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะปิด/เขียน `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะสร้างไปป์ `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะสร้างอุปกรณ์ `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะสร้าง hard link `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะสร้าง symbolic link `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะกำหนดเจ้าของของ symlink `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "เกิดข้อผิดพลาดขณะสร้างไดเรกทอรี `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "ไม่สามารถเปลี่ยนชื่อแฟ้ม `%.255s' ชั่วคราวเพื่อติดตั้งรุ่นใหม่ได้"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "ไม่สามารถอ่านลิงก์ `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "ไม่สามารถสร้าง symlink สำรองสำหรับ `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "ไม่สามารถกำหนดเจ้าของของ symlink สำรองสำหรับ `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "ไม่สามารถสร้างลิงก์สำรองของ `%.255s' ก่อนติดตั้งรุ่นใหม่ได้"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "ไม่สามารถติดตั้งรุ่นใหม่ของ `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "ไม่สามารถสร้าง `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "ไม่สามารถเลิกใช้บัฟเฟอร์สำหรับ `%.250s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1321,7 +1321,7 @@ msgstr ""
"dpkg: คำเตือน - จะละเลยปัญหาความขึ้นต่อกันของแพกเกจในการ%s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1330,7 +1330,7 @@ msgstr ""
"dpkg: คำเตือน - จะพิจารณาถอนคืนค่าตั้งของแพกเกจจำเป็น\n"
" %s เพื่อให้สามารถ%s\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1339,7 +1339,7 @@ msgstr ""
"dpkg: ไม่ได้ %s เป็นแพกเกจจำเป็น จะไม่ถอนคืนค่าตั้ง\n"
" เพื่อให้สามารถ%s\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1348,28 +1348,28 @@ msgstr ""
"dpkg: ไม่ได้ ไม่สามารถดำเนินการ%s ต่อ (--auto-deconfigure ช่วยได้):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "ถอดถอน %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "ติดตั้ง %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: จะพิจารณาถอนคืนค่าตั้งของ %s ซึ่งจะมีปัญหาเพราะการ%s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: ได้ จะถอนคืนค่าตั้งของ %s (มีปัญหาเพราะการ%s)\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1378,12 +1378,12 @@ msgstr ""
"dpkg: เกี่ยวกับ %s ซึ่งบรรจุ %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: คำเตือน - จะละเลยปัญหา อาจดำเนินการต่อได้ !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1392,97 +1392,97 @@ msgstr ""
"การติดตั้ง %.250s จะทำให้ %.250s มีปัญหา และ\n"
" ไม่ได้อนุญาตให้มีการถอนคืนค่าตั้ง (--auto-deconfigure ช่วยได้)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "การติดตั้ง %.250s จะทำให้ซอฟต์แวร์ที่มีอยู่มีปัญหา"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: จะพิจารณาลบ %s เพื่อใช้ %s แทน ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s ไม่ได้ติดตั้งอย่างถูกต้อง - จะละเลยแพกเกจที่ต้องใช้แพกเกจดังกล่าว\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: อาจมีปัญหาในการถอดถอน %s เพราะแพกเกจดังกล่าวจัดเตรียม %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr "dpkg: แพกเกจ %s ต้องติดตั้งซ้ำ แต่จะถอดถอนตามที่คุณสั่ง\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: แพกเกจ %s ต้องติดตั้งซ้ำ จะไม่ถอดถอน\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "แพกเกจ %s มีคู่แพกเกจขัดแย้ง/แทนที่มากเกินไป"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: ได้ จะถอดถอน %s เพื่อใช้ %s\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "แพกเกจขัดแย้งกัน - จะไม่ติดตั้ง %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: คำเตือน - จะละเลยความขัดแย้งระหว่างแพกเกจ อาจดำเนินการต่อได้ !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive ต้องมีอาร์กิวเมนต์เป็นพาธอย่างน้อยหนึ่งพาธ"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "ไม่สามารถเรียกใช้ find สำหรับ --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "fdopen ไปป์ของ find ไม่สำเร็จ"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "เกิดข้อผิดพลาดขณะอ่านไปป์ของ find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "เกิดข้อผิดพลาดขณะปิดไปป์ของ find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find สำหรับ --recursive คืนค่าข้อผิดพลาด %i ซึ่งยังไม่จัดการ"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "ค้นหาแล้ว แต่ไม่พบแพกเกจ (แฟ้มซึ่งตรงกับรูปแบบ *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s ต้องการอาร์กิวเมนต์เป็นแฟ้มแพกเกจอย่างน้อยหนึ่งแฟ้ม"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1493,33 +1493,33 @@ msgstr "--%s ต้องการอาร์กิวเมนต์เป็
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "กำลังเลือกแพกเกจ %s ที่เดิมไม่ได้เลือก\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "กำลังข้ามแพกเกจ %s ที่ไม่ได้เลือก\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "รุ่น %.250s ของ %.250s ถูกติดตั้งไว้แล้ว ขอข้าม\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - คำเตือน: จะปรับรุ่น %.250s ลง จาก %.250s เป็น %.250s\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "จะไม่ปรับรุ่น %.250s ลง จากรุ่น %.250s เป็น %.250s ขอข้าม\n"
@@ -2333,51 +2333,51 @@ msgstr "ไม่สามารถกำหนดสิทธิ์การเ
msgid "unable to setenv for maintainer script"
msgstr "ไม่สามารถ setenv สำหรับสคริปต์ผู้ดูแลแพกเกจ"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "สคริปต์ %s อันเก่า"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "ไม่สามารถ stat %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "สคริปต์ %s อันใหม่"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "สคริปต์ %s อันเก่า"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "ไม่สามารถ stat %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - จะลองใช้สคริปต์จากแพกเกจใหม่แทน ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "ไม่มีสคริปต์ในแพกเกจรุ่นใหม่ - ขอยกเลิก"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... ทุกอย่างดูจะเรียบร้อยดี\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "ไม่สามารถสร้าง `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "ไม่สามารถเรียก rm เพื่อลบข้อมูลได้"
@@ -2782,28 +2782,28 @@ msgstr "แฟ้มจบก่อนที่จะจบบรรทัดท
msgid "need an action option"
msgstr "ต้องมีตัวเลือกระบุการกระทำด้วย"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr "คุณต้องระบุแพกเกจด้วยชื่อแพกเกจ ไม่ใช่โดยคัดลอกชื่อของแฟ้มแพกเกจมา"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending ไม่รับอาร์กิวเมนต์ที่ไม่ใช่ตัวเลือก"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s ต้องการอาร์กิวเมนต์ที่เป็นชื่อแพกเกจอย่างน้อยหนึ่งตัว"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr "คุณต้องระบุแพกเกจด้วยชื่อแพกเกจ ไม่ใช่โดยคัดลอกชื่อของแฟ้มแพกเกจมา"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "แพกเกจ %s ถูกระบุมากกว่าหนึ่งครั้ง จะดำเนินการเพียงครั้งเดียวเท่านั้น\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2812,7 +2812,7 @@ msgstr ""
"มีแพกเกจ %s ถูกแตกมากกว่าหนึ่งชุดในการทำงานครั้งนี้ !\n"
" จะตั้งค่าแพกเกจนี้เพียงครั้งเดียวเท่านั้น\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2821,76 +2821,76 @@ msgstr ""
"แพกเกจ %.250s ไม่พร้อมสำหรับการประมวลผลการสะกิด\n"
" (สถานะปัจจุบัน `%.250s' และไม่มีการสะกิดที่คั่งค้างอยู่)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " แพกเกจ %s ซึ่งจัดเตรียม %s จะถูกถอดถอน\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " แพกเกจ %s จะถูกถอดถอน\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " รุ่นของ %s ในระบบคือ %s\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " แพกเกจ %s ซึ่งจัดเตรียม %s ยังรอคอยการประมวลผลการสะกิด\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " แพกเกจ %s ยังรอคอยการประมวลผลการสะกิด\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: จะตั้งค่า `%s' ด้วย (ต้องการโดย `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " แพกเกจ %s ซึ่งจัดเตรียม %s ยังไม่ถูกตั้งค่า\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " แพกเกจ %s ยังไม่ถูกตั้งค่า\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " แพกเกจ %s ซึ่งจัดเตรียม %s ไม่ได้ถูกติดตั้ง\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " แพกเกจ %s ไม่ได้ถูกติดตั้ง\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) ทำให้ %s พัง และ%s\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) จัดเตรียม %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " รุ่นของ %s ที่จะถูกตั้งค่าคือ %s\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " ต้องใช้ "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; แต่ว่า:\n"
@@ -2898,39 +2898,39 @@ msgstr "; แต่ว่า:\n"
msgid "(no description available)"
msgstr "(ไม่มีคำบรรยาย)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "ไม่สามารถเข้าใช้แฟ้มแพกเกจ"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "เกิดข้อผิดพลาดขณะพยายามทำให้แน่ใจว่า `%.250s' ไม่มีอยู่"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"ไม่สามารถเรียก dpkg-split เพื่อตรวจสอบว่าแพกเกจเป็นส่วนย่อยของแพกเกจแบ่งส่วนหรือไม่"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "แฟ้มแพกเกจที่ประกอบรวมแล้ว"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "กำลังยืนยันแหล่งต้นตอของ %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "ไม่สามารถ execl debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "การตรวจสอบแพกเกจ %s ล้มเหลว!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2939,31 +2939,31 @@ msgstr ""
"การตรวจสอบแพกเกจ %s ล้มเหลว\n"
"แต่จะติดตั้งตามที่คุณสั่ง\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "ผ่าน\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "ไม่สามารถคำนวณหาชื่อไดเรกทอรีชั่วคราว"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "ไม่สามารถเรียกทำงาน dpkg-deb เพื่อแยกเอาข้อมูลควบคุม"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "บันทึกข้อมูลเกี่ยวกับ %s จาก %s\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "สถาปัตยกรรมของแพกเกจ (%s) ไม่ตรงกับของระบบ (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2972,99 +2972,99 @@ msgstr ""
"dpkg: เกี่ยวกับ %s ที่บรรจุ %s: มีปัญหาของสิ่งที่ต้องใช้ขณะติดตั้ง:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "มีปัญหาของสิ่งที่ต้องใช้ขณะติดตั้ง - จะไม่ติดตั้ง %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: คำเตือน - จะละเลยปัญหาของสิ่งที่ต้องใช้ขณะติดตั้ง !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "กำลังเตรียมแทนที่ %s %s (ด้วย %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "กำลังแตก %s (จาก %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "ชื่อของแฟ้มค่าตั้ง (ขึ้นต้นด้วย `%.250s') ยาวเกินไป (>%d ตัวอักษร)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "เกิดข้อผิดพลาดขณะอ่าน %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "เกิดข้อผิดพลาดขณะปิด %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "เกิดข้อผิดพลาดขณะพยายามเปิด %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "กำลังถอนคืนค่าตั้งของ %s เพื่อให้สามารถถอดถอน %s ได้ ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "กำลังถอนคืนค่าตั้งของ %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "กำลังแตกแพกเกจแทนที่ %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "ไม่สามารถเรียกทำงาน dpkg-deb เพื่อแยกเอาแฟ้มจัดเก็บสำหรับแฟ้มที่จะติดตั้งในระบบแฟ้ม"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "เกิดข้อผิดพลาดขณะอ่านผลลัพธ์ของ tar จาก dpkg-deb"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "แฟ้ม tar สำหรับแฟ้มที่จะติดตั้งในระบบแฟ้มเสียหาย - แฟ้มแพกเกจเสียหาย"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: ตัดไบต์ศูนย์ทั้งหลายข้างท้ายที่อาจจะมี"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg: คำเตือน - ไม่สามารถ stat แฟ้มเก่า `%.250s' จึงจะไม่ลบแฟ้มดังกล่าว: %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: คำเตือน - ไม่สามารถลบไดเรกทอรีเก่า `%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: คำเตือน - แฟ้มค่าตั้งเดิม `%.250s' เป็นไดเรกทอรีว่างเปล่า (และตอนนี้ถูกลบแล้ว)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "ไม่สามารถ stat แฟ้มใหม่ `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3073,65 +3073,65 @@ msgstr ""
"dpkg: คำเตือน - แฟ้มเก่า `%.250s' เป็นแฟ้มเดียวกับแฟ้มใหม่หลายแฟ้ม! (ทั้ง `%.250s' และ `"
"%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: คำเตือน - ไม่สามารถ%sแฟ้มเก่า `%%.250s': %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "ไม่สามารถอ่านไดเรกทอรี info"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr "แพกเกจรุ่นเก่ามีแฟ้ม info ชื่อยาวเกินไป ซึ่งขึ้นต้นด้วย `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "ไม่สามารถลบแฟ้ม info `%.250s' ที่เลิกใช้แล้ว"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "ไม่สามารถติดตั้งแฟ้ม info `%.250s' (ที่น่าจะเป็น) ฉบับใหม่"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "ไม่สามารถเปิดไดเรกทอรีควบคุมชั่วคราว"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "แพกเกจมีแฟ้มข้อมูลควบคุมชื่อยาวเกินไป (ขึ้นต้นด้วย `%.250s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "ข้อมูลควบคุมของแพกเกจมีไดเรกทอรี `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "การสั่ง rmdir กับ `%.250s' ในข้อมูลควบคุมของแพกเกจ ไม่ได้ตอบว่าไม่ใช่ไดเรกทอรี"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: คำเตือน - แพกเกจ %s มีแฟ้ม list เป็นข้อมูลควบคุม"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "ไม่สามารถติดตั้งแฟ้มควบคุมใหม่ `%.250s' เป็น `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(สังเกตการหายไปของ %s ซึ่งถูกแทนที่อย่างสมบูรณ์)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "ไม่สามารถลบแฟ้มข้อมูลควบคุม `%.250s' ซึ่งถูกกำหนดให้หายไป"
@@ -3754,7 +3754,7 @@ msgstr "dpkg-trigger: ชื่อแพกเกจที่รอคอย `%.
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: ชื่อการสะกิด `%.255s' ใช้ไม่ได้: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3763,7 +3763,7 @@ msgstr ""
"%s: พบวงวนขณะประมวลผลการสะกิด:\n"
" สายของแพกเกจที่การสะกิดเป็นหรืออาจเป็นตัวการ:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3772,11 +3772,11 @@ msgstr ""
"\n"
" การสะกิดที่คั่งค้างของแพกเกจที่อาจไม่สามารถจัดลำดับการทำงานได้:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "มีการสะกิดเป็นวงวน ขอยกเลิก"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "กำลังประมวลผลการสะกิดสำหรับ %s ...\n"
diff --git a/po/tl.po b/po/tl.po
index 434221f25..9c3fe036f 100644
--- a/po/tl.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2006-02-17 08:53+0200\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1156,7 +1156,7 @@ msgstr "di inaasahang dulo ng talaksan sa %.250s"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "error sa pagbasa mula sa dpkg-deb pipe"
@@ -1170,12 +1170,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "error sa pagtakda ng timestamp ng `%.255s'"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "error sa pagtakda ng pagmamayari ng `%.255s'"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "error sa pagtakda ng pahintulo ng `%.255s'"
@@ -1192,7 +1192,7 @@ msgid ""
"symlink `%.250s'"
msgstr ""
-#: src/archives.c:434
+#: src/archives.c:435
#, fuzzy, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1201,19 +1201,19 @@ msgstr ""
"sinusubukang patungan ang `%.250s', na siyang dibertadong bersyon ng `"
"%.250s'%.10s%.100s%.10s"
-#: src/archives.c:440
+#: src/archives.c:441
#, fuzzy, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr ""
"sinusubukang patungan ang `%.250s', na siyang dibertadong bersyon ng `"
"%.250s'%.10s%.100s%.10s"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "hindi ma-stat ang `%.255s' (na siyang iluluklok sana)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1222,27 +1222,27 @@ msgstr ""
"hindi malinis ang kalat sa paligid ng `%.255s' bago magluklok ng ibang "
"bersyon"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "hindi ma-stat ang ibinalik na `%.255s' bago magluklok ng ibang bersyon"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "naglalaman ang arkibo ng bagay na `%.255s' ng hindi kilalang uri 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Pinapalitan ang talaksan sa lumang paketeng %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Pinalitan ng mga talaksan sa nakaluklok na paketeng %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1251,98 +1251,98 @@ msgstr ""
"sinusubukang patungan ang directory `%.250s' sa paketeng %.250s ng hindi "
"directory"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "sinusubukang patungan ang `%.250s', na nasa paketeng %.250s din"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "bigo ang pagbasa ng `%.255s' (sa `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "bakend dpkg-deb habang `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "error sa pagsara/pagsulat `%.255s'"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "error sa paglikha ng pipe `%.255s'"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "error sa paglikha ng device `%.255s'"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "error sa paglikha ng hard link `%.255s'"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "error sa paglikha ng symbolic link `%.255s'"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "error sa pagtakda ng pagmamayari ng symlink `%.255s'"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "error sa paglikha ng directory `%.255s'"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "hindi malipat ang `%.255s' upang iluklok ang bagong bersyon"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "hindi mabasa ang link `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "hindi makagawa ng backup symlink para sa `%.255s'"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "hindi ma-chown ang backup symlink para sa `%.255s'"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"hindi makagawa ng backup link ng `%.255s' bago iluklok ang bagong bersyon"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "hindi malikha ang `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "hindi ma-unbuffer ang `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1352,7 +1352,7 @@ msgstr ""
"s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1361,7 +1361,7 @@ msgstr ""
"dpkg: babala - inaayunan na tanggalin ang pagkaayos ng kailangang\n"
" pakete %s, upang maaaring tanggalin ang %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, fuzzy, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1370,7 +1370,7 @@ msgstr ""
"dpkg: hindi, %s ay kailangan, hindi ito tatanggalan ng pagkaayos\n"
" nito upang maaaring tanggalin ang %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, fuzzy, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1380,28 +1380,28 @@ msgstr ""
"deconfigure):\n"
" %s"
-#: src/archives.c:910
+#: src/archives.c:918
#, fuzzy, c-format
msgid "removal of %.250s"
msgstr "error sa pagbasa sa %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, fuzzy, c-format
msgid "installation of %.250s"
msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
-#: src/archives.c:936
+#: src/archives.c:944
#, fuzzy, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: inaayunan ang pagtanggal ng %s pabor sa %s ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, fuzzy, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: oo, tatanggalin ang %s pabor sa %s.\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1410,45 +1410,45 @@ msgstr ""
"dpkg: tungkol sa %s na naglalaman ng %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr ""
"dpkg: babala - hindi pinapansin ang tunggalian, maaaring magpatuloy pa "
"rin !\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
" deconfiguration is not permitted (--auto-deconfigure might help)"
msgstr ""
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr ""
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: inaayunan ang pagtanggal ng %s pabor sa %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr ""
"hindi nakaluklok ng tama ang %s - hindi pinapansin ang mga dependensiya sa "
"kanya.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr ""
"dpkg: maaaring magkaproblema sa pagtanggal ng %s, dahil nagbibigay ito ng %"
"s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1457,76 +1457,76 @@ msgstr ""
"dpkg: kinakailangan iluklok muli ang paketeng %s, ngunit tatanggalin na rin "
"ito gaya ng hiling niyo.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: kinakailangan iluklok muli ang paketeng %s, hindi tatanggalin.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr ""
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: oo, tatanggalin ang %s pabor sa %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "magkatunggaling mga pakete - hindi iluluklok %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr ""
"dpkg: babala - hindi pinapansin ang tunggalian, maaaring magpatuloy pa "
"rin !\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr ""
"--%s --recursive ay nangangailangan ng hindi kukulang sa isang argumentong "
"path"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "bigo sa pag-exec ng find para sa --recursive"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "bigo sa pag-fdopen ng pipe ng find"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "error sa pagbasa ng pipe ng find"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "error sa pagsara ng pipe ng find"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "find para sa --recursive ay nagbalik ng hindi maprosesong error %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "naghanap, ngunit walang nahanap na pakete (talaksang pumares sa *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr ""
"--%s ay nangangailangan ng hindi kulang sa isa talaksang arkibong pakete "
"argumento"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1537,33 +1537,33 @@ msgstr ""
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Pinipili ang nakaraang hindi piniling pakete %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Linampasan ang hindi piniling pakete %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Bersyon %.250s ng %.250s ay nakaluklok na, linalampasan.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - babala: downgrade ng %.250s mula %.250s tungong %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2411,52 +2411,52 @@ msgstr "hindi matakda ang pahintulot ng pag-execute sa `%.250s'"
msgid "unable to setenv for maintainer script"
msgstr "hindî maka-stat sa vsnprintf"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "lumang %s skripto"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "hindi ma-stat ang %s `%.250s'"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "bagong %s skripto"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "lumang %s skripto"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "hindi ma-stat ang %s `%.250s'"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr ""
"dpkg - sinusubukan na lamang ang skripto mula sa bagong pakete sa halip ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "walang skripto sa bagong bersyon ng pakete - sumusuko na"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... mukhang ayos naman ang nangyari.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "hindi malikha ang `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "bigo sa pag-exec ng rm para sa paglinis"
@@ -2820,34 +2820,34 @@ msgstr "di inaasahang eof bago matapos ang linya %d"
msgid "need an action option"
msgstr "kailangan ng opsyon ng gagawin"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"kailangan niyong itakda ang mga pakete sa kanilang mga pangalan, hindi ang "
+"pangalan ng talaksan na kinaroroonan nila"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending ay hindi tumatanggap ng argumentong hindi opsyon"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr ""
"--%s ay nangangailangan ng hindi kukulang sa isa na argumentong pangalan ng "
"pakete"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"kailangan niyong itakda ang mga pakete sa kanilang mga pangalan, hindi ang "
-"pangalan ng talaksan na kinaroroonan nila"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr ""
"Nakalista ang paketeng %s ng higit sa isang beses, pinoproseso ng isang\n"
"beses lamang.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2856,7 +2856,7 @@ msgstr ""
"Higit sa isang kopya ng paketeng %s ay nabuklat sa pagtakbong ito !\n"
"Isasaayos ito ng isang beses lamang.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, fuzzy, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2865,77 +2865,77 @@ msgstr ""
"hindi handa na isaayos ang paketeng %.250s\n"
" hindi maisaayos (kasalukuyang kalagayan `%.250s')"
-#: src/packages.c:307
+#: src/packages.c:323
#, fuzzy, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalin.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, fuzzy, c-format
msgid " Package %s is to be removed.\n"
msgstr " %.250s ay tatanggalin.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr ""
-#: src/packages.c:348
+#: src/packages.c:364
#, fuzzy, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalin.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, fuzzy, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " %.250s ay tatanggalin.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: isinasaayos din ang `%s' (kailangan ng `%s')\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, fuzzy, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr ""
" %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalan ng pagkaayos.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, fuzzy, c-format
msgid " Package %s is not configured yet.\n"
msgstr " ay hindi pa nakaayos.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, fuzzy, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr "Di nakaluklok ang paketeng `%s'.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, fuzzy, c-format
msgid " Package %s is not installed.\n"
msgstr "Di nakaluklok ang paketeng `%s'.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, fuzzy, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %.250s ay nagbibigay ng %.250s at ay %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, fuzzy, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (subprocess): %s\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, fuzzy, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %.250s ay tatanggalin ang pagkaayos.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " nagdedepende sa "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; gayunpaman:\n"
@@ -2943,39 +2943,39 @@ msgstr "; gayunpaman:\n"
msgid "(no description available)"
msgstr "(walang paglalarawan)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "hindi ma-akses ang arkibo"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "error sa paniguradong `%.250s' ay wala"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"bigo sa pag-exec ng dpkg-split upang makita kung ito'y bahagi na multiparter"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "binuo muli ang talaksang pakete"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Tinitiyak ang %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "bigo na i-execl ang debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Bigo ang pagtiyak sa paketeng %s!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2984,31 +2984,31 @@ msgstr ""
"Bigo ang pagtiyak sa paketeng %s,\n"
"ngunit iluluklok pa rin tulad ng inyong hiling.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "pasado\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "bigo na likhain ang temporary directoryname"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "bigo sa pag-exec ng dpkg-deb upang ma-extract ang impormasyong control"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Tinala ang info tungkol sa %s mula sa %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "arkitektura ng pakete (%s) ay hindi lapat sa sistema (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3017,102 +3017,102 @@ msgstr ""
"dpkg: tungkol sa %s na naglalaman ng %s, problemang pre-dependensiya:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "problemang pre-dependensiya - hindi iluluklok ang %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: babala - hindi pinansin ang problemang pre-dependensiya !\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Naghahandang palitan ang %s %s (gamit ang %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Binubuklat ang %s (mula sa %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr ""
"pangalan ng conffile (nagumpisa `%.250s') ay labis ang haba (>%d karakter)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "error sa pagbasa sa %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "error sa pagsara %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "error habang sinubukang buksan ang %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, fuzzy, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr ""
"Tinatanggalan ng pagkaayos ang %s, upang maaaring tanggalin ang %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, fuzzy, c-format
msgid "De-configuring %s ...\n"
msgstr "Tinatanggal ang %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Binubuklat ang papalit sa %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "hindi ma-exec ang dpkg-deb upang kunin ang arkibo ng filesystem"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "error sa pagbasa ng dpkg-deb tar output"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "sirang filesystem tarfile - sira ang arkibong pakete"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: i-zap ang posibleng susunod na mga sero"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: %s: babala - conffile `%.250s' ay hindi payak na talaksan o symlink\n"
" (= `%s')\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, fuzzy, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3121,70 +3121,70 @@ msgstr ""
"dpkg: %s: babala - conffile `%.250s' ay hindi payak na talaksan o symlink\n"
" (= `%s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "hindi mabasa ang info directory"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"lumang bersyon ng pakete ay may sobrang-haba na pangalan ng talaksang info \n"
"nagsisimula `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "hindi matanggal ang laos na talaksang info `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "hindi maluklok (daw) bagong talaksang info `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "hindi mabuksan ang temp control directory"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr ""
"naglalaman ang pakete ng sobrang-haba na pangalan ng talaksang control info\n"
"(nagsisimula `%.50s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "control info ng pakete ay naglaman ng directory `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "control info ng pakete rmdir ng `%.250s' hindi nagsabing hindi ito dir"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr ""
"dpkg: babala - ang paketeng %s ay naglaman ng listahan bilang talaksang info"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "hindi mailuklok ang bagong talaksang info `%.250s' bilang `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Pinupuna ang pagkawala ng %s, na siyang napalitan ng buo.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "hindi matanggal ang nawawalang talaksang control info `%.250s'"
@@ -3808,25 +3808,25 @@ msgstr "saklaw na `%s', imbalido na pangalan ng pakete `%.255s': %s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "saklaw na `%s', imbalido na pangalan ng pakete `%.255s': %s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
" chain of packages whose triggers are or may be responsible:\n"
msgstr ""
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
" packages' pending triggers which are or may be unresolvable:\n"
msgstr ""
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr ""
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, fuzzy, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Pinupurga ang talaksang pagkaayos ng %s ...\n"
diff --git a/po/vi.po b/po/vi.po
index f6f1e6adc..3ba24da09 100644
--- a/po/vi.po
+++ b/po/vi.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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2008-12-22 19:12+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -1177,7 +1177,7 @@ msgstr "gặp kết thúc tập tin bất thường khi đọc « %.250s »"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "gặp lỗi khi đọc từ ống dẫn dpkg-deb"
@@ -1191,12 +1191,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "gặp lỗi khi đặt nhãn thời gian của « %.255s »"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "gặp lỗi khi đặt quyền sở hữu « %.255s »"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "gặp lỗi khi đặt quyền hạn của « %.255s »"
@@ -1217,7 +1217,7 @@ msgstr ""
"lỗi lấy trạng thái về (gỡ bỏ tham chiếu đến) đích liên kết tượng trưng mới "
"đã đề nghị « %.250s » đối với liên kết tượng trưng « %.250s »"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
@@ -1226,17 +1226,17 @@ msgstr ""
"đang thử ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s » (gói: "
"%.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "đang thử ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s »"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "không thể lấy trạng thái về « %.255s » (mà trình này sắp cài đặt)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
@@ -1244,29 +1244,29 @@ msgid ""
msgstr ""
"không thể dọn dẹp sự lộn xộn quanh « %.255s » trước khi cài đặt phiên bản khác"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr ""
"không thể lấy trạng thái về « %.255s » đã phục hồi trước khi cài đặt phiên "
"bản khác"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "kho nén chứa đối tượng « %.255s » có kiểu không rõ 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "Đang thay thế các tập tin trong gói cũ %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "Được thay thế bằng các tập tin trong gói đã cài đặt %s ...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1274,101 +1274,101 @@ msgid ""
msgstr ""
"đang cố ghi đè lên thư mục « %.255s » trong gói %.250s với điều khác thư mục"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "đang cố ghi đè lên « %.255s », mà cũng nằm trong gói %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "lỗi đọc « %.250s » (trong « %.250s »)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "hậu phương dpkg-deb trong tiến trình « %.255s »"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "lỗi đóng/ghi « %.255s »"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "lỗi tạo ống dẫn « %.255s »"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "lỗi tạo thiết bị « %.255s »"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "lỗi tạo liên kết cứng « %.255s »"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "lỗi tạo liên kết tượng trưng « %.255s »"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "lỗi thiết lập quyền sở hữu liên kết tượng trưng « %.255s »"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "lỗi tạo thư mục « %.255s »"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "không thể di chuyển « %.255s » riêng ra để cài đặt phiên bản mới"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "không thể đọc liên kết « %.255s »"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "không thể tạo liên kết tượng trưng sao lưu cho « %.255s »"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr ""
"không thể chown (chuyển đổi tính trạng sở hữu) liên kết tượng trưng sao lưu "
"cho « %.255s »"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr ""
"không thể tạo liên kết tượng trưng sao lưu của « %.255s » trước khi cài đặt "
"phiên bản mới"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "không thể cài đặt phiên bản mới của « %.255s »"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "không thể tạo « %.255s »"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "không thể hủy đệm « %.250s »"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1377,7 +1377,7 @@ msgstr ""
"dpkg: cảnh báo : lờ đi vấn đề phụ thuộc với %s:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
@@ -1386,7 +1386,7 @@ msgstr ""
"dpkg: cảnh báo : coi như hủy cấu hình của\n"
"gói cốt yếu %s, để hiệu lực %s.\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1395,7 +1395,7 @@ msgstr ""
"dpkg: không, %s là cốt yếu, sẽ không hủy\n"
"cấu hình nó để hiệu lực %s.\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1405,28 +1405,28 @@ msgstr ""
"hình] sẽ giúp):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "việc gỡ bỏ %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "việc cài đặt %.255s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg: coi như hủy cấu hình %s, mà sẽ bị %s vỡ ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg: có, sẽ hủy cấu hình %s (bị %s vỡ).\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1435,12 +1435,12 @@ msgstr ""
"dpkg: về trường hợp %s chứa %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg: cảnh báo : lờ đi trường hợp vỡ, vẫn có thể tiếp tục lại.\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1449,27 +1449,27 @@ msgstr ""
"cài đặt %.250s nên vỡ %.250s, cũng không cho phép\n"
"hủy cấu hình (« --auto-deconfigure » [tự động hủy cấu hình] sẽ giúp)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "cài đặt %.250s nên vỡ phần mềm đã có"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg: coi như gỡ bỏ %s để ủng hộ %s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s chưa cài đặt đúng : lờ đi điều nào phụ thuộc vào nó.\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg: có thể gặp khó khăn trong việc gỡ bỏ %s, vì nó cung cấp %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1477,71 +1477,71 @@ msgid ""
msgstr ""
"dpkg: gói %s yêu cầu cài đặt lại, nhưng sẽ vẫn gỡ bỏ theo yêu cầu bạn.\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg: gói %s yêu cầu cài đặt lại nên sẽ không gỡ bỏ.\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "gói %s có quá nhiều cặp Xung đột/Thay thế"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg: có, sẽ gỡ bỏ %s để ủng hộ %s.\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "gói xung đột với nhau nên không cài đặt %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg: cảnh báo : lờ đi trường hợp xung đột, vẫn có thể tiếp tục lại.\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive (đệ quy) cần ít nhất một tham số đường dẫn"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "lỗi thực hiện find (tìm) cho « --recursive » (đệ qui)"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "lỗi fdopen ống dẫn của find (tìm)"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "gặp lỗi khi đọc ống dẫn của find (tìm)"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "gặp lỗi khi đóng ống dẫn của find (tìm)"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr ""
"việc find (tìm) cho « --recursive » (đệ qui) trả lại lỗi không được quản lý %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "đã tìm kiếm, nhưng không tìm thấy gói nào (tập tin khớp với *.deb)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "« --%s » cần ít nhất một đối số kiểu tập tin kho lưu gói"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1552,34 +1552,34 @@ msgstr "« --%s » cần ít nhất một đối số kiểu tập tin kho lưu
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "Đang chọn gói đã hủy chọn trước đây %s.\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "Đang bỏ qua gói đã hủy chọn %s.\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "Phiên bản %.250s của %.250s đã được cài đặt nên bỏ qua.\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr ""
"%s - cảnh báo : đang hạ thấp phiên bản của %.250s từ %.250s xuống %.250s.\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr ""
@@ -2425,51 +2425,51 @@ msgstr "không thể đặt quyền thực hiện cho « %.250s »"
msgid "unable to setenv for maintainer script"
msgstr "không thể setenv (đặt môi trường) đối với văn lệnh duy trì"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "văn lệnh %s cũ"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "không thể lấy các thông tin về %s « %.250s »"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "văn lệnh %s mới"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "văn lệnh %s cũ"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "không thể lấy các thông tin về %s « %.250s »"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg — đang thử văn lệnh từ gói mới để thay thế ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "không có văn lệnh trong phiên bản mới của gói nên chịu thua"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg: ... có vẻ như việc đã làm được.\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "không thể tạo « %.255s »"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "lỗi thực hiện rm (gỡ bỏ) để dọn dẹp"
@@ -2993,30 +2993,30 @@ msgstr "gặp kết thúc tập tin bất ngờ trước kết thúc dòng %d"
msgid "need an action option"
msgstr "cần một tùy chọn hành động"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"bạn phải ghi rõ mỗi gói bằng tên riêng của nó, không phải bằng tên của tập "
+"tin .deb chứa nó"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "« --%s --pending » (hoãn) không chấp nhận đối số khác tùy chọn"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "« --%s » cần ít nhất một đối số kiểu tên gói"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"bạn phải ghi rõ mỗi gói bằng tên riêng của nó, không phải bằng tên của tập "
-"tin .deb chứa nó"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "Gói %s được liệt kê nhiều lần nên chỉ xử lý một lần.\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -3025,7 +3025,7 @@ msgstr ""
"Nhiều bản sao của gói %s đã được mở gói\n"
"trong lần chạy này. Chỉ cấu hình nó một lần.\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -3034,76 +3034,76 @@ msgstr ""
"gói %.250s chưa sẵn sàng để xử lý bộ gây nên\n"
" (trạng thái hiện thời « %.250s », không có bộ gây nên bị hoãn)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " Gói %s mà cung cấp %s sẽ bị gỡ bỏ.\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " Gói %s sẽ bị gỡ bỏ.\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " Phiên bản của %s trên hệ thống là %s.\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " Gói %s mà cung cấp %s cũng đợi xử lý bộ gây nên.\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " Gói %s cũng đợi xử lý bộ gây nên.\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg: cũng đang cấu hình « %s » (yêu cầu bởi « %s »)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " Chưa cấu hình gói %s mà cung cấp %s.\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " Chưa cấu hình gói %s.\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " Chưa cài đặt gói %s mà cung cấp %s.\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " Chưa cài đặt gói %s.\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s (%s) vỡ %s, cũng %s.\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s (%s) cung cấp %s.\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " Phiên bản của %s cần cấu hình là %s.\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " phụ thuộc vào "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "; tuy nhiên:\n"
@@ -3111,41 +3111,41 @@ msgstr "; tuy nhiên:\n"
msgid "(no description available)"
msgstr "(không có mô tả)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "không thể truy cập kho lưu"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "gặp lỗi khi bảo đảm « %.250s » không tồn tại"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"lỗi thực hiện « dpkg-split » (chia tách) để xem nếu nó là một phần của điều "
"đa phần"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "tập tin gói đã tập hợp lại"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "Đang xác thực %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr ""
"lỗi execl (thực hiện rồi chấm dứt) « debsig-verify » (thẩm tra chữ ký Debian)"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "Lỗi thẩm tra gói %s."
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -3154,31 +3154,31 @@ msgstr ""
"Lỗi thẩm tra gói %s,\n"
"nhưng vẫn đang cài đặt như bạn yêu cầu.\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "đã qua\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "lỗi tạo tên thư mục tạm thời"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "lỗi thực hiện « dpkg-deb » để giải nén thông tin điều khiển"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "Đã ghi lưu thông tin về %s từ %s.\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "kiến trúc gói (%s) không khớp với hệ thống (%s)"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3187,102 +3187,102 @@ msgstr ""
"dpkg: về %s chứa %s, vấn đề quan hệ phụ thuộc sẵn:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "vấn đề quan hệ phụ thuộc sẵn nên không cài đặt %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg: cảnh báo — đang lờ đi vấn đề quan hệ phụ thuộc sẵn.\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "Đang chuẩn bị thay thế %s %s (bằng %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "Đang mở gói %s (từ %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "tên của tập tin cấu hình (bắt đầu « %.250s ») quá dài (>%d ký tự)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "gặp lỗi đọc trong %.250s"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "gặp lỗi khi đóng %.250s"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "gặp lỗi khi cố mở %.250s"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "Đang huỷ cấu hình %s, để có khả năng gỡ bỏ %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "Đang hủy cấu hình %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "Đang mở gói điều thay thế %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "không thể thực hiện « dpkg-deb » để lấy kho lưu hệ thống tập tin"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "gặp lỗi khi đọc kết xuất tar của « dpkg-deb »"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "tập tin .tar của hệ thống tập tin bị hỏng — kho lưu gói bị hỏng"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb: sửa các số không đi sau có thể"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr ""
"dpkg: cảnh báo — không thể lấy các thông tin về tập tin cũ « %.250s » nên "
"không xoá nó : %s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg: cảnh báo — không thể xóa thư mục cũ « %.250s »: %s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr ""
"dpkg: cảnh báo — tập tin cấu hình cũ « %.250s » là thư mục trống (thì đã được "
"xoá).\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "không thể lấy các thông tin về tập tin mới khác « %.250s »"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3291,68 +3291,68 @@ msgstr ""
"dpkg: cảnh báo — tập tin cũ « %.250s » là cùng một tập tin với vài tập tin "
"mới (cả hai « %.250s » và « %.250s »).\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg: cảnh báo — không thể %s tập tin cũ « %%.250s »: %%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "không thể đọc thư mục thông tin"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr ""
"phiên bản cũ của gói có tên tập tin thông tin quá dài bắt đầu « %.250s »"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "không thể gỡ bỏ tập tin thông tin cũ « %.250s »"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "không thể cài đặt tập tin thông tin (giả thiết) mới « %.250s »"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "không thể mở thư mục điều khiển tạm thời"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "gói chứa tên tập tin thông tin điều khiển quá dài (bắt đầu « %.50s »)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "thông tin điều khiển gói chứa thư mục « %.250s »"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr ""
"việc rmdir (gỡ bỏ thư mục) kiểu thông tin điều khiển gói của « %.250s » không "
"nói « không phải là thư mục »"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg: cảnh báo — gói %s chứa danh sách dạng tập tin thông tin"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "không thể cài đặt tập tin thông tin mới « %.250s » dạng « %.250s »"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(Đang ghi lưu sự biến mất của %s, mà đã hoàn toàn được thay thế.)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "không thể xóa tập tin thông tin điều khiển biến mất « %.250s »"
@@ -4007,7 +4007,7 @@ msgstr "dpkg-trigger: tên gói mong đợi cấm « %.250s »: %.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger: tên bộ gây nên không hợp lệ « %.250s »: %.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -4016,7 +4016,7 @@ msgstr ""
"%s: phát hiện chu ký trong khi xử lý bộ gây nên:\n"
" dãy các gói có bộ gây nên có thể tạo vấn đề này:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -4025,11 +4025,11 @@ msgstr ""
"\n"
" các bộ gây nên bị hoãn của gói mà có thể không thể giải quyết:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "bộ gây nên đi vòng lặp nên bị hủy"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "Đang xử lý các bộ gây nên đối với %s ...\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5f31ed888..c242c01e1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-12-15 15:21+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Simplified Chinese <debian-chinese-gb@lists.debian.org>\n"
@@ -1142,7 +1142,7 @@ msgstr "读取“%.250s”时发现未预期的文件结束符"
msgid "error formatting string into varbuf variable"
msgstr "将字符串格式化为 varbuf 变量时出错"
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "从 dpkg-deb 的管道读取数据时出错"
@@ -1156,12 +1156,12 @@ msgstr "已跳过未解包文件“%.255s”(已被替换或排除?)"
msgid "error setting timestamps of `%.255s'"
msgstr "为“%.255s”设置时间戳时出错"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "为“%.255s”设置属主时出错"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "为“%.255s”设置权限位时出错"
@@ -1178,51 +1178,51 @@ msgid ""
"symlink `%.250s'"
msgstr "获取建议的新符号链接“%.250s”的状态失败,它将替代符号链接“%.250s”"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr "正在尝试覆盖“%.250s”,它是“%.250s”的转移版本(软件包:%.100s)"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "正在尝试覆盖“%.250s”,它是“%.250s”的转移版本"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "无法获取“%.255s”的状态(正准备安装该文件)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "在安装另一版本前,无法清理“%.255s”的临时文件"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "在安装另一版本前,无法获取恢复后的“%.255s”的状态"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "包文件中含有一个对象“%.255s”,无法识别它的类型 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "正在替换原软件包中的文件 %s ...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "被已安装的软件包 %s 中的文件替换了...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1230,97 +1230,97 @@ msgid ""
msgstr ""
"正试图用一个非目录的文件替换目录“%.250s”,该目录属于软件包 %.250s %.250s"
-#: src/archives.c:598
+#: src/archives.c:602
#, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "正试图覆盖“%.250s”,它同时被包含于软件包 %.250s %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "无法创建“%.255s”(处理“%.255s”时)"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "“%.255s” 时,dpkg-deb 被作为后端"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "关闭/写入“%.255s”出错"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "新建管道“%.255s”时出错"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "新建设备文件“%.255s”时出错"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "新建硬链接“%.255s”时出错"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "新建符号链接“%.255s”时出错"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "为符号链接“%.255s”设置属主时出错"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "新建目录“%.255s”时出错"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "无法将“%.255s”改名,以安装新的版本"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "无法读取符号链接“%.255s”"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "无法为“%.255s”做一个符号链接备份"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "无法更改“%.255s”的符号链接备份的属主"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "无法在安装新的版本前,为“%.255s”做一个符号链接备份"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "无法安装“%.255s”的新版本"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "无法创建“%.255s”"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "无法关闭文件缓冲“%.255s”"
-#: src/archives.c:878
+#: src/archives.c:886
#, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1329,14 +1329,14 @@ msgstr ""
"忽视 %s 的依赖关系问题:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr "正在考虑反配置基础软件包 %s,以便启用 %s。"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
@@ -1345,7 +1345,7 @@ msgstr ""
"dpkg:拒绝,%s 是基础软件包,不能反配置该软件包\n"
" 启用开启 %s。\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1354,28 +1354,28 @@ msgstr ""
"dpkg:拒绝,不能继续进行 %s (不妨尝试 --auto-deconfigure):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "卸载 %.250s"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "安装 %.250s"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg:正在考虑反配置 %s ,否则会被 %s 破坏 ...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg:好的,将反配置 %s (被 %s 破坏)。\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1384,11 +1384,11 @@ msgstr ""
"dpkg:关于含有 %2$s 的 %1$s:\n"
"%3$s"
-#: src/archives.c:955
+#: src/archives.c:963
msgid "ignoring breakage, may proceed anyway!"
msgstr "忽视软件包间的破坏,无论怎样,继续安装!"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1397,27 +1397,27 @@ msgstr ""
"安装 %.250s 将破坏 %.250s,并且\n"
"不允许反配置(--auto-deconfigure 也许会有帮助)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "安装 %.250s 将破坏现有软件"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg:为了 %2$s,正考虑卸载 %1$s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s 没有被正常安装 - 将忽略所有对它的依赖关系。\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg:也许卸载 %s 会有问题,因为它提供了 %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1426,69 +1426,69 @@ msgstr ""
"dpkg:尽管软件包 %s 需要重新安装,但还是将遵照您的要求,\n"
"把它卸载。\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg:软件包 %s 需要重新安装,它不会被卸载。\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "软件包 %s 有太多的冲突/替换组合"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg:好的,为了 %2$s 卸载 %1$s。\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "软件包相互冲突 - 将不安装 %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
msgid "ignoring conflict, may proceed anyway!"
msgstr "忽视软件包间的冲突,无论怎样,继续安装!"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --递归执行需要至少一个路径作为参数"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "无法启用 --recursive 选项执行 find"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "无法 fdopen find 的管道"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "读取 find 的管道时出错"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "关闭 find 的管道时出错"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "--recursive 选项所调用的 find 返回了一个没有被处理的错误 %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "已搜索包文件,但是没有发现任何软件包(即与 *.deb 匹配的文件)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s 需要至少一个软件包文件作为参数"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1499,33 +1499,33 @@ msgstr "--%s 需要至少一个软件包文件作为参数"
msgid "<standard output>"
msgstr "<标准输出>"
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr "<标准错误>"
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "选中了曾被取消选择的软件包 %s。\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "忽略了被取消选择的软件包 %s。\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "%1$.250s 的 %2$.250s 版本已经安装,因而将不再安装它。\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "即将把 %.250s 从 %.250s 降级到 %.250s。"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "由于不希望把 %.250s 从 %.250s 降级到 %.250s,因而将不再安装它。\n"
@@ -2336,51 +2336,51 @@ msgstr "无法设置 %s 的执行权限位"
msgid "unable to setenv for maintainer script"
msgstr "无法为维护脚本设置环境变量"
-#: src/help.c:289
+#: src/help.c:290
#, c-format
msgid "installed %s script"
msgstr "已安装 %s 脚本"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "无法获取 %s “%.250s”的状态"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "新的 %s 脚本"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "旧的 %s 脚本"
-#: src/help.c:402
+#: src/help.c:403
#, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "无法获取 %s “%.250s”的状态:%s"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - 现在尝试使用新软件包所带的脚本...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "新版本的软件包里没有脚本 - 取消操作"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg:... 看起来它能正确执行。\n"
-#: src/help.c:577
+#: src/help.c:578
#, c-format
msgid "unable to securely remove '%.255s'"
msgstr "无法安全删除“%.255s”"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "无法运行 rm 来执行清理"
@@ -2785,29 +2785,29 @@ msgstr "在第 %d 行还未结束时,发现未预料的 eof"
msgid "need an action option"
msgstr "需要一个指示操作的选项"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"您必须通过软件包自身的名字来指定软件包,而不是直接引用软件包文件的文件名"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending 不需要任何不是选项的参数"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s 需要至少一个软件包名作为参数"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr ""
-"您必须通过软件包自身的名字来指定软件包,而不是直接引用软件包文件的文件名"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "多次列出了软件包 %s,它将只被处理一次。\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2816,7 +2816,7 @@ msgstr ""
"在这此运行中,软件包 %s 有多个副本被解压缩了!\n"
"现只配置它一次。\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2825,76 +2825,76 @@ msgstr ""
"软件包“%.250s”尚未准备好由触发器处理\n"
" (目前状态为“%.250s”,没有未决的触发)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " 提供了 %2$s 的软件包 %1$s 即将被删除。\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " 即将删除 %s。\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr "系统中 %s 的版本为 %s。\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " 提供了 %2$s 的软件包 %1$s 正在等待触发器处理。\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " 软件包 %s 正在等待触发器处理。\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg:同时也对“%s”进行配置(“%s”需要如此)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " 软件包 %s 提供了 %s,但它尚未被配置。\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " 软件包 %s 尚未配置。\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " 提供 %2$s 的软件包 %1$s 未安装。\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " 未安装软件包“%s”。\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr "%s (%s)破坏 %s 并且 %s。\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr "%s (%s)提供 %s。\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr "将被配置的 %s 的版本为 %s。\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " 依赖于 "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr ";然而:\n"
@@ -2902,40 +2902,40 @@ msgstr ";然而:\n"
msgid "(no description available)"
msgstr "(无可用描述)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "无法访问归档文件"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "在确保文件“%.250s”不存在时出错"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr ""
"exec dpkg-split 时出错,该操作被用来判断这是否是一个套件(multiparter)中的一个"
"组成部分"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "重新组装成的软件包文件"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "正在验证 %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "无法 execl debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "软件包 %s 没有通过验证!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2944,31 +2944,31 @@ msgstr ""
"虽然软件包 %s 没能通过验证,\n"
"但还是如您所愿继续安装它。\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "验证通过\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "生成临时目录的目录名失败"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "无法 exec dpkg-deb,通过它来解压缩控制信息"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "从 %2$s 获得的关于 %1$s 的信息。\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "软件包的体系架构(%s)与本机系统的架构(%s)不符"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2977,162 +2977,162 @@ msgstr ""
"dpkg:对于含 %2$s 的文件 %1$s 来说,有预依赖(pre-dependency)方面的问题:\n"
"%3$s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "预依赖(pre-dependency)问题 - 将不安装%.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
msgid "ignoring pre-dependency problem!"
msgstr "忽略预依赖(pre-dependency)问题!"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "正预备替换 %s %s (使用 %s) ...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "正在解压缩 %s (从 %s) ...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "conffile 的文件名(其开头是“%.250s”)太长(> %d 个字符)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "读取 %.250s 出错"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "关闭 %.250s 出错"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "试图打开 %.250s 出错"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "正在反配置 %s 以允许删除 %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "正在反配置 %s ...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "正在解压缩将用于更替的包文件 %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "无法 exec dpkg-deb,以此来获得打包后的文件系统"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "无法读取 dpkg-deb 输出的 tar 文件"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "文件系统的 tar 文件已损坏 - 软件包文件已毁损"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb:截去了最后的零数据(zeros)"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "无法 stat 旧文件“%.250s”因此不删除它:%s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "无法删除原有的目录“%.250s”:%s"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr "原有 conffile “%.250s”是一个空目录(现在已被删除)"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "无法 stat 其它新文件“%.250s”"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
"'%.250s')"
msgstr "旧文件“%.250s”与多个新文件相同!(“%.250s”和“%.250s”)"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "无法安全地删除旧的文件“%.250s”:%s"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "无法读取信息(info)目录"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr "原先版本的软件包中有一个信息文件的文件名太长,文件名是以“%.250s”开头的"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "无法删除废弃不用的信息文件“%.250s”"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "无法安装文件“%.250s”,该文件被认定是新的信息文件"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "无法打开临时主控目录"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "软件包中有一个主控信息文件的文件名太长(该文件名是以“%.250s”开头的)"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "软件包的主控信息含有一个目录“%.250s”"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "软件包控制信息,rmdir “%.250s”也没有说这不是一个目录"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, c-format
msgid "package %s contained list as info file"
msgstr "软件包 %s 把一个列表作为信息文件使用"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "无法把新的信息文件“%.250s”安装到“%.250s”"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(注意到 %s 已经不复存在,它已然被完全取代了。)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "无法删除已经消失了的控制信息文件“%.250s”"
@@ -3737,7 +3737,7 @@ msgstr "dpkg-trigger:非法的等待软件包名“%.250s”:%.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "无效的触发器名“%.250s”:%.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3746,7 +3746,7 @@ msgstr ""
"%s:处理触发器时发现回路:\n"
" 包含或可能包含对此有责任的触发器的软件包链:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3755,11 +3755,11 @@ msgstr ""
"\n"
" 无法解决的软件包未决触发器:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "触发器循环,放弃"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "正在处理用于 %s 的触发器...\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 72138f606..5053296a9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2009-01-28 10:31+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -1140,7 +1140,7 @@ msgstr "由 %.250s 讀取到了預期之外的 eof"
msgid "error formatting string into varbuf variable"
msgstr ""
-#: src/archives.c:178 src/archives.c:207 src/archives.c:651
+#: src/archives.c:178 src/archives.c:207 src/archives.c:655
msgid "error reading from dpkg-deb pipe"
msgstr "由 dpkg-deb 的管線讀取資料時發生錯誤"
@@ -1154,12 +1154,12 @@ msgstr ""
msgid "error setting timestamps of `%.255s'"
msgstr "在替 `%.255s' 設定時間戳記時發生錯誤"
-#: src/archives.c:252 src/archives.c:660 src/statcmd.c:172
+#: src/archives.c:252 src/archives.c:664 src/statcmd.c:172
#, c-format
msgid "error setting ownership of `%.255s'"
msgstr "在替 `%.255s' 設定所有權時發生錯誤"
-#: src/archives.c:254 src/archives.c:663 src/statcmd.c:174
+#: src/archives.c:254 src/archives.c:667 src/statcmd.c:174
#, c-format
msgid "error setting permissions of `%.255s'"
msgstr "在替 `%.255s' 設定權限時發生錯誤"
@@ -1177,148 +1177,148 @@ msgid ""
msgstr ""
"無法取得(反引用)將要指向新符號連結 `%.250s' 的符號連結 `%.250s' 的狀態"
-#: src/archives.c:434
+#: src/archives.c:435
#, c-format
msgid ""
"trying to overwrite `%.250s', which is the diverted version of `"
"%.250s' (package: %.100s)"
msgstr "試圖覆蓋 `%.250s',它是 `%.250s'(套件:%.100s)抽換後的版本"
-#: src/archives.c:440
+#: src/archives.c:441
#, c-format
msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
msgstr "試圖覆蓋 `%.250s',它是 `%.250s' 抽換後的版本"
-#: src/archives.c:466
+#: src/archives.c:467
#, c-format
msgid "unable to stat `%.255s' (which I was about to install)"
msgstr "無法取得 `%.255s' 的狀態(正要安裝這個檔案)"
-#: src/archives.c:474
+#: src/archives.c:475
#, c-format
msgid ""
"unable to clean up mess surrounding `%.255s' before installing another "
"version"
msgstr "在安裝另一版本前,無法清理 `%.255s' 的混亂狀態"
-#: src/archives.c:480
+#: src/archives.c:481
#, c-format
msgid "unable to stat restored `%.255s' before installing another version"
msgstr "在安裝另一版本前,無法取得回復後的 `%.255s' 的狀態"
-#: src/archives.c:515
+#: src/archives.c:516
#, c-format
msgid "archive contained object `%.255s' of unknown type 0x%x"
msgstr "套件檔中包含了物件 `%.255s' 有著不明的型態 0x%x"
-#: src/archives.c:576
+#: src/archives.c:578
#, c-format
msgid "Replacing files in old package %s ...\n"
msgstr "正在替換成原有套件 %s 裡的檔案...\n"
-#: src/archives.c:579
+#: src/archives.c:582
#, c-format
msgid "Replaced by files in installed package %s ...\n"
msgstr "被替換成已安裝套件 %s 裡的檔案...\n"
-#: src/archives.c:586
+#: src/archives.c:590
#, fuzzy, c-format
msgid ""
"trying to overwrite directory '%.250s' in package %.250s %.250s with "
"nondirectory"
msgstr "正試圖用套件 %2$.250s 裡一個非目錄的檔案替換目錄 `%1$.250s'"
-#: src/archives.c:598
+#: src/archives.c:602
#, fuzzy, c-format
msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
msgstr "正試圖覆蓋 `%.250s',它同時也包含於套件 %.250s"
-#: src/archives.c:639
+#: src/archives.c:643
#, fuzzy, c-format
msgid "unable to create `%.255s' (while processing `%.255s')"
msgstr "無法讀取 `%.255s'(位於 `%.255s')"
-#: src/archives.c:645
+#: src/archives.c:649
#, c-format
msgid "backend dpkg-deb during `%.255s'"
msgstr "在這期間會以 dpkg-deb 進行 `%.255s'"
-#: src/archives.c:670 src/archives.c:835
+#: src/archives.c:674 src/archives.c:843
#, c-format
msgid "error closing/writing `%.255s'"
msgstr "在關閉/寫入 `%.255s' 時發生錯誤"
-#: src/archives.c:675
+#: src/archives.c:679
#, c-format
msgid "error creating pipe `%.255s'"
msgstr "在建立管線 `%.255s' 時發生錯誤"
-#: src/archives.c:681 src/archives.c:687
+#: src/archives.c:685 src/archives.c:691
#, c-format
msgid "error creating device `%.255s'"
msgstr "在建立裝置檔 `%.255s' 時發生錯誤"
-#: src/archives.c:696
+#: src/archives.c:704
#, c-format
msgid "error creating hard link `%.255s'"
msgstr "在建立實體連結 `%.255s' 時發生錯誤"
-#: src/archives.c:703
+#: src/archives.c:711
#, c-format
msgid "error creating symbolic link `%.255s'"
msgstr "在建立符號連結 `%.255s' 時發生錯誤"
-#: src/archives.c:708
+#: src/archives.c:716
#, c-format
msgid "error setting ownership of symlink `%.255s'"
msgstr "在替符號連結 `%.255s' 設定所有權時發生錯誤"
-#: src/archives.c:713
+#: src/archives.c:721
#, c-format
msgid "error creating directory `%.255s'"
msgstr "在建立目錄 `%.255s' 時發生錯誤"
-#: src/archives.c:753
+#: src/archives.c:761
#, c-format
msgid "unable to move aside `%.255s' to install new version"
msgstr "無法將 `%.255s' 移開以安裝新的版本"
-#: src/archives.c:762
+#: src/archives.c:770
#, c-format
msgid "unable to read link `%.255s'"
msgstr "無法讀取符號連結 `%.255s'"
-#: src/archives.c:766
+#: src/archives.c:774
#, c-format
msgid "unable to make backup symlink for `%.255s'"
msgstr "無法替 `%.255s' 做一個符號連結備份"
-#: src/archives.c:768
+#: src/archives.c:776
#, c-format
msgid "unable to chown backup symlink for `%.255s'"
msgstr "無法 chown `%.255s' 的符號連結備份"
-#: src/archives.c:773
+#: src/archives.c:781
#, c-format
msgid "unable to make backup link of `%.255s' before installing new version"
msgstr "無法在安裝新的版本前,為 `%.255s' 做一個符號連結備份"
-#: src/archives.c:788 src/archives.c:841
+#: src/archives.c:796 src/archives.c:849
#, c-format
msgid "unable to install new version of `%.255s'"
msgstr "無法安裝 `%.255s' 的新版本"
-#: src/archives.c:831
+#: src/archives.c:839
#, fuzzy, c-format
msgid "unable to open '%.255s'"
msgstr "無法建立 `%.255s'"
-#: src/archives.c:833
+#: src/archives.c:841
#, fuzzy, c-format
msgid "unable to sync file '%.255s'"
msgstr "無法關閉緩衝 `%.255s'"
-#: src/archives.c:878
+#: src/archives.c:886
#, fuzzy, c-format
msgid ""
"ignoring dependency problem with %s:\n"
@@ -1327,21 +1327,21 @@ msgstr ""
"dpkg:警告 - 忽略 %s 的相依問題:\n"
"%s"
-#: src/archives.c:883
+#: src/archives.c:891
#, fuzzy, c-format
msgid ""
"considering deconfiguration of essential\n"
" package %s, to enable %s."
msgstr "dpkg: 警告 - 正打算清除基本套件 %s 的設定,以啟用 %s。\n"
-#: src/archives.c:886
+#: src/archives.c:894
#, c-format
msgid ""
"dpkg: no, %s is essential, will not deconfigure\n"
" it in order to enable %s.\n"
msgstr "dpkg:不行,%s 是基本套件,不會清除它的設定只為了啟用 %s。\n"
-#: src/archives.c:900
+#: src/archives.c:908
#, c-format
msgid ""
"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1350,28 +1350,28 @@ msgstr ""
"dpkg:不行,無法繼續進行 %s(試試 --auto-deconfigure):\n"
"%s"
-#: src/archives.c:910
+#: src/archives.c:918
#, c-format
msgid "removal of %.250s"
msgstr "%.250s 的移除作業"
-#: src/archives.c:935
+#: src/archives.c:943
#, c-format
msgid "installation of %.250s"
msgstr "`%.255s' 的安裝作業"
-#: src/archives.c:936
+#: src/archives.c:944
#, c-format
msgid ""
"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
msgstr "dpkg:正打算清除 %s 的設定,因為可能會被 %s 弄壞...\n"
-#: src/archives.c:943
+#: src/archives.c:951
#, c-format
msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
msgstr "dpkg:好,將清除 %s 的設定(被 %s 弄壞了)。\n"
-#: src/archives.c:947 src/archives.c:1068
+#: src/archives.c:955 src/archives.c:1076
#, c-format
msgid ""
"dpkg: regarding %s containing %s:\n"
@@ -1380,12 +1380,12 @@ msgstr ""
"dpkg:關於 %s 包含了 %s:\n"
"%s"
-#: src/archives.c:955
+#: src/archives.c:963
#, fuzzy
msgid "ignoring breakage, may proceed anyway!"
msgstr "dpkg:警告 - 忽略損壞,將強制繼續安裝!\n"
-#: src/archives.c:960
+#: src/archives.c:968
#, c-format
msgid ""
"installing %.250s would break %.250s, and\n"
@@ -1394,97 +1394,97 @@ msgstr ""
"安裝 %.250s 將會毀損 %.250s,\n"
" 且不打算要清除設定(--auto-deconfigure 也許有用)"
-#: src/archives.c:964
+#: src/archives.c:972
#, c-format
msgid "installing %.250s would break existing software"
msgstr "安裝 %.250s 將會毀損現有的軟體"
-#: src/archives.c:994
+#: src/archives.c:1002
#, c-format
msgid "dpkg: considering removing %s in favour of %s ...\n"
msgstr "dpkg:為了 %2$s,正打算移除 %1$s ...\n"
-#: src/archives.c:1000
+#: src/archives.c:1008
#, c-format
msgid "%s is not properly installed - ignoring any dependencies on it.\n"
msgstr "%s 未被正確安裝 - 將忽略它所有的相依關係。\n"
-#: src/archives.c:1029
+#: src/archives.c:1037
#, c-format
msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
msgstr "dpkg:也許移除 %s 會出問題,因為它提供了 %s ...\n"
-#: src/archives.c:1044
+#: src/archives.c:1052
#, fuzzy, c-format
msgid ""
"dpkg: package %s requires reinstallation, but will remove anyway as you "
"requested.\n"
msgstr "dpkg:儘管套件 %s 需要重新安裝,但還是應您的要求將其強制移除。\n"
-#: src/archives.c:1047
+#: src/archives.c:1055
#, c-format
msgid "dpkg: package %s requires reinstallation, will not remove.\n"
msgstr "dpkg:套件 %s 需要重新安裝,將不會被移除。\n"
-#: src/archives.c:1054
+#: src/archives.c:1062
#, c-format
msgid "package %s has too many Conflicts/Replaces pairs"
msgstr "套件 %s 有太多的 衝突/替換 組合"
-#: src/archives.c:1060
+#: src/archives.c:1068
#, c-format
msgid "dpkg: yes, will remove %s in favour of %s.\n"
msgstr "dpkg:好的,為了 %2$s 將會移除 %1$s。\n"
-#: src/archives.c:1071
+#: src/archives.c:1079
#, c-format
msgid "conflicting packages - not installing %.250s"
msgstr "套件衝突 - 將不安裝 %.250s"
-#: src/archives.c:1072
+#: src/archives.c:1080
#, fuzzy
msgid "ignoring conflict, may proceed anyway!"
msgstr "dpkg:警告 - 忽略衝突,將強制繼續安裝!\n"
-#: src/archives.c:1113
+#: src/archives.c:1121
#, c-format
msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --recursive 需要至少一個路徑作為參數"
-#: src/archives.c:1123
+#: src/archives.c:1131
#, fuzzy
msgid "find for dpkg --recursive"
msgstr "無法為 --recursive 選項執行 find"
-#: src/archives.c:1145
+#: src/archives.c:1153
msgid "failed to fdopen find's pipe"
msgstr "無法 fdopen find 的管線"
-#: src/archives.c:1151
+#: src/archives.c:1159
msgid "error reading find's pipe"
msgstr "在讀取 find 的管線時發生錯誤"
-#: src/archives.c:1152
+#: src/archives.c:1160
msgid "error closing find's pipe"
msgstr "在關閉 find 的管線時發生錯誤"
-#: src/archives.c:1155
+#: src/archives.c:1163
#, c-format
msgid "find for --recursive returned unhandled error %i"
msgstr "--recursive 選項所呼叫的 find 返回了未被處理的錯誤 %i"
-#: src/archives.c:1158
+#: src/archives.c:1166
msgid "searched, but found no packages (files matching *.deb)"
msgstr "已進行搜尋,但是沒有找到任何套件(即符合 *.deb 的檔案)"
-#: src/archives.c:1174
+#: src/archives.c:1182
#, c-format
msgid "--%s needs at least one package archive file argument"
msgstr "--%s 需要至少一個套件檔作為參數"
-#: src/archives.c:1206 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
+#: src/archives.c:1214 src/enquiry.c:151 src/enquiry.c:256 src/enquiry.c:399
#: src/enquiry.c:401 src/enquiry.c:410 src/main.c:62 src/main.c:154
-#: src/main.c:250 src/main.c:417 src/packages.c:233 src/query.c:186
+#: src/main.c:250 src/main.c:417 src/packages.c:249 src/query.c:186
#: src/query.c:283 src/query.c:322 src/query.c:331 src/query.c:378
#: src/query.c:441 src/query.c:576 src/query.c:620 src/select.c:77
#: src/statcmd.c:66 src/statcmd.c:96 src/trigcmd.c:60 src/trigcmd.c:92
@@ -1495,33 +1495,33 @@ msgstr "--%s 需要至少一個套件檔作為參數"
msgid "<standard output>"
msgstr ""
-#: src/archives.c:1207 src/packages.c:234 src/query.c:187 src/query.c:281
+#: src/archives.c:1215 src/packages.c:250 src/query.c:187 src/query.c:281
#: src/query.c:384 src/query.c:442 src/select.c:78 dpkg-split/main.c:196
#: dpkg-split/queue.c:199
msgid "<standard error>"
msgstr ""
-#: src/archives.c:1248
+#: src/archives.c:1256
#, c-format
msgid "Selecting previously deselected package %s.\n"
msgstr "選取了原先未被選取的套件 %s。\n"
-#: src/archives.c:1253
+#: src/archives.c:1261
#, c-format
msgid "Skipping deselected package %s.\n"
msgstr "略過未被選取的套件 %s。\n"
-#: src/archives.c:1270
+#: src/archives.c:1278
#, c-format
msgid "Version %.250s of %.250s already installed, skipping.\n"
msgstr "已有安裝 %.250s 版的 %.250s,略過。\n"
-#: src/archives.c:1281
+#: src/archives.c:1289
#, fuzzy, c-format
msgid "downgrading %.250s from %.250s to %.250s."
msgstr "%s - 警告:即將把 %.250s 從 %.250s 降級到 %.250s。\n"
-#: src/archives.c:1286
+#: src/archives.c:1294
#, c-format
msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
msgstr "將不會把 %.250s 從 %.250s 降級到 %.250s,略過。\n"
@@ -2331,51 +2331,51 @@ msgstr "無法設定 `%.250s' 的執行權限"
msgid "unable to setenv for maintainer script"
msgstr "無法在 maint script 上進行 setenv"
-#: src/help.c:289
+#: src/help.c:290
#, fuzzy, c-format
msgid "installed %s script"
msgstr "原先的 %s script"
-#: src/help.c:302 src/help.c:368 src/help.c:427
+#: src/help.c:303 src/help.c:369 src/help.c:428
#, c-format
msgid "unable to stat %s `%.250s'"
msgstr "無法取得 %s `%.250s' 的狀態"
-#: src/help.c:354 src/help.c:414
+#: src/help.c:355 src/help.c:415
#, c-format
msgid "new %s script"
msgstr "新的 %s script"
-#: src/help.c:388
+#: src/help.c:389
#, c-format
msgid "old %s script"
msgstr "原先的 %s script"
-#: src/help.c:402
+#: src/help.c:403
#, fuzzy, c-format
msgid "unable to stat %s '%.250s': %s"
msgstr "無法取得 %s `%.250s' 的狀態"
-#: src/help.c:411
+#: src/help.c:412
#, c-format
msgid "dpkg - trying script from the new package instead ...\n"
msgstr "dpkg - 試著替而使用新套件所附帶的 script ...\n"
-#: src/help.c:425
+#: src/help.c:426
msgid "there is no script in the new version of the package - giving up"
msgstr "新版本的套件裡並沒有 script - 取消操作"
-#: src/help.c:431
+#: src/help.c:432
#, c-format
msgid "dpkg: ... it looks like that went OK.\n"
msgstr "dpkg:... 看起來它能正確執行。\n"
-#: src/help.c:577
+#: src/help.c:578
#, fuzzy, c-format
msgid "unable to securely remove '%.255s'"
msgstr "無法建立 `%.255s'"
-#: src/help.c:582 dpkg-deb/info.c:63
+#: src/help.c:583 dpkg-deb/info.c:63
msgid "failed to exec rm for cleanup"
msgstr "無法執行 rm 以進行清理"
@@ -2776,28 +2776,28 @@ msgstr "在第 %d 行結束之前有預期之外的 eof"
msgid "need an action option"
msgstr "欠缺操作選項"
-#: src/packages.c:75
+#: src/packages.c:113
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr "您必須使用套件本身的名字,而不是直接引用完整的檔案名稱"
+
+#: src/packages.c:134
#, c-format
msgid "--%s --pending does not take any non-option arguments"
msgstr "--%s --pending 不需任何不是選項的參數"
-#: src/packages.c:113 src/query.c:300 src/query.c:537
+#: src/packages.c:139 src/query.c:300 src/query.c:537
#, c-format
msgid "--%s needs at least one package name argument"
msgstr "--%s 需要至少一個套件名稱作為參數"
-#: src/packages.c:120
-msgid ""
-"you must specify packages by their own names, not by quoting the names of "
-"the files they come in"
-msgstr "您必須使用套件本身的名字,而不是直接引用完整的檔案名稱"
-
-#: src/packages.c:162
+#: src/packages.c:178
#, c-format
msgid "Package %s listed more than once, only processing once.\n"
msgstr "套件 %s 被列出多次,但只會被處理一次。\n"
-#: src/packages.c:166
+#: src/packages.c:182
#, c-format
msgid ""
"More than one copy of package %s has been unpacked\n"
@@ -2806,7 +2806,7 @@ msgstr ""
"在此次執行中,同時解開了套件 %s 的多個副本!\n"
" 但只會設定一次。\n"
-#: src/packages.c:211
+#: src/packages.c:227
#, c-format
msgid ""
"package %.250s is not ready for trigger processing\n"
@@ -2815,76 +2815,76 @@ msgstr ""
"套件 %.250s 還沒準備好要處理觸發程式\n"
" (目前的狀態為 `%.250s',且沒有尚待進行的觸發程式)"
-#: src/packages.c:307
+#: src/packages.c:323
#, c-format
msgid " Package %s which provides %s is to be removed.\n"
msgstr " 提供了 %2$s 的套件 %1$s 即將被移除。\n"
-#: src/packages.c:310
+#: src/packages.c:326
#, c-format
msgid " Package %s is to be removed.\n"
msgstr " 即將移除套件 %s。\n"
-#: src/packages.c:327
+#: src/packages.c:343
#, c-format
msgid " Version of %s on system is %s.\n"
msgstr " %s 在系統上的版本為 %s。\n"
-#: src/packages.c:348
+#: src/packages.c:364
#, c-format
msgid " Package %s which provides %s awaits trigger processing.\n"
msgstr " 提供了 %2$s 的套件 %1$s 正要執行觸發程式。\n"
-#: src/packages.c:352
+#: src/packages.c:368
#, c-format
msgid " Package %s awaits trigger processing.\n"
msgstr " 套件 %s 正要執行觸發程式。\n"
-#: src/packages.c:383
+#: src/packages.c:399
#, c-format
msgid "dpkg: also configuring `%s' (required by `%s')\n"
msgstr "dpkg:也同時設定 `%s'(此為 `%s' 所要求的)\n"
-#: src/packages.c:389
+#: src/packages.c:405
#, c-format
msgid " Package %s which provides %s is not configured yet.\n"
msgstr " 提供了 %2$s 的套件 %1$s 尚未設定。\n"
-#: src/packages.c:392
+#: src/packages.c:408
#, c-format
msgid " Package %s is not configured yet.\n"
msgstr " %s 套件尚未設定。\n"
-#: src/packages.c:403
+#: src/packages.c:419
#, c-format
msgid " Package %s which provides %s is not installed.\n"
msgstr " 未曾安裝提供了 %2$s 的套件 %1$s。\n"
-#: src/packages.c:406
+#: src/packages.c:422
#, c-format
msgid " Package %s is not installed.\n"
msgstr " 未曾安裝套件 `%s'。\n"
-#: src/packages.c:443
+#: src/packages.c:459
#, c-format
msgid " %s (%s) breaks %s and is %s.\n"
msgstr " %s(%s)損毀了 %s,且已 %s。\n"
-#: src/packages.c:451
+#: src/packages.c:467
#, c-format
msgid " %s (%s) provides %s.\n"
msgstr " %s(%s)提供了 %s。\n"
-#: src/packages.c:456
+#: src/packages.c:472
#, c-format
msgid " Version of %s to be configured is %s.\n"
msgstr " %s 要進行設定的版本是 %s。\n"
-#: src/packages.c:555
+#: src/packages.c:571
msgid " depends on "
msgstr " 相依於 "
-#: src/packages.c:561
+#: src/packages.c:577
msgid "; however:\n"
msgstr "﹔然而:\n"
@@ -2892,38 +2892,38 @@ msgstr "﹔然而:\n"
msgid "(no description available)"
msgstr "(無相關介紹)"
-#: src/processarc.c:127
+#: src/processarc.c:134
msgid "cannot access archive"
msgstr "無法存取套件檔"
-#: src/processarc.c:139
+#: src/processarc.c:146
#, c-format
msgid "error ensuring `%.250s' doesn't exist"
msgstr "在確保檔案 `%.250s' 是否存在時發生錯誤"
-#: src/processarc.c:144
+#: src/processarc.c:151
msgid "failed to exec dpkg-split to see if it's part of a multiparter"
msgstr "無法執行 dpkg-split 以判斷它是否為套件檔中的一個分割檔"
-#: src/processarc.c:152
+#: src/processarc.c:159
msgid "reassembled package file"
msgstr "重新組裝成的套件檔"
-#: src/processarc.c:167
+#: src/processarc.c:174
#, c-format
msgid "Authenticating %s ...\n"
msgstr "正在驗証 %s ...\n"
-#: src/processarc.c:172
+#: src/processarc.c:179
msgid "failed to execl debsig-verify"
msgstr "無法 execl debsig-verify"
-#: src/processarc.c:179
+#: src/processarc.c:186
#, c-format
msgid "Verification on package %s failed!"
msgstr "套件 %s 沒有通過驗証!"
-#: src/processarc.c:181
+#: src/processarc.c:188
#, c-format
msgid ""
"Verification on package %s failed,\n"
@@ -2932,31 +2932,31 @@ msgstr ""
"雖然套件 %s 未能通過驗証,\n"
"但還是應您的要求強制進行安裝。\n"
-#: src/processarc.c:184
+#: src/processarc.c:191
#, c-format
msgid "passed\n"
msgstr "通過\n"
-#: src/processarc.c:195
+#: src/processarc.c:202
#, fuzzy
msgid "unable to create temporary directory"
msgstr "無法為臨時目錄命名"
-#: src/processarc.c:222
+#: src/processarc.c:229
msgid "failed to exec dpkg-deb to extract control information"
msgstr "無法執行 dpkg-deb 以擷取 control 資訊"
-#: src/processarc.c:248
+#: src/processarc.c:255
#, c-format
msgid "Recorded info about %s from %s.\n"
msgstr "從 %2$s 獲得關於 %1$s 的 info 記錄。\n"
-#: src/processarc.c:257
+#: src/processarc.c:264
#, c-format
msgid "package architecture (%s) does not match system (%s)"
msgstr "套件的系統平台 (%s) 與本機系統 (%s) 不符"
-#: src/processarc.c:312
+#: src/processarc.c:319
#, c-format
msgid ""
"dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2965,98 +2965,98 @@ msgstr ""
"dpkg:由於 %s 包含了 %s,預先相依問題:\n"
"%s"
-#: src/processarc.c:315
+#: src/processarc.c:322
#, c-format
msgid "pre-dependency problem - not installing %.250s"
msgstr "預先相依問題 - 將不安裝 %.250s"
-#: src/processarc.c:316
+#: src/processarc.c:323
#, fuzzy
msgid "ignoring pre-dependency problem!"
msgstr "dpkg:警告 - 忽視了預先相依問題!\n"
-#: src/processarc.c:331
+#: src/processarc.c:338
#, c-format
msgid "Preparing to replace %s %s (using %s) ...\n"
msgstr "正準備替換 %s %s(使用 %s)...\n"
-#: src/processarc.c:337
+#: src/processarc.c:344
#, c-format
msgid "Unpacking %s (from %s) ...\n"
msgstr "正在解開 %s (從 %s)...\n"
-#: src/processarc.c:366
+#: src/processarc.c:373
#, c-format
msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
msgstr "conffile 的檔案名(開頭是 `%.250s')過長(> %d 個字元)"
-#: src/processarc.c:419
+#: src/processarc.c:426
#, c-format
msgid "read error in %.250s"
msgstr "在 %.250s 中發生讀取錯誤"
-#: src/processarc.c:421
+#: src/processarc.c:428
#, c-format
msgid "error closing %.250s"
msgstr "在關閉 %.250s 時發生錯誤"
-#: src/processarc.c:423
+#: src/processarc.c:430
#, c-format
msgid "error trying to open %.250s"
msgstr "在試圖開啟 %.250s 時發生錯誤"
-#: src/processarc.c:459
+#: src/processarc.c:466
#, c-format
msgid "De-configuring %s, to allow removal of %s ...\n"
msgstr "正在清除 %s 的設定,為了能移除 %s ...\n"
-#: src/processarc.c:462
+#: src/processarc.c:469
#, c-format
msgid "De-configuring %s ...\n"
msgstr "正在刪除 %s 的設定...\n"
-#: src/processarc.c:537
+#: src/processarc.c:544
#, c-format
msgid "Unpacking replacement %.250s ...\n"
msgstr "正在解開替換的套件檔 %.250s ...\n"
-#: src/processarc.c:618
+#: src/processarc.c:625
msgid "unable to exec dpkg-deb to get filesystem archive"
msgstr "無法執行 dpkg-deb 以取得檔案系統上的套件檔"
-#: src/processarc.c:632
+#: src/processarc.c:639
msgid "error reading dpkg-deb tar output"
msgstr "在讀取 dpkg-deb 輸出的 tar 檔時發生錯誤"
-#: src/processarc.c:634
+#: src/processarc.c:641
msgid "corrupted filesystem tarfile - corrupted package archive"
msgstr "檔案系統上的 tar 檔已損壞 - 套件檔已毀損"
-#: src/processarc.c:637
+#: src/processarc.c:644
msgid "dpkg-deb: zap possible trailing zeros"
msgstr "dpkg-deb:截掉了可能會出現在結尾的字元 0"
-#: src/processarc.c:699
+#: src/processarc.c:706
#, fuzzy, c-format
msgid "could not stat old file '%.250s' so not deleting it: %s"
msgstr "dpkg:警告 - 無法取得原有的檔案 `%.250s' 的資訊,所以不會刪除:%s"
-#: src/processarc.c:705
+#: src/processarc.c:712
#, fuzzy, c-format
msgid "unable to delete old directory '%.250s': %s"
msgstr "dpkg:警告 - 無法刪除原有的目錄 `%.250s':%s\n"
-#: src/processarc.c:708
+#: src/processarc.c:715
#, fuzzy, c-format
msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
msgstr "dpkg:警告 - 原本的 conffile `%.250s' 是空目錄(現已刪除)\n"
-#: src/processarc.c:750
+#: src/processarc.c:757
#, c-format
msgid "unable to stat other new file `%.250s'"
msgstr "無法取得其它新檔案 `%.250s' 的資訊"
-#: src/processarc.c:761
+#: src/processarc.c:768
#, fuzzy, c-format
msgid ""
"old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3064,65 +3064,65 @@ msgid ""
msgstr ""
"dpkg:警告 - 舊檔案 `%.250s' 與數個新檔案相同!(`%.250s' 以及 `%.250s')\n"
-#: src/processarc.c:800
+#: src/processarc.c:807
#, fuzzy, c-format
msgid "unable to securely remove old file '%.250s': %s"
msgstr "dpkg:警告 - 無法 %s 原有的檔案 `%%.250s':%%s\n"
-#: src/processarc.c:834 src/processarc.c:1085 src/query.c:486 src/remove.c:272
+#: src/processarc.c:841 src/processarc.c:1110 src/query.c:486 src/remove.c:272
msgid "cannot read info directory"
msgstr "無法讀取 info 目錄"
-#: src/processarc.c:847
+#: src/processarc.c:854
#, c-format
msgid "old version of package has overly-long info file name starting `%.250s'"
msgstr "原先版本的套件中包含了名稱過長的 info 檔,其開頭為 `%.250s'"
-#: src/processarc.c:859
+#: src/processarc.c:879
#, c-format
msgid "unable to remove obsolete info file `%.250s'"
msgstr "無法移除廢棄的 info 檔 `%.250s'"
-#: src/processarc.c:862
+#: src/processarc.c:883
#, c-format
msgid "unable to install (supposed) new info file `%.250s'"
msgstr "無法安裝(被認定為)新的 info 檔 `%.250s'"
-#: src/processarc.c:869
+#: src/processarc.c:894
msgid "unable to open temp control directory"
msgstr "無法開啟暫存的 control 目錄"
-#: src/processarc.c:878
+#: src/processarc.c:903
#, c-format
msgid "package contains overly-long control info file name (starting `%.50s')"
msgstr "套件的 control 資訊中包含了名稱過長的檔案(其開頭為 `%.250s')"
-#: src/processarc.c:883
+#: src/processarc.c:908
#, c-format
msgid "package control info contained directory `%.250s'"
msgstr "套件的 control 資訊中包含了目錄 `%.250s'"
-#: src/processarc.c:885
+#: src/processarc.c:910
#, c-format
msgid "package control info rmdir of `%.250s' didn't say not a dir"
msgstr "套件 control 資訊 rmdir 了 `%.250s' 但沒有說這不是一個目錄"
-#: src/processarc.c:891
+#: src/processarc.c:916
#, fuzzy, c-format
msgid "package %s contained list as info file"
msgstr "dpkg:警告 - 套件 %s 裡的列表被當作 info 檔使用"
-#: src/processarc.c:897
+#: src/processarc.c:922
#, c-format
msgid "unable to install new info file `%.250s' as `%.250s'"
msgstr "無法把新的 info 檔 `%.250s' 安裝為 `%.250s'"
-#: src/processarc.c:1064
+#: src/processarc.c:1089
#, c-format
msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
msgstr "(注意到 %s 已經不復存在,它已被完全取代了。)\n"
-#: src/processarc.c:1101
+#: src/processarc.c:1126
#, c-format
msgid "unable to delete disappearing control info file `%.250s'"
msgstr "無法刪除已經消失了的 control 資訊檔 `%.250s'"
@@ -3743,7 +3743,7 @@ msgstr "dpkg-trigger:不合法的等待套件名稱 `%.250s':%.250s"
msgid "invalid trigger name `%.250s': %.250s"
msgstr "dpkg-trigger:不正確的觸發程式名稱 `%.250s':%.250s"
-#: src/trigproc.c:235
+#: src/trigproc.c:246
#, c-format
msgid ""
"%s: cycle found while processing triggers:\n"
@@ -3752,7 +3752,7 @@ msgstr ""
"%s: 在處理觸發程式時發生循環:\n"
" 可能是因為這些連鎖套件所附帶的觸發程式所引起的:\n"
-#: src/trigproc.c:243
+#: src/trigproc.c:254
#, c-format
msgid ""
"\n"
@@ -3761,11 +3761,11 @@ msgstr ""
"\n"
" 套件尚待進行的觸發程式(有可能)無法解決:\n"
-#: src/trigproc.c:266
+#: src/trigproc.c:277
msgid "triggers looping, abandoned"
msgstr "觸發程式陷入迴圈,已放棄執行"
-#: src/trigproc.c:293
+#: src/trigproc.c:304
#, c-format
msgid "Processing triggers for %s ...\n"
msgstr "正在進行 %s 的觸發程式 ...\n"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 49020f306..542cc5d60 100644
--- a/scripts/po/ca.po
+++ b/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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
@@ -16,13 +16,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
+#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr "Debian %s versió %s.\n"
@@ -37,11 +38,12 @@ msgstr ""
"Copyright © 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
"Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>."
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -74,10 +76,10 @@ msgid ""
" --version show the version.\n"
msgstr ""
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
msgstr ""
@@ -114,7 +116,37 @@ msgstr ""
msgid "%s is not a supported variable name"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildflags.pl:33
+msgid ""
+"\n"
+"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:44
+#, perl-format
+msgid ""
+"Usage: %s [<action>]\n"
+"\n"
+"Actions:\n"
+" --get <flag> output the requested flag to stdout.\n"
+" --origin <flag> output the origin of the flag to stdout:\n"
+" value is one of vendor, system, user, env.\n"
+" --list output a list of the flags supported by the current "
+"vendor.\n"
+" --help show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:61 scripts/dpkg-buildflags.pl:66
+#, perl-format
+msgid "two commands specified: --%s and --%s"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:80
+msgid "need an action option"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl:39
#, fuzzy
msgid ""
"\n"
@@ -126,7 +158,7 @@ msgstr ""
"Copyright © 1996 Ian Jackson.\n"
"Copyright © 2000, 2001 Wichert Akkerman."
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, perl-format
msgid ""
"\n"
@@ -181,147 +213,142 @@ msgid ""
" --version show the version.\n"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, fuzzy, perl-format
msgid "unknown option or argument %s"
msgstr "la variable de substitució ${%s} és desconeguda"
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, fuzzy, perl-format
msgid "cannot combine %s and %s"
msgstr "no es pot combinar -b o -B amb -S"
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:234
+#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:253
+#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:256
+#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:275
#, perl-format
-msgid "%s: use %s from environment: %s\n"
+msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
msgstr ""
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:298
+#: scripts/dpkg-buildpackage.pl:285
msgid "source version"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:308
+#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:326
+#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr ""
@@ -360,7 +387,7 @@ msgstr "%s: Dependències de construcció no satisfetes: "
msgid "%s: Build conflicts: "
msgstr "%s: Conflictes de construcció: "
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr "s'ha produït un error en analitzar %s"
@@ -392,27 +419,27 @@ msgstr ""
msgid "filename, section and priority may contain no whitespace"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr ""
@@ -559,13 +586,13 @@ msgstr ""
msgid "write original source message"
msgstr ""
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
msgstr ""
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
msgstr "manca informació per al camp d'eixida %s"
@@ -652,12 +679,12 @@ msgid ""
"architecture all"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
@@ -665,36 +692,36 @@ msgstr ""
msgid "cannot fork for %s"
msgstr "no es pot combinar -b o -B amb -S"
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
msgstr ""
@@ -790,6 +817,48 @@ msgstr ""
msgid "no debian/symbols file used as basis for generating %s"
msgstr ""
+#: scripts/dpkg-mergechangelogs.pl:53
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+
+#: scripts/dpkg-mergechangelogs.pl:56
+#, 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 ""
+"\n"
+"Aquest és programari lliure; vegeu la Llicència Pública General GNU versió 2 "
+"o posterior per a les condicions de còpia. NO hi ha garantia.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: 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:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, fuzzy, perl-format
+msgid "cannot write %s"
+msgstr "no es pot combinar -b o -B amb -S"
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -819,7 +888,7 @@ msgstr "no es pot combinar -b o -B amb -S"
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, fuzzy, perl-format
msgid "cannot open %s"
msgstr "no es pot combinar -b o -B amb -S"
@@ -1310,37 +1379,38 @@ msgstr "no es pot combinar -b o -B amb -S"
msgid "directory argument %s is not a directory"
msgstr ""
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, perl-format
msgid "using options from %s: %s"
msgstr ""
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
msgstr ""
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr ""
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
msgstr ""
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
msgstr ""
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
msgstr ""
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -1351,18 +1421,23 @@ msgstr ""
msgid "cannot read %s"
msgstr ""
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
+#, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:324
#, perl-format
msgid "can't build with source format '%s': %s"
msgstr ""
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
msgstr ""
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1370,43 +1445,43 @@ msgstr ""
msgid "building %s in %s"
msgstr "%s: s'està construint %s a %s"
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
msgstr ""
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr ""
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
msgstr ""
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr ""
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
msgstr ""
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr "s'està extraient el paquet font sense signar (%s)"
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, fuzzy, perl-format
msgid "extracting %s in %s"
msgstr "%s: s'està extraient %s a %s"
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr ""
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
#, fuzzy
msgid ""
"\n"
@@ -1418,7 +1493,7 @@ msgstr ""
"Copyright © 1996 Ian Jackson.\n"
"Copyright © 2000, 2001 Wichert Akkerman."
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1431,7 +1506,7 @@ msgid ""
" used to build the source package."
msgstr ""
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, perl-format
msgid ""
"Build options:\n"
@@ -1453,7 +1528,7 @@ msgid ""
" supported are: '1'-'9', 'best', 'fast')"
msgstr ""
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1463,14 +1538,14 @@ msgid ""
"signature"
msgstr ""
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
msgid ""
"General options:\n"
" -h, --help show this help message.\n"
" --version show the version."
msgstr ""
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
@@ -1552,26 +1627,21 @@ msgid ""
"Unknown gcc system type %s, falling back to default (native compilation)"
msgstr ""
+#: scripts/Dpkg/BuildFlags.pm:197
+#, perl-format
+msgid "line %d of %s mentions unknown flag %s"
+msgstr ""
+
+#: scripts/Dpkg/BuildFlags.pm:206
+#, perl-format
+msgid "line %d of %s is invalid, it has been ignored."
+msgstr ""
+
#: scripts/Dpkg/BuildOptions.pm:91
#, perl-format
msgid "invalid flag in %s: %s"
msgstr ""
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
-#, fuzzy, perl-format
-msgid "cannot write %s"
-msgstr "no es pot combinar -b o -B amb -S"
-
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
@@ -2042,7 +2112,7 @@ msgstr ""
msgid "cannot create directory %s"
msgstr "no es pot combinar -b o -B amb -S"
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, fuzzy, perl-format
msgid "cannot opendir %s"
@@ -2255,7 +2325,7 @@ msgstr ""
msgid "nonexistent"
msgstr ""
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
msgstr ""
@@ -2289,97 +2359,97 @@ msgstr ""
msgid "named socket"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
msgstr ""
"no s'ha pogut verificar la signatura de %s perquè gpg no està instal·lat"
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2388,127 +2458,127 @@ msgstr ""
msgid "unpacking %s"
msgstr "s'està desempaquetant %s"
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr "s'està aplicant %s"
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, fuzzy, perl-format
msgid "cannot stat orig argument %s"
msgstr "la variable de substitució ${%s} és desconeguda"
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
"orig.tar.<ext>)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
"orig/)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
"s wants something"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
"override"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
@@ -2516,35 +2586,35 @@ msgstr ""
msgid "unable to change permission of `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, fuzzy, perl-format
msgid "building %s using existing %s"
msgstr "%s: s'està construint %s a %s"
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
"sP to override"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
msgstr "%s: hi ha canvis no representables al font"
@@ -2854,16 +2924,16 @@ msgstr ""
msgid "%s is not a valid version"
msgstr ""
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr ""
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
msgstr ""
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
msgstr ""
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 641b7bcd9..dd9446023 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,23 +6,23 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg scripts\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-04-20 22:17+0200\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr "Debian %s Version %s.\n"
@@ -37,11 +37,11 @@ msgstr ""
"Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
#: scripts/changelog/debian.pl:39
msgid ""
"\n"
@@ -50,7 +50,7 @@ msgid ""
msgstr ""
"\n"
"Dies ist freie Software; lesen Sie die GNU General Public License Version 2\n"
-"oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.\n"
+"oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung.\n"
#: scripts/dpkg-architecture.pl:49
#, perl-format
@@ -79,47 +79,47 @@ msgstr ""
"Optionen:\n"
" -a<Debian-Arch> setze die aktuelle Debian-Architektur.\n"
" -t<GNU-System> setze den aktuellen GNU-Systemtyp.\n"
-" -L liste gltige Architekturen auf.\n"
-" -f Zwang-Schalter (berschreibe in der Umgebung gesetzte\n"
+" -L liste gültige Architekturen auf.\n"
+" -f Zwang-Schalter (überschreibe in der Umgebung gesetzte\n"
" Variablen).\n"
"\n"
"Aktionen:\n"
" -l liste Variablen auf (voreingestellt).\n"
" -e<Debian-Arch> vergleiche mit aktueller Debian-Architektur.\n"
-" -i<Arch-Alias> prfe, ob aktuelle Debian-Architektur <Arch-Alias> "
+" -i<Arch-Alias> prüfe, ob aktuelle Debian-Architektur <Arch-Alias> "
"ist.\n"
" -q<Variable> gibt nur den Wert der <Variable>n aus.\n"
" -s gibt den Befehl zum Setzen von Umgebungsvariablen aus.\n"
-" -u gibt den Befehl zum Lschen von Umgebungsvariablen "
+" -u gibt den Befehl zum Löschen von Umgebungsvariablen "
"aus.\n"
-" -c <Befehl> setzt Umgebung und fhrt darin den Befehl aus.\n"
+" -c <Befehl> setzt Umgebung und führt darin den Befehl aus.\n"
" --help zeigt diese Hilfemeldung.\n"
" --version zeigt die Version.\n"
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
-msgstr "unbekannte Option %s"
+msgstr "unbekannte Option »%s«"
#: scripts/dpkg-architecture.pl:144
#, perl-format
msgid "unknown Debian architecture %s, you must specify GNU system type, too"
msgstr ""
-"unbekannte Debian-Architektur %s, Sie mssen auch den GNU-Systemtyp angeben"
+"unbekannte Debian-Architektur %s, Sie müssen auch den GNU-Systemtyp angeben"
#: scripts/dpkg-architecture.pl:151
#, perl-format
msgid "unknown GNU system type %s, you must specify Debian architecture, too"
msgstr ""
-"unbekannter GNU-Systemtyp %s, Sie mssen auch die Debian-Architektur angeben"
+"unbekannter GNU-Systemtyp %s, Sie müssen auch die Debian-Architektur angeben"
#: scripts/dpkg-architecture.pl:158
#, perl-format
msgid "unknown default GNU system type for Debian architecture %s"
-msgstr "unbekannter Standard-GNU-Systemtyp fr Debian-Architektur %s"
+msgstr "unbekannter Standard-GNU-Systemtyp für Debian-Architektur %s"
#: scripts/dpkg-architecture.pl:161
#, perl-format
@@ -127,7 +127,7 @@ msgid ""
"Default GNU system type %s for Debian arch %s does not match specified GNU "
"system type %s"
msgstr ""
-"Standard GNU-Systemtyp %s fr Debian-Architektur %s passt nicht auf "
+"Standard GNU-Systemtyp %s für Debian-Architektur %s passt nicht auf "
"angegebenen GNU-Systemtyp %s"
#: scripts/dpkg-architecture.pl:172
@@ -138,7 +138,7 @@ msgstr "Angegebener GNU-Systemtyp %s passt nicht auf gcc-Systemtyp %s."
#: scripts/dpkg-architecture.pl:214
#, perl-format
msgid "%s is not a supported variable name"
-msgstr "%s ist kein untersttzter Variablenname"
+msgstr "%s ist kein unterstützter Variablenname"
#: scripts/dpkg-buildflags.pl:33
msgid ""
@@ -167,9 +167,9 @@ msgstr ""
"Aktionen:\n"
" --get <Schalter> den angegebenen Schalter nach Stdout ausgeben\n"
" --origin <Schalter> die Quelle des Schalters nach Stdout ausgeben,\n"
-" mgliche Werte: vendor, system, user, env\n"
+" mögliche Werte: vendor, system, user, env\n"
" --list eine Liste der vom aktuellen Lieferanten (Vendor)\n"
-" untersttzen Schalter ausgeben\n"
+" unterstützen Schalter ausgeben\n"
" --help zeigt diese Hilfemeldung\n"
" --version zeigt die Version\n"
@@ -180,9 +180,9 @@ msgstr "zwei Befehle angegeben: --%s und --%s"
#: scripts/dpkg-buildflags.pl:80
msgid "need an action option"
-msgstr "eine Aktions-Option wird bentigt"
+msgstr "eine Aktions-Option wird benötigt"
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildpackage.pl:39
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson.\n"
@@ -194,7 +194,7 @@ msgstr ""
"Copyright (C) 2000 Wichert Akkerman\n"
"Copyright (C) 2007 Frank Lichtenheld"
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, perl-format
msgid ""
"\n"
@@ -253,89 +253,89 @@ msgstr ""
"\n"
"Optionen:\n"
" -r<root-werde-Befehl>\n"
-" Befehl, um root-Privilegien zu erhalten (standardmig\n"
+" Befehl, um root-Privilegien zu erhalten (standardmäßig\n"
" fakeroot).\n"
-" -R<rules> auszufhrende rules-Datei (Vorgabe: debian/rules).\n"
+" -R<rules> auszuführende rules-Datei (Vorgabe: debian/rules).\n"
" -p<signier-Befehl>\n"
-" -d prfe Bauabhngigkeiten und -konflikte nicht.\n"
-" -D prfe Bauabhngigkeiten und -konflikte.\n"
+" -d prüfe Bauabhängigkeiten und -konflikte nicht.\n"
+" -D prüfe Bauabhängigkeiten und -konflikte.\n"
" -T<Ziel> rufe debian/rules <Ziel> mit der korrekten Umgebung auf\n"
" --as-root stelle sicher, dass -T das Ziel mir root-Rechten aufruft\n"
" -j[<Nummer>] Angabe der simultanen Jobs } an debian/rules weitergegeben\n"
-" -k<Schlssel-ID>\n"
-" Schlssel zum Signieren.\n"
+" -k<Schlüssel-ID>\n"
+" Schlüssel zum Signieren.\n"
" -sgpg der Signier-Befehl wird wie GPG aufgerufen.\n"
" -spgp der Signier-Befehl wird wie PGP aufgerufen.\n"
" -us unsignierte Quellen.\n"
" -uc unsignierte changes.\n"
-" -a<Arch> Debian-Architektur, fr die gebaut wird (impliziert -d).\n"
-" -b nur binr, Quellen nicht bauen. } auch weitergegeben "
+" -a<Arch> Debian-Architektur, für die gebaut wird (impliziert -d).\n"
+" -b nur binär, Quellen nicht bauen. } auch weitergegeben "
"an\n"
-" -B nur binr, keine arch-indep-Dateien. } dpkg-genchanges\n"
-" -A nur binr, nur arch-indep-Dateien. }\n"
-" -S nur Quellen, keine Binrdateien. }\n"
+" -B nur binär, keine arch-indep-Dateien. } dpkg-genchanges\n"
+" -A nur binär, nur arch-indep-Dateien. }\n"
+" -S nur Quellen, keine Binärdateien. }\n"
" -t<System> setze GNU-Systemtyp. } weitergegeben an \n"
" dpkg-architecture\n"
-" -v<Version> nderungen seit Version <Version>. }\n"
+" -v<Version> Änderungen seit Version <Version>. }\n"
" -m<Betr> <Betr> ist Betreuer des Pakets. }\n"
-" -e<Betr> <Betr> ist Betreuer fr die Verffentlichung.} nur an\n"
-" -C<Datei> nderungen sind in <Datei> beschrieben. } dpkg-genchanges\n"
+" -e<Betr> <Betr> ist Betreuer für die Veröffentlichung.} nur an\n"
+" -C<Datei> Änderungen sind in <Datei> beschrieben. } dpkg-genchanges\n"
" } weitergegeben.\n"
" -si (Standard) Quellen enthalten Orig. falls neues Upstream }\n"
" -sa hochgeladene Quellen enthalten immer Orig. }\n"
" -sd hochgeladene Quellen sind nur diff und .dsc}\n"
-" -sn erzwinge Debian native-Quellformat. }\n"
-" -s[sAkurKUR] siehe dpkg-source fr Erklrung. } only passed\n"
+" -sn erzwinge »Debian native«-Quellformat. }\n"
+" -s[sAkurKUR] siehe dpkg-source für Erklärung. } only passed\n"
" -z<Stufe> Kompressionsstufe der Quellen } an dpkg-source\n"
-" -Z<Komprimierer> Fr Quellen zu verwendende Kompression }\n"
-" -nc Quell-Baum nicht subern (impliziert -b).\n"
-" -tc nach Abschluss Quell-Baum subern.\n"
-" -ap Pause vor Beginn des Signaturprozesses einfgen.\n"
+" -Z<Komprimierer> Für Quellen zu verwendende Kompression }\n"
+" -nc Quell-Baum nicht säubern (impliziert -b).\n"
+" -tc nach Abschluss Quell-Baum säubern.\n"
+" -ap Pause vor Beginn des Signaturprozesses einfügen.\n"
" -i[<Regaus>] ignoriere Diffs von auf Regaus passenden Dateien.} nur an\n"
" -I[<Muster>] Dateien beim Tarball-Bauen herausfiltern.} dpkg-source\n"
" } weitergegeben\n"
" --source-option=<Opt>\n"
-"\t\t bergebe Option <opt> an dpkg-source\n"
+"\t\t übergebe Option <opt> an dpkg-source\n"
" --changes-option=<Opt>\n"
-"\t\t bergebe Option <opt> an dpkg-genchanges\n"
+"\t\t übergebe Option <opt> an dpkg-genchanges\n"
" --admindir=<Verz>\n"
-" ndere das administrative Verzeichnis.\n"
+" ändere das administrative Verzeichnis.\n"
" -h, --help zeigt diese Hilfemeldung.\n"
" --version zeige die Version.\n"
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr "-E und -W sind veraltet, sie haben keine Wirkung"
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, perl-format
msgid "unknown option or argument %s"
msgstr "unbekannte Option oder Argument %s"
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, perl-format
msgid "cannot combine %s and %s"
msgstr "kann %s und %s nicht kombinieren"
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr "verwende ein root-werde-Befehl obwohl bereits root"
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
msgstr ""
"Fakeroot nicht gefunden, installieren Sie entweder das Fakeroot-Paket,\n"
"geben Sie einen Befehl mit der Option -r an\n"
-"oder fhren Sie dies als root aus"
+"oder führen Sie dies als root aus"
#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
-msgstr "root-werde-Befehl %s nicht gefunden"
+msgstr "root-werde-Befehl »%s« nicht gefunden"
#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
@@ -344,24 +344,14 @@ msgstr "unbekannter Signier-Befehl, nehme PGP-artige Schnittstelle an"
#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr ""
-"PGP-Untersttzung ist veraltet (lesen Sie README.feature-removal-schedule)"
+"PGP-Unterstützung ist veraltet (lesen Sie README.feature-removal-schedule)"
#: scripts/dpkg-buildpackage.pl:275
#, perl-format
msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
msgstr "%s: exportiere %s aus dpkg-buildflags (Quelle: %s): %s\n"
-#: scripts/dpkg-buildpackage.pl:280
-#, perl-format
-msgid "%s: use %s from environment: %s\n"
-msgstr "%s: verwende %s aus Umgebung: %s\n"
-
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr "%s: setze %s auf Standardwert: %s\n"
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr "Quellpaket"
@@ -371,7 +361,7 @@ msgstr "Quellversion"
#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
-msgstr "Quellen gendert durch"
+msgstr "Quellen geändert durch"
#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
@@ -379,82 +369,82 @@ msgstr "Host-Architektur"
#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
-msgstr "debian/rules ist nicht ausfhrbar: wird korrigiert"
+msgstr "debian/rules ist nicht ausführbar: wird korrigiert"
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
-msgstr "Bauabhngigkeiten/-konflikte nicht erfllt; Abbruch"
+msgstr "Bauabhängigkeiten/-konflikte nicht erfüllt; Abbruch"
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
-msgstr "(Verwenden Sie -d, um sich darber hinwegzusetzen.)"
+msgstr "(Verwenden Sie -d, um sich darüber hinwegzusetzen.)"
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr "Dies ist eine mit -S nicht fatale Warnung, allerdings"
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr "wird sie wahrscheinlich in der Zukunft fatal werden."
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
msgstr ""
"Es ist keine gute Idee, ein Quellpaket zu erstellen, ohne vorher "
-"aufzurumen; es knnte nicht gewnschte Dateien enthalten."
+"aufzuräumen; es könnte nicht gewünschte Dateien enthalten."
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
-msgstr "Drcken Sie die Eingabetaste um den Signaturprozess zu starten\n"
+msgstr "Drücken Sie die Eingabetaste um den Signaturprozess zu starten\n"
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr "Konnte .dsc- und .changes-Datei nicht signieren"
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr "schreibe changes-Datei"
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr "dpkg-genchanges"
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr "nur Quellen hochzuladen: Debian-native-Paket"
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr "nur Quellen, nur Diff hochzuladen (Originalquellen NICHT enthalten)"
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr "Nur Quellen hochzuladen (Originalquellen enthalten)"
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr "Alles hochzuladen (Originalquellen enthalten)"
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
-msgstr "Binrpaket(e) hochzuladen (keine Quellen enthalten)"
+msgstr "Binärpaket(e) hochzuladen (keine Quellen enthalten)"
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr "Alles hochzuladen; Debian-native-Paket (komplette Quellen enthalten)"
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
-msgstr "Binr und Diff hochzuladen (Originalquellen NICHT enthalten)"
+msgstr "Binär und Diff hochzuladen (Originalquellen NICHT enthalten)"
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr "Fehler beim Signieren der .changes-Datei"
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr "kann %s nicht bestimmen"
@@ -478,13 +468,13 @@ msgid ""
" --version show the version."
msgstr ""
"Optionen:\n"
-" -B nur binr, ignoriere -Indep.\n"
-" -d Bau-Abh verwende die bergebene Zeichenkette als Bauabhngigkeiten\n"
+" -B nur binär, ignoriere -Indep.\n"
+" -d Bau-Abh verwende die übergebene Zeichenkette als Bauabhängigkeiten\n"
" statt sie aus der Steuerdatei auszulesen\n"
-" -c Bau-Konf verwende die bergebene Zeichenkette als Baukonflikte statt\n"
+" -c Bau-Konf verwende die übergebene Zeichenkette als Baukonflikte statt\n"
" sie aus der Steuerdatei auszulesen\n"
" --admindir=<Verzeichnis>\n"
-" ndere das administrative Verzeichnis.\n"
+" ändere das administrative Verzeichnis.\n"
" -h, --help zeige diese Hilfe.\n"
" --version zeige die Version."
@@ -492,20 +482,20 @@ msgstr ""
msgid ""
"<control-file> is the control file to process (default: debian/control)."
msgstr ""
-"<Steuerdatei> ist die zu verarbeitende Steuerdatei (standardmig debian/"
+"<Steuerdatei> ist die zu verarbeitende Steuerdatei (standardmäßig debian/"
"control)."
#: scripts/dpkg-checkbuilddeps.pl:105
#, perl-format
msgid "%s: Unmet build dependencies: "
-msgstr "%s: Nicht erfllte Bauabhngigkeiten: "
+msgstr "%s: Nicht erfüllte Bauabhängigkeiten: "
#: scripts/dpkg-checkbuilddeps.pl:109
#, perl-format
msgid "%s: Build conflicts: "
msgstr "%s: Baukonflikte: "
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr "Fehler beim Parsen von %s"
@@ -528,7 +518,7 @@ msgid ""
" -h, --help show this help message.\n"
" --version show the version.\n"
msgstr ""
-"Aufruf: %s [<Option>...] <Dateiname> <Bereich> <Prioritt>\n"
+"Aufruf: %s [<Option>...] <Dateiname> <Bereich> <Priorität>\n"
"\n"
"Optionen:\n"
" -f<Dateilistedatei> Dateien hierin statt in debian/files schreiben.\n"
@@ -537,33 +527,33 @@ msgstr ""
#: scripts/dpkg-distaddfile.pl:72
msgid "need exactly a filename, section and priority"
-msgstr "bentige genau einen Dateinamen, Bereich und eine Prioritt"
+msgstr "benötige genau einen Dateinamen, Bereich und eine Priorität"
#: scripts/dpkg-distaddfile.pl:76
msgid "filename, section and priority may contain no whitespace"
-msgstr "Dateiname, Bereich und Prioritt drfen keine Leerzeichen enthalten"
+msgstr "Dateiname, Bereich und Priorität dürfen keine Leerzeichen enthalten"
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
-msgstr "ffne neue Dateienliste-Datei"
+msgstr "öffne neue Dateienliste-Datei"
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr "kopiere alten Eintrag in neue Dateienlist-Datei"
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr "lese alte Dateienliste-Datei"
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr "schreibe neuen Eintrag in neue Dateienliste-Datei"
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
-msgstr "schliee neue Dateienliste-Datei"
+msgstr "schließe neue Dateienliste-Datei"
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr "installiere neue Dateienliste-Datei"
@@ -611,10 +601,10 @@ msgstr ""
"Aufruf: %s [<Option> ...]\n"
"\n"
"Optionen:\n"
-" -b rein binrer Bau - keine Quelldateien.\n"
+" -b rein binärer Bau - keine Quelldateien.\n"
" -B Architektur-spezifisch - keine Quellen oder\n"
-" Architektur-unabhngigen Dateien.\n"
-" -A nur Architektur-unabhngiges - keine Quellen "
+" Architektur-unabhängigen Dateien.\n"
+" -A nur Architektur-unabhängiges - keine Quellen "
"oder\n"
" Architektur-spezifischen Dateien\n"
" -S nur-Quellen-Upload.\n"
@@ -622,22 +612,22 @@ msgstr ""
" -l<changelogdatei> erhalte pro-Version-Informationen aus dieser "
"Datei.\n"
" -f<Dateilist-Datei> erhalte .deb-Dateiliste aus dieser Datei.\n"
-" -v<seitVersion> fge alle nderungen neuer als Version ein.\n"
-" -C<nderungsbeschreibung> verwende nderungsbeschreibung aus dieser "
+" -v<seitVersion> füge alle Änderungen neuer als Version ein.\n"
+" -C<Änderungsbeschreibung> verwende Änderungsbeschreibung aus dieser "
"Datei.\n"
-" -m<Betreuer> berschreibe den Wert von maintainer der\n"
+" -m<Betreuer> überschreibe den Wert von »maintainer« der\n"
" Steuerdatei.\n"
-" -e<Betreuer> berschreibe den Wert von maintainer im\n"
+" -e<Betreuer> überschreibe den Wert von »maintainer« im\n"
" Changelog.\n"
-" -u<uploadDateiVerz> Verzeichnis mit Dateien (standardmig ..).\n"
+" -u<uploadDateiVerz> Verzeichnis mit Dateien (standardmäßig »..«).\n"
" -si (voreingestellt) Quellen enthalten Orig. falls neues Upstream.\n"
-" -sa Quelle enthlt Originalquellen.\n"
+" -sa Quelle enthält Originalquellen.\n"
" -sd Quelle ist nur Diff und .dsc.\n"
" -q ruhig - keine Informationsmeldungen auf Stderr.\n"
" -F<changelogformat> erzwinge Changelog-Format.\n"
" -V<Name>=<Wert> Setze Ersetzungsvariable.\n"
" -T<VarlistDatei> lese Variablen hier, nicht aus debian/substvars.\n"
-" -D<Feld>=<Wert> berschreibe oder ergnze ein Feld und Wert.\n"
+" -D<Feld>=<Wert> überschreibe oder ergänze ein Feld und Wert.\n"
" -U<Feld> entferne ein Feld.\n"
" -h, --help zeige diese Hilfsmeldung.\n"
" --version zeige die Version.\n"
@@ -646,14 +636,14 @@ msgstr ""
#, perl-format
msgid "%s: arch-specific upload - not including arch-independent packages"
msgstr ""
-"%s: architektur-spezifischer Upload - schliee architektur-unabhngige "
+"%s: architektur-spezifischer Upload - schließe architektur-unabhängige "
"Pakete nicht ein"
#: scripts/dpkg-genchanges.pl:151
#, perl-format
msgid "%s: arch-indep upload - not including arch-specific packages"
msgstr ""
-"%s: architektur-unabhngiger Upload - schliee architektur-spezifische "
+"%s: architektur-unabhängiger Upload - schließe architektur-spezifische "
"Pakete nicht ein"
#: scripts/dpkg-genchanges.pl:218
@@ -668,17 +658,17 @@ msgstr "kann Dateienliste-Datei nicht lesen"
#: scripts/dpkg-genchanges.pl:229
#, perl-format
msgid "duplicate files list entry for package %s (line %d)"
-msgstr "doppelter Dateienliste-Eintrag fr Paket %s (Zeile %d)"
+msgstr "doppelter Dateienliste-Eintrag für Paket %s (Zeile %d)"
#: scripts/dpkg-genchanges.pl:237 scripts/dpkg-genchanges.pl:251
#, perl-format
msgid "duplicate files list entry for file %s (line %d)"
-msgstr "doppelter Dateienliste-Eintrag fr Datei %s (Zeile %d)"
+msgstr "doppelter Dateienliste-Eintrag für Datei %s (Zeile %d)"
#: scripts/dpkg-genchanges.pl:257
#, perl-format
msgid "badly formed line in files list file, line %d"
-msgstr "ungltige Zeile in Dateienliste-Datei, Zeile %d"
+msgstr "ungültige Zeile in Dateienliste-Datei, Zeile %d"
#: scripts/dpkg-genchanges.pl:298
#, perl-format
@@ -687,17 +677,17 @@ msgstr "Paket %s in Steuerdatei aber nicht in Dateiliste"
#: scripts/dpkg-genchanges.pl:342
msgid "read changesdescription"
-msgstr "lese nderungsbeschreibung"
+msgstr "lese Änderungsbeschreibung"
#: scripts/dpkg-genchanges.pl:350
#, perl-format
msgid "package %s listed in files list but not in control info"
-msgstr "Paket %s in Dateienliste aber nicht in der Steuer-Info aufgefhrt"
+msgstr "Paket %s in Dateienliste aber nicht in der Steuer-Info aufgeführt"
#: scripts/dpkg-genchanges.pl:362
#, perl-format
msgid "missing Section for binary package %s; using '-'"
-msgstr "fehlender Bereich fr Binrpaket %s; verwende -"
+msgstr "fehlender Bereich für Binärpaket %s; verwende »-«"
#: scripts/dpkg-genchanges.pl:364
#, perl-format
@@ -707,20 +697,20 @@ msgstr "Paket %s hat Bereich %s in der Steuerdatei, aber %s in der Dateiliste"
#: scripts/dpkg-genchanges.pl:371
#, perl-format
msgid "missing Priority for binary package %s; using '-'"
-msgstr "fehlende Prioritt fr Binrpaket %s; verwende -"
+msgstr "fehlende Priorität für Binärpaket %s; verwende »-«"
#: scripts/dpkg-genchanges.pl:373
#, perl-format
msgid "package %s has priority %s in control file but %s in files list"
-msgstr "Paket %s hat Prioritt %s in Steuerdatei, aber %s in Dateienliste"
+msgstr "Paket %s hat Priorität %s in Steuerdatei, aber %s in Dateienliste"
#: scripts/dpkg-genchanges.pl:385
msgid "missing Section for source files"
-msgstr "fehlender Bereich fr Quelldateien"
+msgstr "fehlender Bereich für Quelldateien"
#: scripts/dpkg-genchanges.pl:390
msgid "missing Priority for source files"
-msgstr "fehlende Prioritt fr Quelldateien"
+msgstr "fehlende Priorität für Quelldateien"
#: scripts/dpkg-genchanges.pl:397 scripts/Dpkg/Vendor.pm:68
#, perl-format
@@ -729,34 +719,34 @@ msgstr "%s ist leer"
#: scripts/dpkg-genchanges.pl:423
msgid "not including original source code in upload"
-msgstr "fge Originalquellen beim Hochladen nicht hinzu"
+msgstr "füge Originalquellen beim Hochladen nicht hinzu"
#: scripts/dpkg-genchanges.pl:430
msgid "ignoring -sd option for native Debian package"
-msgstr "ignoriere Option -sd bei Debian native-Paketen"
+msgstr "ignoriere Option »-sd« bei »Debian native«-Paketen"
#: scripts/dpkg-genchanges.pl:432
msgid "including full source code in upload"
-msgstr "fge kompletten Quellcode beim Hochladen hinzu"
+msgstr "füge kompletten Quellcode beim Hochladen hinzu"
#: scripts/dpkg-genchanges.pl:435
msgid "binary-only upload - not including any source code"
-msgstr "rein-binrer Upload - fge keinen Quellcode hinzu"
+msgstr "rein-binärer Upload - füge keinen Quellcode hinzu"
#: scripts/dpkg-genchanges.pl:439
msgid "write original source message"
-msgstr "schreibe ursprngliche Quell-Nachricht"
+msgstr "schreibe ursprüngliche Quell-Nachricht"
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
-msgstr "fehlende Informationen fr kritisches Ausgabefeld %s"
+msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
-msgstr "fehlende Informationen fr Ausgabefeld %s"
+msgstr "fehlende Informationen für Ausgabefeld %s"
#: scripts/dpkg-gencontrol.pl:58
msgid ""
@@ -794,18 +784,18 @@ msgstr ""
"Aufruf: %s [<Option> ...]\n"
"\n"
"Optionen:\n"
-" -p<Paket> gebe Steuerdatei fr Paket aus.\n"
+" -p<Paket> gebe Steuerdatei für Paket aus.\n"
" -c<Steuerdatei> hole Steuerinformationen aus dieser Datei.\n"
" -l<Changelogdatei> hole pro-Versions-Informationen aus dieser Datei.\n"
" -F<Changelogformat> erzwinge Changelogformat.\n"
-" -v<erzwinge_Version> setze die Version des Binrpakets.\n"
+" -v<erzwinge_Version> setze die Version des Binärpakets.\n"
" -f<Dateilistedatei> schreibe Dateien hierher statt in debian/files.\n"
-" -P<Paketbauverz> temporres Bauverzeichnis statt debian/tmp.\n"
+" -P<Paketbauverz> temporäres Bauverzeichnis statt debian/tmp.\n"
" -n<Dateiname> nehme an, dass der Paketdateiname <Dateiname> "
"ist.\n"
" -O schreibe nach Stdout, nicht .../DEBIAN/control.\n"
-" -is, -ip, -isp, -ips veraltet, wegen Kompatibilitt ignoriert.\n"
-" -D<Feld>=<Wert> berschreibe oder ergnze ein Feld und Wert.\n"
+" -is, -ip, -isp, -ips veraltet, wegen Kompatibilität ignoriert.\n"
+" -D<Feld>=<Wert> überschreibe oder ergänze ein Feld und Wert.\n"
" -U<Feld> entferne ein Feld.\n"
" -V<Name>=<Wert> setze eine Substitutionsvariable.\n"
" -T<Varlistdatei> lese Variablen von hier, nicht debian/substvars.\n"
@@ -815,7 +805,7 @@ msgstr ""
#: scripts/dpkg-gencontrol.pl:97 scripts/dpkg-gensymbols.pl:118
#, perl-format
msgid "Illegal package name `%s'"
-msgstr "Ungltiger Paketname %s"
+msgstr "Ungültiger Paketname »%s«"
#: scripts/dpkg-gencontrol.pl:152
#, perl-format
@@ -836,8 +826,8 @@ msgstr "Paket %s"
#, perl-format
msgid "`%s' is not a legal architecture string."
msgid_plural "`%s' are not legal architecture strings."
-msgstr[0] "%s ist keine gltige Architektur-Zeichenkette"
-msgstr[1] "%s sind keine gltigen Architektur-Zeichenketten"
+msgstr[0] "»%s« ist keine gültige Architektur-Zeichenkette"
+msgstr[1] "»%s« sind keine gültigen Architektur-Zeichenketten"
#: scripts/dpkg-gencontrol.pl:191
#, perl-format
@@ -845,7 +835,7 @@ msgid ""
"current host architecture '%s' does not appear in package's architecture "
"list (%s)"
msgstr ""
-"aktuelle Host-Architektur %s erscheint nicht in der Architekturliste (%s) "
+"aktuelle Host-Architektur »%s« erscheint nicht in der Architekturliste (%s) "
"des Pakets"
#: scripts/dpkg-gencontrol.pl:246
@@ -864,55 +854,55 @@ msgid ""
"the %s field contains an arch-specific dependency but the package is "
"architecture all"
msgstr ""
-"das Feld %s enthlt eine architekturspezifische Abhngigkeit aber das Paket "
-"ist architecture all"
+"das Feld %s enthält eine architekturspezifische Abhängigkeit aber das Paket "
+"ist »architecture all«"
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr "%s Paket mit udeb-spezifischem Feld %s"
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
#, perl-format
msgid "cannot fork for %s"
-msgstr "kann fr %s nicht forken"
+msgstr "kann für %s nicht forken"
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
-msgstr "chdir nach %s fr du"
+msgstr "chdir nach »%s« für du"
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
-msgstr "fhre %s aus"
+msgstr "führe %s aus"
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
-msgstr "du in %s"
+msgstr "du in »%s«"
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
-msgstr "du lieferte unerwartete Ausgabe %s"
+msgstr "du lieferte unerwartete Ausgabe »%s«"
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
-msgstr "schliee alte Dateienliste-Datei"
+msgstr "schließe alte Dateienliste-Datei"
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
-msgstr "kann neue Ausgabe-Steuerdatei %s nicht ffnen"
+msgstr "kann neue Ausgabe-Steuerdatei »%s« nicht öffnen"
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
-msgstr "kann Ausgabe-Steurdatei %s nicht installieren"
+msgstr "kann Ausgabe-Steurdatei »%s« nicht installieren"
#: scripts/dpkg-gensymbols.pl:51
msgid ""
@@ -961,28 +951,28 @@ msgstr ""
"Aufruf: %s [<Option> ...]\n"
"\n"
"Optionen:\n"
-" -p<Paket> erstelle Symbol-Datei fr Paket.\n"
-" -P<Paketbauverz> temporres Bauverzeichnis (statt debian/tmp).\n"
+" -p<Paket> erstelle Symbol-Datei für Paket.\n"
+" -P<Paketbauverz> temporäres Bauverzeichnis (statt debian/tmp).\n"
" -e<Bibliothek> explizite Liste von zu durchsuchenden Dateien.\n"
-" -v<Version> Version des Pakets (standardmig\n"
+" -v<Version> Version des Pakets (standardmäßig\n"
" aus debian/changelog extrahierte Version).\n"
" -c<Stufe> vergleiche erstellte Symbol-Datei mit der\n"
" Referenzvorlage im debian-Verzeichnis und\n"
" schlage fehl, falls die Unterschiede zu wichtig\n"
-" sind (Stufe luft von 0 fr keine Prfung bis zu\n"
-" 4 fr alle Prfungen). Standardmig wird auf\n"
-" Stufe 1 geprft.\n"
+" sind (Stufe läuft von 0 für keine Prüfung bis zu\n"
+" 4 für alle Prüfungen). Standardmäßig wird auf\n"
+" Stufe 1 geprüft.\n"
" -q ruhig verhalten und nie irgendwelche Warnungen\n"
" oder ein Diff zwischen der generierten\n"
" Symboldatei und der Referenzvorlage ausgeben.\n"
" -I<Datei> erzwingt Verwendung von <Datei> statt der\n"
-" standardmigen Datei als Referenz-Symbol-Datei.\n"
+" standardmäßigen Datei als Referenz-Symbol-Datei.\n"
" -O<Datei> schreibe in <Datei> nicht .../DEBIAN/symbols.\n"
" -O schreibe nach Stdout nicht .../DEBIAN/symbols.\n"
" -t schreibe im Vorlagenmodus (Makrierungen werden\n"
" nicht verarbeitet und in die Ausgabe "
"aufgenommen).\n"
-" -V geschwtzige Ausgabe. Schreibe veraltete Symbole\n"
+" -V geschwätzige Ausgabe. Schreibe veraltete Symbole\n"
" und Muster, die auf Symbole passen, als "
"Kommmentare\n"
" (nur im Vorlagen-Modus).\n"
@@ -1041,13 +1031,20 @@ msgstr "%s passt nicht komplett auf %s"
msgid "no debian/symbols file used as basis for generating %s"
msgstr "keine debian/symbols-Datei als Basis zur Erzeugung von %s verwendet"
+#: scripts/dpkg-mergechangelogs.pl:53
+#, fuzzy
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
#: scripts/dpkg-mergechangelogs.pl:56
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 ""
"Dies ist freie Software; lesen Sie die GNU General Public License Version 2\n"
-"oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.\n"
+"oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung.\n"
#: scripts/dpkg-mergechangelogs.pl:63
#, perl-format
@@ -1063,8 +1060,8 @@ msgstr ""
"Aufruf: %s [<Option>...] <alt> <neu-a> <neu-b> [<Ausgabe>]\n"
"\n"
"Optionen:\n"
-" --merge-prereleases, -m vorab-Verffentlichungen zusammenfhren,\n"
-" ignoriert alles nach dem letzten ~ in "
+" --merge-prereleases, -m vorab-Veröffentlichungen zusammenführen,\n"
+" ignoriert alles nach dem letzten »~« in "
"der Version\n"
" -h, --help zeigt diese Hilfemeldung.\n"
" --version zeigt die Version.\n"
@@ -1108,7 +1105,7 @@ msgstr ""
"\n"
"Optionen:\n"
" -a, --no-architecture kein Architekturteil im Dateinamen.\n"
-" -o, --overwrite berschreibe, falls Datei existiert.\n"
+" -o, --overwrite überschreibe, falls Datei existiert.\n"
" -k, --symlink erstelle keine neue Datei, sondern einen "
"Symlink.\n"
" -s, --subdir [Verz] verschiebe Datei in Unterverzeichnis "
@@ -1118,46 +1115,46 @@ msgstr ""
" -h, --help zeige diese Hilfenachricht.\n"
" -v, --version zeige die Version.\n"
"\n"
-"Datei.deb ndert sich in <Paket>_<Version>_<Architektur>.<Pakettyp>\n"
-"gem der Unterstrich-Konvention.\n"
+"Datei.deb ändert sich in <Paket>_<Version>_<Architektur>.<Pakettyp>\n"
+"gemäß der »Unterstrich-Konvention«.\n"
#: scripts/dpkg-name.pl:75
#, perl-format
msgid "cannot find '%s'"
-msgstr "kann %s nicht finden"
+msgstr "kann »%s« nicht finden"
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, perl-format
msgid "cannot open %s"
-msgstr "kann %s nicht ffnen"
+msgstr "kann %s nicht öffnen"
#: scripts/dpkg-name.pl:98
#, perl-format
msgid "binary control file %s"
-msgstr "binre Steuerdatei %s"
+msgstr "binäre Steuerdatei %s"
#: scripts/dpkg-name.pl:111
#, perl-format
msgid "assuming architecture '%s' for '%s'"
-msgstr "vermute Architektur %s fr %s"
+msgstr "vermute Architektur »%s« für »%s«"
#: scripts/dpkg-name.pl:133
#, perl-format
msgid "bad package control information for '%s'"
-msgstr "ungltige Paketsteuerinformationen fr %s"
+msgstr "ungültige Paketsteuerinformationen für »%s«"
#: scripts/dpkg-name.pl:149
#, perl-format
msgid "assuming section '%s' for '%s'"
-msgstr "vermute Bereich %s fr %s"
+msgstr "vermute Bereich »%s« für »%s«"
#: scripts/dpkg-name.pl:174
#, perl-format
msgid "no Package field found in '%s', skipping it"
-msgstr "kein Feld Package in %s gefunden, bersprungen"
+msgstr "kein Feld »Package« in »%s« gefunden, übersprungen"
#: scripts/dpkg-name.pl:187
#, perl-format
@@ -1167,27 +1164,27 @@ msgstr "erstellte Verzeichnis %s"
#: scripts/dpkg-name.pl:189
#, perl-format
msgid "cannot create directory '%s'"
-msgstr "kann Verzeichnis %s nicht anlegen"
+msgstr "kann Verzeichnis »%s« nicht anlegen"
#: scripts/dpkg-name.pl:192
#, perl-format
msgid "no such directory '%s', try --create-dir (-c) option"
-msgstr "kein Verzeichnis %s, versuchen Sie die Option --create-dir (-c)"
+msgstr "kein Verzeichnis »%s«, versuchen Sie die Option --create-dir (-c)"
#: scripts/dpkg-name.pl:207
#, perl-format
msgid "skipping '%s'"
-msgstr "berspringe %s"
+msgstr "überspringe »%s«"
#: scripts/dpkg-name.pl:209
#, perl-format
msgid "cannot move '%s' to existing file"
-msgstr "kann %s nicht auf eine existierende Datei verschieben"
+msgstr "kann »%s« nicht auf eine existierende Datei verschieben"
#: scripts/dpkg-name.pl:211
#, perl-format
msgid "moved '%s' to '%s'"
-msgstr "verschob %s nach %s"
+msgstr "verschob »%s« nach »%s«"
#: scripts/dpkg-name.pl:213
msgid "mkdir can be used to create directory"
@@ -1195,7 +1192,7 @@ msgstr "mkdir kann zum Erstellen von Verzeichnissen verwandt werden"
#: scripts/dpkg-name.pl:218
msgid "need at least a filename"
-msgstr "bentige mindestens einen Dateinamen"
+msgstr "benötige mindestens einen Dateinamen"
#: scripts/dpkg-parsechangelog.pl:33
msgid ""
@@ -1241,34 +1238,34 @@ msgstr ""
"Aufruf: %s [<Option> ...]\n"
"\n"
"Optionen:\n"
-" -l<changelogdatei> erhalte versionsabhngige Info aus dieser Datei.\n"
+" -l<changelogdatei> erhalte versionsabhängige Info aus dieser Datei.\n"
" -F<changelogFormat> erzwinge Changelog-Format.\n"
-" -L<BibVerz> suche nach Parser fr Changelogs in <BibVerz>.\n"
+" -L<BibVerz> suche nach Parser für Changelogs in <BibVerz>.\n"
" -h, --help zeige diese Hilfemeldung.\n"
" --version zeige die Version.\n"
"\n"
"Parser-Optionen:\n"
-" --format <Ausgabeformat> siehe Handbuchseite fr verfgbare\n"
-" Ausgabeformate, standardmig dpkg zur\n"
-" Kompatibilitt mit dpkg-dev\n"
-" --since <Version>, nehme alle nderungen jnger als Version\n"
+" --format <Ausgabeformat> siehe Handbuchseite für verfügbare\n"
+" Ausgabeformate, standardmäßig »dpkg« zur\n"
+" Kompatibilität mit dpkg-dev\n"
+" --since <Version>, nehme alle Änderungen jünger als Version\n"
" -s<Version>, -v<Version> hinzu\n"
-" --until <Version>, nehme alle nderungen lter als Version hinzu\n"
+" --until <Version>, nehme alle Änderungen älter als Version hinzu\n"
" -u<Version>\n"
-" --from <Version>, nehme alle nderungen jnger als oder\n"
+" --from <Version>, nehme alle Änderungen jünger als oder\n"
" -f<version> identisch mit Version hinzu\n"
-" --to <Version>, nehme alle nderungen lter als oder "
+" --to <Version>, nehme alle Änderungen älter als oder "
"identisch\n"
" -t<version> mit Version hinzu\n"
-" --count <Zahl>, fge <Zahl> Eintrge von oben (oder von "
+" --count <Zahl>, füge <Zahl> Einträge von oben (oder von "
"unten,\n"
" -c<Zahl>, -n<Zahl> falls <Zahl> kleiner als 0 ist) hinzu\n"
-" --offset <Zahl>, ndere den Startpunkt fr --count, gezhlt "
+" --offset <Zahl>, ändere den Startpunkt für --count, gezählt "
"von\n"
" -o<Zahl> oben (oder von unten, falls <Zahl> kleiner "
"als\n"
" Null ist)\n"
-" --all fge alle nderungen hinzu\n"
+" --all füge alle Änderungen hinzu\n"
#: scripts/dpkg-parsechangelog.pl:117
#, perl-format
@@ -1293,18 +1290,18 @@ msgid ""
" -h, --help show this help message.\n"
" --version show the version.\n"
msgstr ""
-"Aufruf: %s [<Option> ...] <Binrpfad> [<Override-Datei> [<Pfadprfix>]] > "
+"Aufruf: %s [<Option> ...] <Binärpfad> [<Override-Datei> [<Pfadpräfix>]] > "
"Packages\n"
"\n"
"Optionen:\n"
-" -t, --type <Typ> suche nach <Typ>-Paketen (standardmig deb).\n"
-" -u, --udeb suche nach udebs (veralteter Alias fr -tudeb).\n"
+" -t, --type <Typ> suche nach <Typ>-Paketen (standardmäßig »deb«).\n"
+" -u, --udeb suche nach udebs (veralteter Alias für -tudeb).\n"
" -a, --arch <Arch> Architektur, nach der gesucht werden soll.\n"
" -m, --multiversion erlaube mehrere Versionen eines einzelnen "
"Pakets.\n"
" -e, --extra-override <Datei>\n"
-" verwende zustzliche Override-Datei.\n"
-" -M, --medium <Medium> fge Feld X-Medium fr Dselects\n"
+" verwende zusätzliche Override-Datei.\n"
+" -M, --medium <Medium> füge Feld X-Medium für Dselects\n"
" Multicd-Zugriffsmethode hinzu\n"
" -h, --help zeige diese Hilfemeldung.\n"
" --version zeige die Version.\n"
@@ -1322,7 +1319,7 @@ msgstr " %s (laut Paket %s, nicht %s)"
#: scripts/dpkg-scanpackages.pl:120
#, perl-format
msgid "Unconditional maintainer override for %s"
-msgstr "Bedingungsloser bersteuerung (override) des Betreuers fr %s"
+msgstr "Bedingungsloser Übersteuerung (»override«) des Betreuers für %s"
#: scripts/dpkg-scanpackages.pl:158
msgid "1 to 3 args expected"
@@ -1331,7 +1328,7 @@ msgstr "1 bis 3 Argumente erwartet"
#: scripts/dpkg-scanpackages.pl:175
#, perl-format
msgid "Binary dir %s not found"
-msgstr "Binrverzeichnis %s nicht gefunden"
+msgstr "Binärverzeichnis %s nicht gefunden"
#: scripts/dpkg-scanpackages.pl:177
#, perl-format
@@ -1341,7 +1338,7 @@ msgstr "Override-Datei %s nicht gefunden"
#: scripts/dpkg-scanpackages.pl:183
#, perl-format
msgid "Couldn't open %s for reading"
-msgstr "Konnte %s nicht zum Lesen ffnen"
+msgstr "Konnte %s nicht zum Lesen öffnen"
#: scripts/dpkg-scanpackages.pl:193
#, perl-format
@@ -1351,12 +1348,12 @@ msgstr "Konnte Steuerinformationen aus %s nicht auswerten."
#: scripts/dpkg-scanpackages.pl:196
#, perl-format
msgid "`dpkg-deb -I %s control' exited with %d, skipping package"
-msgstr "dpkg-deb -I %s control beendete sich mit %d, berspringe Paket"
+msgstr "»dpkg-deb -I %s control« beendete sich mit %d, überspringe Paket"
#: scripts/dpkg-scanpackages.pl:202
#, perl-format
msgid "No Package field in control file of %s"
-msgstr "Kein Package-Feld in Steuerdatei von %s"
+msgstr "Kein »Package«-Feld in Steuerdatei von %s"
#: scripts/dpkg-scanpackages.pl:210
#, perl-format
@@ -1389,11 +1386,11 @@ msgstr "Fehler beim Schreiben nach Stdout"
#: scripts/dpkg-scanpackages.pl:259
msgid "Couldn't close stdout"
-msgstr "konnte Stdout nicht schlieen"
+msgstr "konnte Stdout nicht schließen"
#: scripts/dpkg-scanpackages.pl:262
msgid "Packages in override file with incorrect old maintainer value:"
-msgstr "Pakete in Override-Datei mit ungltigem alten Betreuer-Wert:"
+msgstr "Pakete in Override-Datei mit ungültigem alten Betreuer-Wert:"
#: scripts/dpkg-scanpackages.pl:266
msgid "Packages specifying same maintainer as override file:"
@@ -1410,7 +1407,7 @@ msgstr "Pakete in Override-Datei aber nicht im Archiv:"
#: scripts/dpkg-scanpackages.pl:278
#, perl-format
msgid "Wrote %s entries to output Packages file."
-msgstr "%s Eintrge in Ausgabe-Paketdatei geschrieben."
+msgstr "%s Einträge in Ausgabe-Paketdatei geschrieben."
#: scripts/dpkg-scansources.pl:84
#, perl-format
@@ -1432,58 +1429,58 @@ msgid ""
"\n"
"See the man page for the full documentation.\n"
msgstr ""
-"Aufruf: %s [<Option> ...] <Binrpfad> [<Override-Date> [<Pfadprfix>]] > "
+"Aufruf: %s [<Option> ...] <Binärpfad> [<Override-Date> [<Pfadpräfix>]] > "
"Quellen\n"
"\n"
"Optionen:\n"
" -n, --no-sort sortiere vor Ausgabe nicht nach Paketen.\n"
" -e, --extra-override <Datei>\n"
-" verwende zustzliche Override-Datei.\n"
+" verwende zusätzliche Override-Datei.\n"
" -s, --source-override <Datei>\n"
-" verwende Datei fr zustzliche Quell-Overrides, "
-"standardmig\n"
-" wird an eine regulre Override-Datei .src\n"
-" angehngt.\n"
+" verwende Datei für zusätzliche Quell-Overrides, "
+"standardmäßig\n"
+" wird an eine reguläre Override-Datei ».src«\n"
+" angehängt.\n"
" --debug Debugging einschalten.\n"
" --help zeige diese Hilfemeldung.\n"
" --version zeige die Version.\n"
"\n"
-"Lesen Sie die Handbuchseite fr die komplette Dokumentation.\n"
+"Lesen Sie die Handbuchseite für die komplette Dokumentation.\n"
#: scripts/dpkg-scansources.pl:105
#, perl-format
msgid "error closing %s ($? %d, $! `%s')"
-msgstr "Fehler beim Schlieen von %s ($? %d, $! %s)"
+msgstr "Fehler beim Schließen von %s ($? %d, $! »%s«)"
#: scripts/dpkg-scansources.pl:121
#, perl-format
msgid "invalid override entry at line %d (%d fields)"
-msgstr "ungltiger Override-Eintrag in Zeile %d (%d Felder)"
+msgstr "ungültiger Override-Eintrag in Zeile %d (%d Felder)"
#: scripts/dpkg-scansources.pl:127
#, perl-format
msgid "ignoring duplicate override entry for %s at line %d"
-msgstr "ignoriere doppelte Override-Eintrge fr %s in Zeile %d"
+msgstr "ignoriere doppelte Override-Einträge für %s in Zeile %d"
#: scripts/dpkg-scansources.pl:132
#, perl-format
msgid "ignoring override entry for %s, invalid priority %s"
-msgstr "ignoriere Override-Eintrag fr %s, ungltige Prioritt %s"
+msgstr "ignoriere Override-Eintrag für %s, ungültige Priorität %s"
#: scripts/dpkg-scansources.pl:186
#, perl-format
msgid "invalid source override entry at line %d (%d fields)"
-msgstr "ungltiger Quell-Override-Eintrag in Zeile %d (%d Felder)"
+msgstr "ungültiger Quell-Override-Eintrag in Zeile %d (%d Felder)"
#: scripts/dpkg-scansources.pl:194
#, perl-format
msgid "ignoring duplicate source override entry for %s at line %d"
-msgstr "ignoriere doppelte Quell-Override-Eintrge fr %s in Zeile %d"
+msgstr "ignoriere doppelte Quell-Override-Einträge für %s in Zeile %d"
#: scripts/dpkg-scansources.pl:244
#, perl-format
msgid "no binary packages specified in %s"
-msgstr "keine Binrpakete in %s angegeben"
+msgstr "keine Binärpakete in %s angegeben"
#: scripts/dpkg-scansources.pl:302
msgid "1 to 3 args expected\n"
@@ -1492,16 +1489,16 @@ msgstr "1 bis 3 Argumente erwartet\n"
#: scripts/dpkg-shlibdeps.pl:93
#, perl-format
msgid "administrative directory '%s' does not exist"
-msgstr "administratives Verzeichnis %s existiert nicht"
+msgstr "administratives Verzeichnis »%s« existiert nicht"
#: scripts/dpkg-shlibdeps.pl:97
#, perl-format
msgid "unrecognised dependency field `%s'"
-msgstr "Abhngigkeitsfeld %s nicht erkannt"
+msgstr "Abhängigkeitsfeld »%s« nicht erkannt"
#: scripts/dpkg-shlibdeps.pl:131
msgid "need at least one executable"
-msgstr "bentige mindestens ein Programm"
+msgstr "benötige mindestens ein Programm"
#: scripts/dpkg-shlibdeps.pl:171
#, perl-format
@@ -1512,11 +1509,11 @@ msgid ""
"To help dpkg-shlibdeps find private libraries, you might need to set "
"LD_LIBRARY_PATH."
msgstr ""
-"konnte Bibliothek %s bentigt von %s nicht finden (ELF-Format: %s; RPATH: %"
-"s).\n"
-"Hinweis: Bibliotheken werden nicht in anderen Binrpaketen, die keine Shlibs-"
+"konnte Bibliothek %s benötigt von %s nicht finden (ELF-Format: »%s«; RPATH: »%"
+"s«).\n"
+"Hinweis: Bibliotheken werden nicht in anderen Binärpaketen, die keine Shlibs-"
"oder Symbol-Datei haben, gesucht.\n"
-"Um dpkg-shlibdeps dabei zu helfen, private Bibliotheken zu finden, knnte es "
+"Um dpkg-shlibdeps dabei zu helfen, private Bibliotheken zu finden, könnte es "
"notwendig sein, LD_LIBRARY_PATH zu setzen."
#: scripts/dpkg-shlibdeps.pl:259
@@ -1527,7 +1524,7 @@ msgstr "%s hat einen unerwarteten SONAMEn (%s)"
#: scripts/dpkg-shlibdeps.pl:280
#, perl-format
msgid "no dependency information found for %s (used by %s)."
-msgstr "Keine Abhngigkeitsinformationen fr %s (verwendet von %s) gefunden."
+msgstr "Keine Abhängigkeitsinformationen für %s (verwendet von %s) gefunden."
#: scripts/dpkg-shlibdeps.pl:311
msgid ""
@@ -1546,14 +1543,14 @@ msgstr "Symbol %s, verwendet von %s, in keiner der Bibliotheken gefunden."
msgid ""
"%s contains an unresolvable reference to symbol %s: it's probably a plugin."
msgstr ""
-"%s enthlt eine nicht auflsbare Referenz auf Symbol %s: wahrscheinlich eine "
+"%s enthält eine nicht auflösbare Referenz auf Symbol %s: wahrscheinlich eine "
"Erweiterung."
#: scripts/dpkg-shlibdeps.pl:379
#, perl-format
msgid "%d other similar warnings have been skipped (use -v to see them all)."
msgstr ""
-"%d andere, hnliche Warnungen wurden bersprungen (verwenden Sie -v um alle "
+"%d andere, ähnliche Warnungen wurden übersprungen (verwenden Sie -v um alle "
"zu sehen)."
#: scripts/dpkg-shlibdeps.pl:404
@@ -1568,33 +1565,33 @@ msgid ""
"dependency on %s could be avoided if \"%s\" were not uselessly linked "
"against it (they use none of its symbols)."
msgstr ""
-"Abhngigkeit von %s knnte vermieden werden, falls %s nicht unntigerweise "
-"dagegen gelinkt wre (es verwendet keines seiner Symbole)."
+"Abhängigkeit von %s könnte vermieden werden, falls »%s« nicht unnötigerweise "
+"dagegen gelinkt wäre (es verwendet keines seiner Symbole)."
#: scripts/dpkg-shlibdeps.pl:430
#, perl-format
msgid "open new substvars file `%s'"
-msgstr "ffne neue Substvars-Datei %s"
+msgstr "öffne neue Substvars-Datei »%s«"
#: scripts/dpkg-shlibdeps.pl:433
#, perl-format
msgid "open old varlist file `%s' for reading"
-msgstr "ffne alte Varlist-Datei %s zum Lesen"
+msgstr "öffne alte Varlist-Datei »%s« zum Lesen"
#: scripts/dpkg-shlibdeps.pl:436
#, perl-format
msgid "copy old entry to new varlist file `%s'"
-msgstr "kopiere alte Eintrge in die neue Varlist-Datei %s"
+msgstr "kopiere alte Einträge in die neue Varlist-Datei »%s«"
#: scripts/dpkg-shlibdeps.pl:500
#, perl-format
msgid "invalid dependency got generated: %s"
-msgstr "ungltige Abhngigkeit wurde erstellt: %s"
+msgstr "ungültige Abhängigkeit wurde erstellt: %s"
#: scripts/dpkg-shlibdeps.pl:510
#, perl-format
msgid "install new varlist file `%s'"
-msgstr "installiere neue Varlist-Datei %s"
+msgstr "installiere neue Varlist-Datei »%s«"
#: scripts/dpkg-shlibdeps.pl:520
msgid ""
@@ -1644,59 +1641,59 @@ msgstr ""
"Aufruf: %s [<Option> ...] <Programm>|-e<Programm> [<Option> ...]\n"
"\n"
"Positionsoptionen (Reihenfolge ist relevant):\n"
-" <Programm> nimm Abhngigkeiten fr <Programm> hinzu,\n"
-" -e<Programm> (verwende -e falls <Programm> mit - beginnt)\n"
-" -d<Abhngigkeitsfeld> nchste(s) Programm(e) setze \n"
-" shlibs:<Abngigkeitsfeld>.\n"
+" <Programm> nimm Abhängigkeiten für <Programm> hinzu,\n"
+" -e<Programm> (verwende -e falls <Programm> mit »-« beginnt)\n"
+" -d<Abhängigkeitsfeld> nächste(s) Programm(e) setze \n"
+" shlibs:<Abängigkeitsfeld>.\n"
"\n"
"Optionen:\n"
-" -p<Varnameprfix> setze <Varnameprfix>:* statt shlibs:*.\n"
+" -p<Varnamepräfix> setze <Varnamepräfix>:* statt shlibs:*.\n"
" -O gebe Variableneinstellungen nach Stdout aus.\n"
-" -L<lokaleshlibsdatei> shlibs-berschreibe-Datei, nicht\n"
+" -L<lokaleshlibsdatei> shlibs-Überschreibe-Datei, nicht\n"
" debian/shlibs.local.\n"
" -T<varlistdatei> aktualisiere Variablen hier, nicht in\n"
" debian/substvars.\n"
-" -t<Typ> setzte Pakettyp (standardmig deb).\n"
-" -x<Paket> schliee Pakete von den erstellten "
-"Abhngigkeiten\n"
+" -t<Typ> setzte Pakettyp (standardmäßig deb).\n"
+" -x<Paket> schließe Pakete von den erstellten "
+"Abhängigkeiten\n"
" aus.\n"
-" -S<PaketBauVerz> suche bentigte Bibliotheken zuerst im "
-"bergebenen\n"
+" -S<PaketBauVerz> suche benötigte Bibliotheken zuerst im "
+"übergebenen\n"
" Paketbauverzeichnis.\n"
-" -v aktiviere geschwtzigen Modus (kann mehrfach\n"
+" -v aktiviere geschwätzigen Modus (kann mehrfach\n"
" verwandt werden).\n"
" --ignore-missing-info kein Fehlschlag falls die "
-"Abhngigkeitsinformation\n"
+"Abhängigkeitsinformation\n"
" nicht gefunden werden kann.\n"
" --warnings=<Wert> definiere Satz von aktiven Warnungen (siehe\n"
" Handbuchseite).\n"
-"--admindir=<Verzeichnis> ndere das administrative Verzeichnis.\n"
+"--admindir=<Verzeichnis> ändere das administrative Verzeichnis.\n"
"-h, --help zeige diese Hilfemeldung.\n"
" --version zeige die Version.\n"
"\n"
-"Untersttzte Abhngigkeitsfelder sind:\n"
+"Unterstützte Abhängigkeitsfelder sind:\n"
" %s\n"
#: scripts/dpkg-shlibdeps.pl:661
#, perl-format
msgid "Can't extract name and version from library name `%s'"
-msgstr "Kann Name und Version aus Bibliotheksnamen %s nicht entnehmen"
+msgstr "Kann Name und Version aus Bibliotheksnamen »%s« nicht entnehmen"
#: scripts/dpkg-shlibdeps.pl:668
#, perl-format
msgid "unable to open shared libs info file `%s'"
-msgstr "kann Informationsdatei fr Laufzeitbibliothek %s nicht ffnen"
+msgstr "kann Informationsdatei für Laufzeitbibliothek »%s« nicht öffnen"
#: scripts/dpkg-shlibdeps.pl:674
#, perl-format
msgid "shared libs info file `%s' line %d: bad line `%s'"
msgstr ""
-"Informationsdatei %s der Laufzeitbibliothek, Zeile %d: ungltige Zeile %s"
+"Informationsdatei »%s« der Laufzeitbibliothek, Zeile %d: ungültige Zeile »%s«"
#: scripts/dpkg-shlibdeps.pl:732
#, perl-format
msgid "cannot open file %s"
-msgstr "kann Datei %s nicht ffnen"
+msgstr "kann Datei %s nicht öffnen"
#: scripts/dpkg-shlibdeps.pl:766
#, perl-format
@@ -1705,17 +1702,17 @@ msgid ""
"identified due to lack of DEBIAN sub-directory in the root of package's "
"build tree"
msgstr ""
-"$ORIGIN wird in RPATH von %s verwendet und das zugehrige Verzeichnis konnte "
+"$ORIGIN wird in RPATH von %s verwendet und das zugehörige Verzeichnis konnte "
"nicht identifiziert werden, da das DEBIAN-Unterverzeichnis in der Wurzel des "
"Paketbaubaums fehlt."
#: scripts/dpkg-shlibdeps.pl:826
msgid "cannot exec dpkg"
-msgstr "kann dpkg nicht ausfhren"
+msgstr "kann dpkg nicht ausführen"
#: scripts/dpkg-shlibdeps.pl:831
msgid "diversions involved - output may be incorrect"
-msgstr "Umleitungen beteiligt - Ausgabe knnte nicht korrekt sein"
+msgstr "Umleitungen beteiligt - Ausgabe könnte nicht korrekt sein"
#: scripts/dpkg-shlibdeps.pl:833
msgid "write diversion info to stderr"
@@ -1724,54 +1721,54 @@ msgstr "schreibe Informationen zu Umleitungen auf Stderr"
#: scripts/dpkg-shlibdeps.pl:837
#, perl-format
msgid "unknown output from dpkg --search: '%s'"
-msgstr "unbekannte Ausgabe von dpkg --search: %s"
+msgstr "unbekannte Ausgabe von »dpkg --search«: »%s«"
#: scripts/dpkg-source.pl:98
#, perl-format
msgid "%s needs a directory"
-msgstr "%s bentigt ein Verzeichnis"
+msgstr "%s benötigt ein Verzeichnis"
#: scripts/dpkg-source.pl:101
#, perl-format
msgid "cannot stat directory %s"
-msgstr "kann Stat von Verzeichnis %s nicht durchfhren"
+msgstr "kann Stat von Verzeichnis %s nicht durchführen"
#: scripts/dpkg-source.pl:103
#, perl-format
msgid "directory argument %s is not a directory"
msgstr "Verzeichnis-Argument %s ist kein Verzeichnis"
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, perl-format
msgid "using options from %s: %s"
msgstr "verwende Optionen von %s: %s"
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
-msgstr "%s ist keine untersttzte Kompression"
+msgstr "%s ist keine unterstützte Kompression"
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr "%s ist keine Komprimierungsstufe"
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
-msgstr "bentige -x oder -b"
+msgstr "benötige -x oder -b"
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
-msgstr "%s ist keine gltige Architektur-Zeichenkette"
+msgstr "»%s« ist keine gültige Architektur-Zeichenkette"
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
-msgstr "Architektur %s ist nur alleine erlaubt (Liste fr Paket %s lautet %s)"
+msgstr "Architektur %s ist nur alleine erlaubt (Liste für Paket %s lautet »%s«)"
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
@@ -1783,23 +1780,23 @@ msgstr "Architektur %s ist nur alleine erlaubt (Liste fr Paket %s lautet %s)"
msgid "cannot read %s"
msgstr "kann %s nicht lesen"
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
#, perl-format
msgid "no source format specified in %s, see dpkg-source(1)"
msgstr "kein Quellformat in %s angegeben, lesen Sie dpkg-source(1)"
-#: scripts/dpkg-source.pl:321
+#: scripts/dpkg-source.pl:324
#, perl-format
msgid "can't build with source format '%s': %s"
-msgstr "kann nicht mit Quellformat %s bauen: %s"
+msgstr "kann nicht mit Quellformat »%s« bauen: %s"
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
-msgstr "verwende Quellformat %s"
+msgstr "verwende Quellformat »%s«"
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1807,43 +1804,43 @@ msgstr "verwende Quellformat %s"
msgid "building %s in %s"
msgstr "baue %s in %s"
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
-msgstr "-x bentigt mindestens ein Argument, die .dsc"
+msgstr "-x benötigt mindestens ein Argument, die .dsc"
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr "-x akzeptiert nicht mehr als zwei Argumente"
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
-msgstr "-x bentigt die .dsc-Datei als erstes Argument, kein Verzeichnis"
+msgstr "-x benötigt die .dsc-Datei als erstes Argument, kein Verzeichnis"
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr "Entpackziel existiert: %s"
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
-msgstr "%s enthlt keine gltige OpenPGP-Signatur"
+msgstr "%s enthält keine gültige OpenPGP-Signatur"
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr "extrahiere unsigniertes Quellpaket (%s)"
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, perl-format
msgid "extracting %s in %s"
msgstr "extrahiere %s nach %s"
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr "nur entweder -x, -b oder --print-format erlaubt, und nur einmal"
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson\n"
@@ -1855,7 +1852,7 @@ msgstr ""
"Copyright (C) 1997 Klee Dienes\n"
"Copyright (C) 2008 Raphael Hertzog"
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1874,9 +1871,9 @@ msgstr ""
" extrahiere Quellpaket.\n"
" -b <Verz> baue Quellpaket.\n"
" --print-format <Verz> gebe das Quellformat aus, dass zum Bau des\n"
-" Quellpakets verwandt wrde."
+" Quellpakets verwandt würde."
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, perl-format
msgid ""
"Build options:\n"
@@ -1904,21 +1901,21 @@ msgstr ""
" -F<Changelogformat> erzwinge Changelog-Format.\n"
" -V<Name>=<Wert> setze eine Subtitutionsvariable.\n"
" -T<Varlistdatei> lese Variablen hier.\n"
-" -D<Feld>=<Wert> berschreibe oder ergnze ein .dsc-Feld und\n"
+" -D<Feld>=<Wert> überschreibe oder ergänze ein .dsc-Feld und\n"
" Wert.\n"
" -U<Feld> entferne ein Feld.\n"
" -q stiller Modus.\n"
" -i[<Regaus>] Filter Dateien heraus, deren Diffs ignoriert "
"werden\n"
-" (Vorgabe: %s).\n"
+" (Vorgabe: »%s«).\n"
" -I[<Muster>] Dateien beim Bauen des Tarballs herausfiltern.\n"
" (Vorgabe: %s).\n"
-" -Z<Komprimierung> whle zu verwendene Kompression aus (Vorgabe:\n"
-" %s, untersttzt werden: %s)\n"
-" -z<Stufe> whle zu verwendende Kompressionsstufe (Vorgabe:\n"
-" %d, untersttzt werden: 1-9, best, fast)"
+" -Z<Komprimierung> wähle zu verwendene Kompression aus (Vorgabe:\n"
+" »%s«, unterstützt werden: %s)\n"
+" -z<Stufe> wähle zu verwendende Kompressionsstufe (Vorgabe:\n"
+" »%d«, unterstützt werden: »1«-»9«, »best«, »fast«)"
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1928,13 +1925,13 @@ msgid ""
"signature"
msgstr ""
"Extrahierungsoptionen:\n"
-" --no-copy kopiere .orig-Tarblle nicht.\n"
-" --no-check prfe vor dem Entpacken Signaturen und "
-"Prfsummen nicht.\n"
-" --require-valid-signature breche ab, falls das Paket keine gltige "
+" --no-copy kopiere .orig-Tarbälle nicht.\n"
+" --no-check prüfe vor dem Entpacken Signaturen und "
+"Prüfsummen nicht.\n"
+" --require-valid-signature breche ab, falls das Paket keine gültige "
"Signatur hat."
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
msgid ""
"General options:\n"
" -h, --help show this help message.\n"
@@ -1944,13 +1941,13 @@ msgstr ""
" -h, --help zeige diese Hilfemeldung.\n"
" --version zeige die Version."
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
msgstr ""
-"Abhngig vom Quellpaketformat sind weitere Optionen verfgbar.\n"
-"Lesen Sie dpkg-source(1) fr weiter Informationen."
+"Abhängig vom Quellpaketformat sind weitere Optionen verfügbar.\n"
+"Lesen Sie dpkg-source(1) für weiter Informationen."
#: scripts/changelog/debian.pl:36
msgid ""
@@ -1997,33 +1994,33 @@ msgstr ""
" --version, -V gebe Versionsinformation aus\n"
" --label, -l <Datei> Name der Changelogdatei zur Verwendung\n"
" in Fehlermeldungen.\n"
-" --file <Datei> auszuwertende Changelogdatei, standardmig\n"
-" - (Standardeingabe)\n"
-" --format <Ausgabeformat> siehe Handbuchseite fr verfgbare\n"
-" Ausgabeformate, standardmig dpkg zur\n"
-" Kompatibilitt mit dpkg-dev\n"
-" --since, -s, -v <Version> nehme alle nderungen jnger als Version\n"
+" --file <Datei> auszuwertende Changelogdatei, standardmäßig\n"
+" »-« (Standardeingabe)\n"
+" --format <Ausgabeformat> siehe Handbuchseite für verfügbare\n"
+" Ausgabeformate, standardmäßig »dpkg« zur\n"
+" Kompatibilität mit dpkg-dev\n"
+" --since, -s, -v <Version> nehme alle Änderungen jünger als Version\n"
" hinzu\n"
-" --until, -u <Version> nehme alle nderungen lter als Version\n"
+" --until, -u <Version> nehme alle Änderungen älter als Version\n"
" hinzu\n"
-" --from, -f <Version> nehme alle nderungen jnger als oder "
+" --from, -f <Version> nehme alle Änderungen jünger als oder "
"identisch\n"
" mit Version hinzu\n"
-" --to, -t <Version> nehme alle nderungen lter als oder "
+" --to, -t <Version> nehme alle Änderungen älter als oder "
"identisch\n"
" mit Version hinzu.\n"
-" --count, -c, -n <Zahl> fge <Zahl> Eintrge von oben (oder von\n"
+" --count, -c, -n <Zahl> füge <Zahl> Einträge von oben (oder von\n"
" unten, falls <Zahl> kleiner als 0 ist) "
"hinzu\n"
-" --offset, -o <Zahl> ndere den Startpunkt fr --count, gezhlt\n"
+" --offset, -o <Zahl> ändere den Startpunkt für --count, gezählt\n"
" von oben (oder von unten, falls <Zahl>\n"
" kleiner als Null ist)\n"
-" --all fge alle nderungen hinzu\n"
+" --all füge alle Änderungen hinzu\n"
#: scripts/changelog/debian.pl:86
#, perl-format
msgid "output format %s not supported"
-msgstr "Ausgabeformat %s nicht untersttzt"
+msgstr "Ausgabeformat %s nicht unterstützt"
#: scripts/changelog/debian.pl:111
#, perl-format
@@ -2049,34 +2046,34 @@ msgid ""
"compilation)"
msgstr ""
"Konnte gcc-Systemtyp nicht ermitteln, falle auf Standardwerte (native "
-"bersetzung) zurck"
+"Übersetzung) zurück"
#: scripts/Dpkg/Arch.pm:94
#, perl-format
msgid ""
"Unknown gcc system type %s, falling back to default (native compilation)"
msgstr ""
-"Unbekannter gcc-Systemtyp %s, falle auf Standard (native bersetzung) zurck"
+"Unbekannter gcc-Systemtyp %s, falle auf Standard (native Übersetzung) zurück"
#: scripts/Dpkg/BuildFlags.pm:197
#, perl-format
msgid "line %d of %s mentions unknown flag %s"
-msgstr "Zeile %d von %s erwhnt unbekannten Schalter %s"
+msgstr "Zeile %d von %s erwähnt unbekannten Schalter %s"
#: scripts/Dpkg/BuildFlags.pm:206
#, perl-format
msgid "line %d of %s is invalid, it has been ignored."
-msgstr "Zeile %d von %s ist ungltig, sie wurde ignoriert"
+msgstr "Zeile %d von %s ist ungültig, sie wurde ignoriert"
#: scripts/Dpkg/BuildOptions.pm:91
#, perl-format
msgid "invalid flag in %s: %s"
-msgstr "ungltiger Schalter in %s: %s"
+msgstr "ungültiger Schalter in %s: %s"
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
-msgstr "%s ist keine untersttzte Kompressionsmethode"
+msgstr "%s ist keine unterstützte Kompressionsmethode"
#: scripts/Dpkg/Compression/Process.pm:122
msgid "Dpkg::Compression::Process can only start one subprocess at a time"
@@ -2104,28 +2101,28 @@ msgstr "%s(l%s): %s"
#: scripts/Dpkg/Changelog.pm:221
msgid "'offset' without 'count' has no effect"
-msgstr "offset ohne count hat keinen Effekt"
+msgstr "»offset« ohne »count« hat keinen Effekt"
#: scripts/Dpkg/Changelog.pm:229
msgid "you can't combine 'count' or 'offset' with any other range option"
msgstr ""
-"Sie knnen count oder offset nicht mit einer anderen Bereichsoption "
+"Sie können »count« oder »offset« nicht mit einer anderen Bereichsoption "
"kombinieren"
#: scripts/Dpkg/Changelog.pm:237
msgid "you can only specify one of 'from' and 'since', using 'since'"
msgstr ""
-"Sie knnen nur entweder from oder since spezifizieren, verwende since"
+"Sie können nur entweder »from« oder »since« spezifizieren, verwende »since«"
#: scripts/Dpkg/Changelog.pm:242
msgid "you can only specify one of 'to' and 'until', using 'until'"
-msgstr "Sie knnen nur entweder to oder until spezifizieren, verwende until"
+msgstr "Sie können nur entweder »to« oder »until« spezifizieren, verwende »until«"
#: scripts/Dpkg/Changelog.pm:254 scripts/Dpkg/Changelog.pm:270
#: scripts/Dpkg/Changelog.pm:286 scripts/Dpkg/Changelog.pm:302
#, perl-format
msgid "'%s' option specifies non-existing version"
-msgstr "Option %s spezifiziert nicht existierende Version"
+msgstr "Option »%s« spezifiziert nicht existierende Version"
#: scripts/Dpkg/Changelog.pm:255 scripts/Dpkg/Changelog.pm:303
msgid "use newest entry that is smaller than the one specified"
@@ -2133,41 +2130,41 @@ msgstr "benutze neusten Eintrag der kleiner als der angegebene ist"
#: scripts/Dpkg/Changelog.pm:264
msgid "none found, starting from the oldest entry"
-msgstr "keiner gefunden, beginne beim ltesten Eintrag"
+msgstr "keiner gefunden, beginne beim ältesten Eintrag"
#: scripts/Dpkg/Changelog.pm:271 scripts/Dpkg/Changelog.pm:287
msgid "use oldest entry that is bigger than the one specified"
-msgstr "benutze ltesten Eintrag der grer als der angegebene ist"
+msgstr "benutze ältesten Eintrag der größer als der angegebene ist"
#: scripts/Dpkg/Changelog.pm:281 scripts/Dpkg/Changelog.pm:297
#: scripts/Dpkg/Changelog.pm:312
#, perl-format
msgid "no such entry found, ignoring '%s' parameter"
-msgstr "kein solcher Eintrag gefunden, ignoriere den Parameter %s"
+msgstr "kein solcher Eintrag gefunden, ignoriere den Parameter »%s«"
#: scripts/Dpkg/Changelog.pm:318
msgid "'since' option specifies most recent version, ignoring"
-msgstr "Option since spezifiziert die neuste Version, ignoriere"
+msgstr "Option »since« spezifiziert die neuste Version, ignoriere"
#: scripts/Dpkg/Changelog.pm:322
msgid "'until' option specifies oldest version, ignoring"
-msgstr "Option until spezifiziert die lteste Version, ignoriere"
+msgstr "Option »until« spezifiziert die älteste Version, ignoriere"
#: scripts/Dpkg/Changelog/Debian.pm:54
msgid "first heading"
-msgstr "erste berschrift"
+msgstr "erste Überschrift"
#: scripts/Dpkg/Changelog/Debian.pm:55
msgid "next heading or eof"
-msgstr "nchste berschrift oder Dateiende"
+msgstr "nächste Überschrift oder Dateiende"
#: scripts/Dpkg/Changelog/Debian.pm:56
msgid "start of change data"
-msgstr "Beginn der change-Daten"
+msgstr "Beginn der »change«-Daten"
#: scripts/Dpkg/Changelog/Debian.pm:57
msgid "more change data or trailer"
-msgstr "weitere change-Daten oder Abspann"
+msgstr "weitere »change«-Daten oder Abspann"
#: scripts/Dpkg/Changelog/Debian.pm:89
#, perl-format
@@ -2176,7 +2173,7 @@ msgstr "Starteintrag gefunden wo %s erwartet wurde"
#: scripts/Dpkg/Changelog/Debian.pm:126
msgid "badly formatted heading line"
-msgstr "ungltig formatierte Kopfzeile"
+msgstr "ungültig formatierte Kopfzeile"
#: scripts/Dpkg/Changelog/Debian.pm:130
#, perl-format
@@ -2186,12 +2183,12 @@ msgstr "Nachspann gefunden aber %s erwartet"
#: scripts/Dpkg/Changelog/Debian.pm:140
#: scripts/Dpkg/Changelog/Entry/Debian.pm:149
msgid "badly formatted trailer line"
-msgstr "ungltig formatierte Zeile im Nachspann"
+msgstr "ungültig formatierte Zeile im Nachspann"
#: scripts/Dpkg/Changelog/Debian.pm:143
#, perl-format
msgid "found change data where expected %s"
-msgstr "nderungsdaten statt des erwarteten %s gefunden"
+msgstr "Änderungsdaten statt des erwarteten %s gefunden"
#: scripts/Dpkg/Changelog/Debian.pm:165
#, perl-format
@@ -2210,12 +2207,12 @@ msgstr "fand EOF wo %s erwartet wurde"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:122
#, perl-format
msgid "bad key-value after `;': `%s'"
-msgstr "ungltiger Schlsselwert nach ;: %s"
+msgstr "ungültiger Schlüsselwert nach »;«: %s"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:127
#, perl-format
msgid "repeated key-value %s"
-msgstr "wiederholter Schlsselwert %s"
+msgstr "wiederholter Schlüsselwert %s"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:131
#, perl-format
@@ -2225,11 +2222,11 @@ msgstr "falsch formatierter Dringlichkeitswert: %s"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:135
#, perl-format
msgid "unknown key-value %s"
-msgstr "unbekannter Schlsselwert %s"
+msgstr "unbekannter Schlüsselwert %s"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:139
msgid "the header doesn't match the expected regex"
-msgstr "die Kopfzeile passte nicht auf den erwarteten regulren Ausdruck"
+msgstr "die Kopfzeile passte nicht auf den erwarteten regulären Ausdruck"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:152
#, perl-format
@@ -2238,7 +2235,7 @@ msgstr "konnte Datum %s nicht auswerten"
#: scripts/Dpkg/Changelog/Entry/Debian.pm:155
msgid "the trailer doesn't match the expected regex"
-msgstr "der Abspann passte nicht auf den erwarteten regulren Ausdruck"
+msgstr "der Abspann passte nicht auf den erwarteten regulären Ausdruck"
#: scripts/Dpkg/Changelog/Parse.pm:106
#, perl-format
@@ -2248,7 +2245,7 @@ msgstr "Ende von %s"
#: scripts/Dpkg/Changelog/Parse.pm:118
#, perl-format
msgid "format parser %s not executable"
-msgstr "Formatparser %s nicht ausfhrbar"
+msgstr "Formatparser %s nicht ausführbar"
#: scripts/Dpkg/Changelog/Parse.pm:121
#, perl-format
@@ -2258,7 +2255,7 @@ msgstr "unbekanntes Changelog-Format %s"
#: scripts/Dpkg/Changelog/Parse.pm:144
#, perl-format
msgid "cannot exec format parser: %s"
-msgstr "kann Formatparser nicht ausfhren: %s"
+msgstr "kann Formatparser nicht ausführen: %s"
#: scripts/Dpkg/Changelog/Parse.pm:151
msgid "output of changelog parser"
@@ -2272,37 +2269,37 @@ msgstr "Changelog-Parser %s"
#: scripts/Dpkg/Checksums.pm:170
#, perl-format
msgid "cannot fstat file %s"
-msgstr "kann keinen Fstat auf Datei %s durchfhren"
+msgstr "kann keinen Fstat auf Datei %s durchführen"
#: scripts/Dpkg/Checksums.pm:172
#, perl-format
msgid "File %s has size %u instead of expected %u"
-msgstr "Datei %s hat Gre %u statt erwarteten %u"
+msgstr "Datei %s hat Größe %u statt erwarteten %u"
#: scripts/Dpkg/Checksums.pm:186
#, perl-format
msgid "File %s has checksum %s instead of expected %s (algorithm %s)"
-msgstr "Datei %s hat Prfsumme %s statt der erwarteten %s (Algorithmus %s)"
+msgstr "Datei %s hat Prüfsumme %s statt der erwarteten %s (Algorithmus %s)"
#: scripts/Dpkg/Checksums.pm:191
#, perl-format
msgid "checksum program gave bogus output `%s'"
-msgstr "Prfsummenprogramm gab falsche Ausgabe %s"
+msgstr "Prüfsummenprogramm gab falsche Ausgabe »%s«"
#: scripts/Dpkg/Checksums.pm:219
#, perl-format
msgid "invalid line in %s checksums string: %s"
-msgstr "ungltige Zeile in %s Prfsummenzeichenkette: %s"
+msgstr "ungültige Zeile in %s Prüfsummenzeichenkette: %s"
#: scripts/Dpkg/Checksums.pm:225
#, perl-format
msgid "Conflicting checksums `%s' and `%s' for file `%s'"
-msgstr "Widersprchliche Prfsummen %s und %s fr Datei %s"
+msgstr "Widersprüchliche Prüfsummen »%s« und »%s« für Datei »%s«"
#: scripts/Dpkg/Checksums.pm:229
#, perl-format
msgid "Conflicting file sizes `%u' and `%u' for file `%s'"
-msgstr "Dateigren %u und %u fr Datei %s stehen im Widerspruch"
+msgstr "Dateigrößen »%u« und »%u« für Datei »%s« stehen im Widerspruch"
#: scripts/Dpkg/Conf.pm:105
#, perl-format
@@ -2312,7 +2309,7 @@ msgstr "kurze Option in %s auf Zeile %d nicht erlaubt"
#: scripts/Dpkg/Conf.pm:119
#, perl-format
msgid "invalid syntax for option in %s, line %d"
-msgstr "Syntaxfehler fr Option in %s auf Zeile %d"
+msgstr "Syntaxfehler für Option in %s auf Zeile %d"
#: scripts/Dpkg/Control.pm:150
msgid "general section of control info file"
@@ -2351,7 +2348,7 @@ msgstr "Eintrag in Dpkgs Statusdatei"
#: scripts/Dpkg/Control/Fields.pm:446
#, perl-format
msgid "unknown information field '%s' in input data in %s"
-msgstr "unbekanntes Informationsfeld %s in den Eingabedaten in %s"
+msgstr "unbekanntes Informationsfeld »%s« in den Eingabedaten in %s"
#: scripts/Dpkg/Control/Fields.pm:447
msgid "control information"
@@ -2359,11 +2356,11 @@ msgstr "Steuerinformation"
#: scripts/Dpkg/Control/Info.pm:103
msgid "first block lacks a source field"
-msgstr "im ersten Block fehlt ein Feld source"
+msgstr "im ersten Block fehlt ein Feld »source«"
#: scripts/Dpkg/Control/Info.pm:110
msgid "block lacks a package field"
-msgstr "im Block fehlt ein Feld package"
+msgstr "im Block fehlt ein Feld »package«"
#: scripts/Dpkg/Control/Hash.pm:172
#, perl-format
@@ -2372,7 +2369,7 @@ msgstr "doppeltes Feld %s gefunden"
#: scripts/Dpkg/Control/Hash.pm:180
msgid "continued value line not in field"
-msgstr "fortgefhrte Wertzeile nicht im Feld"
+msgstr "fortgeführte Wertzeile nicht im Feld"
#: scripts/Dpkg/Control/Hash.pm:194
msgid "PGP signature not allowed here"
@@ -2385,11 +2382,11 @@ msgstr "erwartete PGP-Signatur, fand EOF nach einer Leerzeile"
#: scripts/Dpkg/Control/Hash.pm:205
#, perl-format
msgid "expected PGP signature, found something else `%s'"
-msgstr "erwartete PGP-Signatur, fand etwas anderes %s"
+msgstr "erwartete PGP-Signatur, fand etwas anderes »%s«"
#: scripts/Dpkg/Control/Hash.pm:213
msgid "unfinished PGP signature"
-msgstr "unvollstndige PGP-Signatur"
+msgstr "unvollständige PGP-Signatur"
#: scripts/Dpkg/Control/Hash.pm:219
msgid "line with unknown format (not field-colon-value)"
@@ -2397,17 +2394,17 @@ msgstr "Zeile mit unbekanntem Format (nicht Feld-Doppelpunkt-Wert)"
#: scripts/Dpkg/Control/Hash.pm:316
msgid "write error on control data"
-msgstr "Schreibfehler bei Steuerdaten (control data)"
+msgstr "Schreibfehler bei Steuerdaten (»control data«)"
#: scripts/Dpkg/Deps.pm:274
#, perl-format
msgid "can't parse dependency %s"
-msgstr "kann Abhngigkeit %s nicht auswerten"
+msgstr "kann Abhängigkeit %s nicht auswerten"
#: scripts/Dpkg/Deps.pm:301
msgid "an union dependency can only contain simple dependencies"
msgstr ""
-"eine Vereinigungsabhngigkeit kann nur einfache Abhngigkeiten enthalten"
+"eine Vereinigungsabhängigkeit kann nur einfache Abhängigkeiten enthalten"
#: scripts/Dpkg/ErrorHandling.pm:54
msgid "info"
@@ -2430,7 +2427,7 @@ msgstr "%s gab Fehler-Exitstatus %s"
#: scripts/Dpkg/ErrorHandling.pm:94
#, perl-format
msgid "%s died from signal %s"
-msgstr "%s wurde durch Signal %s gettet"
+msgstr "%s wurde durch Signal %s getötet"
#: scripts/Dpkg/ErrorHandling.pm:96
#, perl-format
@@ -2446,12 +2443,12 @@ msgstr "Syntaxfehler in %s auf Zeile %d: %s"
#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:260
#, perl-format
msgid "cannot close %s"
-msgstr "kann %s nicht schlieen"
+msgstr "kann %s nicht schließen"
#: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
#, perl-format
msgid "pipe for %s"
-msgstr "Pipe fr %s"
+msgstr "Pipe für %s"
#: scripts/Dpkg/IPC.pm:242
#, perl-format
@@ -2460,11 +2457,11 @@ msgstr "chdir nach %s"
#: scripts/Dpkg/IPC.pm:249
msgid "reopen stdin"
-msgstr "ffne Stdin erneut"
+msgstr "öffne Stdin erneut"
#: scripts/Dpkg/IPC.pm:257 scripts/Dpkg/IPC.pm:265
msgid "reopen stdout"
-msgstr "ffne Stdout erneut"
+msgstr "öffne Stdout erneut"
#: scripts/Dpkg/IPC.pm:339
msgid "child process"
@@ -2484,12 +2481,12 @@ msgstr[1] "%s beendeten sich nicht innerhalb von %d Sekunden"
#: scripts/Dpkg/Shlibs/Cppfilt.pm:50
msgid "unable to execute c++filt"
-msgstr "konnte c++filt nicht ausfhren"
+msgstr "konnte c++filt nicht ausführen"
#: scripts/Dpkg/Shlibs/Objdump.pm:92
#, perl-format
msgid "objdump on `%s'"
-msgstr "objdump auf %s"
+msgstr "objdump auf »%s«"
#: scripts/Dpkg/Shlibs/Objdump.pm:199
#, perl-format
@@ -2510,14 +2507,14 @@ msgstr "Symbolname nicht spezifiziert: %s"
#, perl-format
msgid "you can't use symver tag to catch unversioned symbols: %s"
msgstr ""
-"Sie knnen die Markierung symver nicht zum Abfangen unversionierter Symbole "
+"Sie können die Markierung symver nicht zum Abfangen unversionierter Symbole "
"verwenden: %s"
#: scripts/Dpkg/Shlibs/SymbolFile.pm:218
#, perl-format
msgid "Symbol information must be preceded by a header (file %s, line %s)."
msgstr ""
-"Symbol-Informationen mssen durch Kopfzeile eingeleitet werden (Datei %s, "
+"Symbol-Informationen müssen durch Kopfzeile eingeleitet werden (Datei %s, "
"Zeile %s)."
#: scripts/Dpkg/Shlibs/SymbolFile.pm:226
@@ -2534,11 +2531,11 @@ msgstr "Konnte eine Zeile in %s nicht auswerten: %s"
#, perl-format
msgid "Tried to merge the same object (%s) twice in a symfile."
msgstr ""
-"Versuchte zweimal in einer Symdatei das gleiche Objekt (%s) zusammenzufhren."
+"Versuchte zweimal in einer Symdatei das gleiche Objekt (%s) zusammenzuführen."
#: scripts/Dpkg/Shlibs/SymbolFile.pm:388
msgid "Can't merge symbols from objects without SONAME."
-msgstr "Kann Symbole von Objekten ohne SONAME nicht zusammenfhren."
+msgstr "Kann Symbole von Objekten ohne SONAME nicht zusammenführen."
#: scripts/Dpkg/Source/Archive.pm:64
msgid "write on tar input"
@@ -2546,7 +2543,7 @@ msgstr "schreibe auf Tar-Eingabe"
#: scripts/Dpkg/Source/Archive.pm:89
msgid "close on tar input"
-msgstr "schliee auf Tar-Eingabe"
+msgstr "schließe auf Tar-Eingabe"
#: scripts/Dpkg/Source/Archive.pm:114 scripts/Dpkg/Source/Patch.pm:435
#: scripts/Dpkg/Source/Package/V3/git.pm:182
@@ -2554,11 +2551,11 @@ msgstr "schliee auf Tar-Eingabe"
msgid "cannot create directory %s"
msgstr "kann Verzeichnis %s nicht anlegen"
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, perl-format
msgid "cannot opendir %s"
-msgstr "kann Verzeichnis %s nicht ffnen"
+msgstr "kann Verzeichnis %s nicht öffnen"
#: scripts/Dpkg/Source/Archive.pm:152 scripts/Dpkg/Source/Archive.pm:156
#, perl-format
@@ -2568,33 +2565,33 @@ msgstr "Kann %s nicht in %s umbenennen"
#: scripts/Dpkg/Source/Functions.pm:34
#, perl-format
msgid "cannot stat directory %s (before removal)"
-msgstr "kann (vor Entfernung) kein Stat auf Verzeichnis %s ausfhren"
+msgstr "kann (vor Entfernung) kein Stat auf Verzeichnis %s ausführen"
#: scripts/Dpkg/Source/Functions.pm:40
#, perl-format
msgid "unable to check for removal of dir `%s'"
-msgstr "kann nicht auf Entfernung des Verzeichnisses %s prfen"
+msgstr "kann nicht auf Entfernung des Verzeichnisses »%s« prüfen"
#: scripts/Dpkg/Source/Functions.pm:42
#, perl-format
msgid "rm -rf failed to remove `%s'"
-msgstr "rm -rf entfernte %s nicht"
+msgstr "rm -rf entfernte »%s« nicht"
#: scripts/Dpkg/Source/Patch.pm:69 scripts/Dpkg/Source/Package/V2.pm:335
msgid "binary file contents changed"
-msgstr "Inhalt der Binrdatei gendert"
+msgstr "Inhalt der Binärdatei geändert"
#: scripts/Dpkg/Source/Patch.pm:117
#, perl-format
msgid "file %s has no final newline (either original or modified version)"
msgstr ""
-"Datei %s hat keinen abschlieenden Zeilenumbruch (entweder Original oder "
+"Datei %s hat keinen abschließenden Zeilenumbruch (entweder Original oder "
"modifizierte Version)"
#: scripts/Dpkg/Source/Patch.pm:121
#, perl-format
msgid "unknown line from diff -u on %s: `%s'"
-msgstr "unbekannte Zeile von diff -u auf %s: %s"
+msgstr "unbekannte Zeile von diff -u auf %s: »%s«"
#: scripts/Dpkg/Source/Patch.pm:124 scripts/Dpkg/Source/Patch.pm:127
msgid "failed to write"
@@ -2609,7 +2606,7 @@ msgstr "Diff auf %s"
#: scripts/Dpkg/Source/Patch.pm:223 scripts/Dpkg/Source/Patch.pm:235
#, perl-format
msgid "cannot stat file %s"
-msgstr "kann keinen Stat auf Datei %s durchfhren"
+msgstr "kann keinen Stat auf Datei %s durchführen"
#: scripts/Dpkg/Source/Patch.pm:171 scripts/Dpkg/Source/Patch.pm:173
#, perl-format
@@ -2619,21 +2616,21 @@ msgstr "kann Link %s nicht lesen"
#: scripts/Dpkg/Source/Patch.pm:199
#, perl-format
msgid "newly created empty file '%s' will not be represented in diff"
-msgstr "neu angelegte leere Datei %s wird im Diff nicht dargestellt werden"
+msgstr "neu angelegte leere Datei »%s« wird im Diff nicht dargestellt werden"
#: scripts/Dpkg/Source/Patch.pm:203
#, perl-format
msgid "executable mode %04o of '%s' will not be represented in diff"
-msgstr "ausfhrbarer Modus %04o von %s wird nicht im Diff dargestellt werden"
+msgstr "ausführbarer Modus %04o von »%s« wird nicht im Diff dargestellt werden"
#: scripts/Dpkg/Source/Patch.pm:208
#, perl-format
msgid "special mode %04o of '%s' will not be represented in diff"
-msgstr "besonderer Modus %04o von %s wird nicht im Diff dargestellt werden"
+msgstr "besonderer Modus %04o von »%s« wird nicht im Diff dargestellt werden"
#: scripts/Dpkg/Source/Patch.pm:219
msgid "device or socket is not allowed"
-msgstr "Gert oder Socket ist nicht erlaubt"
+msgstr "Gerät oder Socket ist nicht erlaubt"
#: scripts/Dpkg/Source/Patch.pm:228
msgid "unknown file type"
@@ -2642,27 +2639,27 @@ msgstr "unbekannter Dateityp"
#: scripts/Dpkg/Source/Patch.pm:243
#, perl-format
msgid "ignoring deletion of file %s"
-msgstr "ignoriere Lschen der Datei %s"
+msgstr "ignoriere Löschen der Datei %s"
#: scripts/Dpkg/Source/Patch.pm:246
#, perl-format
msgid "ignoring deletion of directory %s"
-msgstr "ignoriere Lschen des Verzeichnisses %s"
+msgstr "ignoriere Löschen des Verzeichnisses %s"
#: scripts/Dpkg/Source/Patch.pm:248
#, perl-format
msgid "ignoring deletion of symlink %s"
-msgstr "ignoriere Lschen des Symlinks %s"
+msgstr "ignoriere Löschen des Symlinks %s"
#: scripts/Dpkg/Source/Patch.pm:270 scripts/Dpkg/Source/Package/V2.pm:334
#, perl-format
msgid "cannot represent change to %s: %s"
-msgstr "kann nderungen an %s nicht darstellen: %s"
+msgstr "kann Änderungen an %s nicht darstellen: %s"
#: scripts/Dpkg/Source/Patch.pm:277
#, perl-format
msgid "cannot represent change to %s:"
-msgstr "kann nderungen an %s nicht darstellen:^"
+msgstr "kann Änderungen an %s nicht darstellen:^"
#: scripts/Dpkg/Source/Patch.pm:278
#, perl-format
@@ -2677,44 +2674,44 @@ msgstr " alte Version ist %s"
#: scripts/Dpkg/Source/Patch.pm:322
#, perl-format
msgid "expected ^--- in line %d of diff `%s'"
-msgstr "erwartes ^--- in Zeile %d des Diffs %s"
+msgstr "erwartes ^--- in Zeile %d des Diffs »%s«"
#: scripts/Dpkg/Source/Patch.pm:327 scripts/Dpkg/Source/Patch.pm:342
#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
#, perl-format
msgid "%s contains an insecure path: %s"
-msgstr "%s enthlt einen unsicheren Pfad: %s"
+msgstr "%s enthält einen unsicheren Pfad: %s"
#: scripts/Dpkg/Source/Patch.pm:330
#, perl-format
msgid "diff `%s' patches file with name ending .dpkg-orig"
-msgstr "Diff %s patcht Datei deren Namen auf .dpkg-orig endet"
+msgstr "Diff »%s« patcht Datei deren Namen auf .dpkg-orig endet"
#: scripts/Dpkg/Source/Patch.pm:334
#, perl-format
msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
-msgstr "Diff %s endet in der Mitte von ---/+++ (Zeile %d)"
+msgstr "Diff »%s« endet in der Mitte von ---/+++ (Zeile %d)"
#: scripts/Dpkg/Source/Patch.pm:337
#, perl-format
msgid "line after --- isn't as expected in diff `%s' (line %d)"
-msgstr "Zeile nach --- ist im Diff %s (Zeile %d) nicht wie erwartet"
+msgstr "Zeile nach --- ist im Diff »%s« (Zeile %d) nicht wie erwartet"
#: scripts/Dpkg/Source/Patch.pm:345
#, perl-format
msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
-msgstr "keine der Dateinamen in ---/+++ ist im Diff %s (Zeile %d) relativ"
+msgstr "keine der Dateinamen in ---/+++ ist im Diff »%s« (Zeile %d) relativ"
#: scripts/Dpkg/Source/Patch.pm:351
#, perl-format
msgid "original and modified files are /dev/null in diff `%s' (line %d)"
msgstr ""
-"ursprngliche und genderte Dateien sind im Diff %s /dev/null (Zeile %d)"
+"ursprüngliche und geänderte Dateien sind im Diff »%s« /dev/null (Zeile %d)"
#: scripts/Dpkg/Source/Patch.pm:358
#, perl-format
msgid "file removal without proper filename in diff `%s' (line %d)"
-msgstr "Datei-Entfernung ohne passenden Dateinamen im Diff %s (Zeile %d)"
+msgstr "Datei-Entfernung ohne passenden Dateinamen im Diff »%s« (Zeile %d)"
#: scripts/Dpkg/Source/Patch.pm:360
#, perl-format
@@ -2724,42 +2721,42 @@ msgstr "Diff %s entfernt eine nicht existierende Datei %s (Zeile %d)"
#: scripts/Dpkg/Source/Patch.pm:373
#, perl-format
msgid "diff %s modifies file %s through a symlink: %s"
-msgstr "Diff %s verndert Datei %s ber einen Symlink: %s"
+msgstr "Diff %s verändert Datei %s über einen Symlink: %s"
#: scripts/Dpkg/Source/Patch.pm:380
#, perl-format
msgid "diff `%s' patches something which is not a plain file"
-msgstr "Diff %s patcht etwas, das keine einfache Datei ist"
+msgstr "Diff »%s« patcht etwas, das keine einfache Datei ist"
#: scripts/Dpkg/Source/Patch.pm:384
#, perl-format
msgid "diff `%s' patches file %s twice"
-msgstr "Diff %s patcht Datei %s zweifach"
+msgstr "Diff »%s« patcht Datei %s zweifach"
#: scripts/Dpkg/Source/Patch.pm:399 scripts/Dpkg/Source/Patch.pm:402
#, perl-format
msgid "unexpected end of diff `%s'"
-msgstr "unerwartetes Ende des Diffs %s"
+msgstr "unerwartetes Ende des Diffs »%s«"
#: scripts/Dpkg/Source/Patch.pm:411
#, perl-format
msgid "expected [ +-] at start of line %d of diff `%s'"
-msgstr "erwartete [ +-] am Anfang der Zeile %d des Diffs %s"
+msgstr "erwartete [ +-] am Anfang der Zeile %d des Diffs »%s«"
#: scripts/Dpkg/Source/Patch.pm:418
#, perl-format
msgid "expected ^@@ at line %d of diff `%s'"
-msgstr "erwartete ^@@ in Zeile %d des Diff %s"
+msgstr "erwartete ^@@ in Zeile %d des Diff »%s«"
#: scripts/Dpkg/Source/Patch.pm:423
#, perl-format
msgid "diff `%s' doesn't contain any patch"
-msgstr "Diff %s enthlt keinen Patch"
+msgstr "Diff »%s« enthält keinen Patch"
#: scripts/Dpkg/Source/Patch.pm:470
#, perl-format
msgid "cannot change timestamp for %s"
-msgstr "kann Zeitstempel fr %s nicht ndern"
+msgstr "kann Zeitstempel für %s nicht ändern"
#: scripts/Dpkg/Source/Patch.pm:474
#, perl-format
@@ -2770,10 +2767,10 @@ msgstr "entferne Patch-Sicherungskopiedatei %s"
msgid "nonexistent"
msgstr "nichtexistierend"
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
-msgstr "kann Stat von %s nicht ausfhren"
+msgstr "kann Stat von %s nicht ausführen"
#: scripts/Dpkg/Source/Patch.pm:518
msgid "plain file"
@@ -2790,11 +2787,11 @@ msgstr "Symlink auf %s"
#: scripts/Dpkg/Source/Patch.pm:521
msgid "block device"
-msgstr "Blockgert"
+msgstr "Blockgerät"
#: scripts/Dpkg/Source/Patch.pm:522
msgid "character device"
-msgstr "Zeichengert"
+msgstr "Zeichengerät"
#: scripts/Dpkg/Source/Patch.pm:523
msgid "named pipe"
@@ -2804,97 +2801,97 @@ msgstr "benannte Pipe"
msgid "named socket"
msgstr "benannter Socket"
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr "%s ist nicht der Name einer Datei"
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr "vermisse kritische Quellsteuerfeld %s"
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
-msgstr "Quellpaketformat %s nicht untersttzt (Perlmodul %s bentigt)"
+msgstr "Quellpaketformat »%s« nicht unterstützt (Perlmodul %s benötigt)"
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
-msgstr "ungltiges Formatfeld %s"
+msgstr "ungültiges Formatfeld »%s«"
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr ""
-"Quelle und Version werden bentigt, um den basename der Quelle zu ermitteln"
+"Quelle und Version werden benötigt, um den »basename« der Quelle zu ermitteln"
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
-msgstr "Fehler beim berprfen der Signatur von %s"
+msgstr "Fehler beim Überprüfen der Signatur von %s"
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
-msgstr "konnte Signatur von %s nicht berprfen, da Gpg nicht installiert ist"
+msgstr "konnte Signatur von %s nicht überprüfen, da Gpg nicht installiert ist"
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
-msgstr "%s ist keine gltige Option fr %s"
+msgstr "%s ist keine gültige Option für %s"
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr "%s existiert nicht"
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
-msgstr "kann Programm %s nicht ausfhrbar machen"
+msgstr "kann Programm %s nicht ausführbar machen"
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
-msgstr "%s ist keine gewhnliche Datei"
+msgstr "%s ist keine gewöhnliche Datei"
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
-msgstr "Option -s%s berschreibt vorhergehende Option -s%s"
+msgstr "Option -s%s überschreibt vorhergehende Option -s%s"
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr "Quellbearbeitungsstil -s%s nicht mit -x erlaubt"
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr "mehrere Tardateien in v1.0-Quellpaket"
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
-msgstr "unerkannte Datei fr ein %s-Quellpaket: %s"
+msgstr "unerkannte Datei für ein %s-Quellpaket: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr "keine Tardatei im Feld Files"
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr "natives Paket mit .orig.tar"
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
-msgstr "kann %s nicht in %s umbenennen"
+msgstr "kann »%s« nicht in »%s« umbenennen"
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2903,59 +2900,59 @@ msgstr "kann %s nicht in %s umbenennen"
msgid "unpacking %s"
msgstr "entpacke %s"
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr "kann Originalverzeichnis nicht behalten (existiert bereits)"
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr "Fehler beim Umbenennen des frisch-extrahierten %s in %s"
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr "Fehler beim Umbenennen des gesicherten %s in %s"
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr "wende %s an"
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
-msgstr "Dateien der Originalautoren, die verndert wurden: %s"
+msgstr "Dateien der Originalautoren, die verändert wurden: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
-msgstr "untersttzt nur Gzip-Komprimierung"
+msgstr "unterstützt nur Gzip-Komprimierung"
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
msgstr ""
-"-b akzeptiert hchstens ein Verzeichnis und eine Originalquelle als Argument "
+"-b akzeptiert höchstens ein Verzeichnis und eine Originalquelle als Argument "
"(mit v1.0-Quellpaket)"
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr "Bearbeitungsstil der Quellen -s%s nicht mit -b erlaubt"
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
-msgstr "gepackte orig. %s existiert, ist aber keine einfache Datei"
+msgstr "gepackte orig. »%s« existiert, ist aber keine einfache Datei"
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, perl-format
msgid "cannot stat orig argument %s"
-msgstr "kann Stat auf Originalargument %s nicht durchfhren"
+msgstr "kann Stat auf Originalargument %s nicht durchführen"
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2964,7 +2961,7 @@ msgstr ""
"Orig. Argument ist entpackt, aber Quellenhandhabungstil -s%s bittet um "
"gepackt (.orig.tar.<endung>)"
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2973,12 +2970,12 @@ msgstr ""
"Orig. Argument ist gepackt, aber Quellenhandhabungstil -s%s bittet um "
"entpackt (.orig/)"
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr "Original-Argument %s ist keine einfache Datei oder Verzeichnis"
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -2987,102 +2984,102 @@ msgstr ""
"Orig. Argument ist leer (bedeutet kein Orig., kein Diff), aber "
"Quellenhandhabungstil -s%s bittet erwartet etwas"
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
-msgstr "entpacktes Orig. %s existiert ist aber kein Verzeichnis"
+msgstr "entpacktes Orig. »%s« existiert ist aber kein Verzeichnis"
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr ""
-"unfhig, einen Stat auf das vermeintlich ausgepackte Original %s "
-"durchzufhren"
+"unfähig, einen Stat auf das vermeintlich ausgepackte Original »%s« "
+"durchzuführen"
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
-msgstr "Quellverzeichnis %s lautet nicht <Quellpaket>-<UpstreamVersion> %s"
+msgstr "Quellverzeichnis »%s« lautet nicht <Quellpaket>-<UpstreamVersion> »%s«"
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr ""
-".orig-Verzeichnisname %s ist nicht <Paket>-<Ursprungsversion> (erwnscht %s)"
+".orig-Verzeichnisname %s ist nicht <Paket>-<Ursprungsversion> (erwünscht %s)"
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
msgstr ""
-".orig.tar-Name %s lautet nicht <Paket>_<UpstreamVersion>.orig.tar (erwnscht "
+".orig.tar-Name %s lautet nicht <Paket>_<UpstreamVersion>.orig.tar (erwünscht "
"%s)"
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
"override"
msgstr ""
-"Tardatei %s existiert bereits, berschreibe nicht und gebe auf; verwenden "
+"Tardatei »%s« existiert bereits, überschreibe nicht und gebe auf; verwenden "
"Sie -sU oder -sR zum Erzwingen"
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
-msgstr "kann Existenz von %s nicht berprfen"
+msgstr "kann Existenz von »%s« nicht überprüfen"
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
-msgstr "konnte %s (neu angelegt) nicht in %s umbenennen"
+msgstr "konnte »%s« (neu angelegt) nicht in »%s« umbenennen"
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
#, perl-format
msgid "unable to change permission of `%s'"
-msgstr "konnte Berechtigungen auf %s nicht ndern"
+msgstr "konnte Berechtigungen auf »%s« nicht ändern"
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, perl-format
msgid "building %s using existing %s"
msgstr "baue %s unter Benutzung des existierenden %s"
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
"sP to override"
msgstr ""
-"Originalverzeichnis %s existiert bereits, berschreibe nicht und gebe auf; "
+"Originalverzeichnis »%s« existiert bereits, überschreibe nicht und gebe auf; "
"verwenden Sie -sA, -sK oder -sP zum Erzwingen."
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
-msgstr "kann die Existenz des Originalverzeichnisses %s nicht berprfen"
+msgstr "kann die Existenz des Originalverzeichnisses »%s« nicht überprüfen"
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
-msgstr "der Diff verndert die folgenden Dateien der Originalautoren: %s"
+msgstr "der Diff verändert die folgenden Dateien der Originalautoren: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
msgstr ""
-"verwenden Sie das Format 3.0 (quilt), um separate und dokumentierte "
-"nderungen an den Dateien der Originalautoren zu erhalten, siehe dpkg-source"
+"verwenden Sie das Format »3.0 (quilt)«, um separate und dokumentierte "
+"Änderungen an den Dateien der Originalautoren zu erhalten, siehe dpkg-source"
"(1)"
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
-msgstr "%s: nicht darstellbare nderung an den Quellen"
+msgstr "%s: nicht darstellbare Änderung an den Quellen"
#: scripts/Dpkg/Source/Package/V2.pm:102
#, perl-format
@@ -3096,7 +3093,7 @@ msgstr "fehlende orig.tar- oder debian.tar-Datei in v2.0-Quellpaket"
#: scripts/Dpkg/Source/Package/V2.pm:133
#, perl-format
msgid "required removal of `%s' installed by original tarball"
-msgstr "erforderliche Entfernung von %s, installiert durch Original-Tarball"
+msgstr "erforderliche Entfernung von »%s«, installiert durch Original-Tarball"
#: scripts/Dpkg/Source/Package/V2.pm:214 scripts/Dpkg/Source/Package/V2.pm:286
msgid "no orig.tar file found"
@@ -3117,7 +3114,7 @@ msgstr ""
#: scripts/Dpkg/Source/Package/V3/git.pm:125
#, perl-format
msgid "-b takes only one parameter with format `%s'"
-msgstr "-b akzeptiert nur einen Parameter mit dem Format %s"
+msgstr "-b akzeptiert nur einen Parameter mit dem Format »%s«"
#: scripts/Dpkg/Source/Package/V2.pm:273
#, perl-format
@@ -3135,13 +3132,13 @@ msgid ""
"add %s in debian/source/include-binaries if you want to store the modified "
"binary in the debian tarball"
msgstr ""
-"fgen Sie %s zu debian/source/include-binaries hinzu, falls Sie das "
-"vernderte Programme im Debian-Tarball speichern mchten."
+"fügen Sie %s zu debian/source/include-binaries hinzu, falls Sie das "
+"veränderte Programme im Debian-Tarball speichern möchten."
#: scripts/Dpkg/Source/Package/V2.pm:350
#, perl-format
msgid "unwanted binary file: %s"
-msgstr "unerwnschte Binrdate: %s"
+msgstr "unerwünschte Binärdate: %s"
#: scripts/Dpkg/Source/Package/V2.pm:379
#, perl-format
@@ -3149,12 +3146,12 @@ msgid ""
"detected %d unwanted binary file(s) (add them in debian/source/include-"
"binaries to allow their inclusion)."
msgstr ""
-"erkannte %d unerwnschte Binrdatei(en) (fgen sie zu debian/source/include-"
+"erkannte %d unerwünschte Binärdatei(en) (fügen sie zu debian/source/include-"
"binaries hinzu, um ihre Aufnahme zu erlauben)."
#: scripts/Dpkg/Source/Package/V2.pm:395
msgid "unrepresentable changes to source"
-msgstr "nicht darstellbare nderungen an den Quellen"
+msgstr "nicht darstellbare Änderungen an den Quellen"
#: scripts/Dpkg/Source/Package/V2.pm:399 scripts/Dpkg/Source/Package/V2.pm:403
#, perl-format
@@ -3164,7 +3161,7 @@ msgstr "kann %s nicht entfernen"
#: scripts/Dpkg/Source/Package/V2.pm:406
#, perl-format
msgid "local changes stored in %s, the modified files are:"
-msgstr "lokale nderungen in %s gespeichert, die vernderten Dateien sind:"
+msgstr "lokale Änderungen in %s gespeichert, die veränderten Dateien sind:"
#: scripts/Dpkg/Source/Package/V2.pm:412
#, perl-format
@@ -3174,7 +3171,7 @@ msgstr "kann %s nicht in %s umbenennen"
#: scripts/Dpkg/Source/Package/V2.pm:431
#, perl-format
msgid "adding %s to %s"
-msgstr "fge %s zu %s hinzu"
+msgstr "füge %s zu %s hinzu"
#: scripts/Dpkg/Source/Package/V3/bzr.pm:52
msgid ""
@@ -3203,11 +3200,11 @@ msgstr "%s ist ein Symlink"
#: scripts/Dpkg/Source/Package/V3/git.pm:82
#, perl-format
msgid "%s is a symlink to outside %s"
-msgstr "%s ist ein Symlink zum auerhalb befindlichen %s"
+msgstr "%s ist ein Symlink zum außerhalb befindlichen %s"
#: scripts/Dpkg/Source/Package/V3/bzr.pm:83
msgid "doesn't contain a bzr repository"
-msgstr "enthlt kein bzr-Depot"
+msgstr "enthält kein bzr-Depot"
#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
@@ -3221,7 +3218,7 @@ msgstr "enthlt kein bzr-Depot"
#: scripts/Dpkg/Source/Package/V3/git.pm:332
#, perl-format
msgid "unable to chdir to `%s'"
-msgstr "kann nicht in Verzeichnis %s wechseln"
+msgstr "kann nicht in Verzeichnis »%s« wechseln"
#: scripts/Dpkg/Source/Package/V3/bzr.pm:127
msgid "bzr status exited nonzero"
@@ -3232,7 +3229,7 @@ msgstr "bzr mit nicht-Null-Status beendet"
#, perl-format
msgid "uncommitted, not-ignored changes in working directory: %s"
msgstr ""
-"noch nicht bergebene, nicht ignorierte nderungen im Arbeitsverzeichnis: %s"
+"noch nicht übergebene, nicht ignorierte Änderungen im Arbeitsverzeichnis: %s"
#: scripts/Dpkg/Source/Package/V3/bzr.pm:179
#: scripts/Dpkg/Source/Package/V3/git.pm:243
@@ -3247,7 +3244,7 @@ msgstr "erwartete %s, erhielt %s"
#: scripts/Dpkg/Source/Package/V3/custom.pm:40
msgid "Format `3.0 (custom)' is only used to create source packages"
-msgstr "Format 3.0 (custom) wird nur zur Anlegung von Quellpaketen verwandt"
+msgstr "Format »3.0 (custom)« wird nur zur Anlegung von Quellpaketen verwandt"
#: scripts/Dpkg/Source/Package/V3/custom.pm:46
msgid "no files indicated on command line"
@@ -3260,7 +3257,7 @@ msgstr "Option --target-format fehlt"
#: scripts/Dpkg/Source/Package/V3/native.pm:53
#, perl-format
msgid "unrecognized file for a native source package: %s"
-msgstr "unerkante Datei fr natives Quellpaket: %s"
+msgstr "unerkante Datei für natives Quellpaket: %s"
#: scripts/Dpkg/Source/Package/V3/git.pm:58
msgid ""
@@ -3282,7 +3279,7 @@ msgstr ""
#: scripts/Dpkg/Source/Package/V3/git.pm:69
#, perl-format
msgid "git repository %s uses submodules. This is not yet supported."
-msgstr "Git-Depot %s verwendet Submodule. Dies wird noch nicht untersttzt."
+msgstr "Git-Depot %s verwendet Submodule. Dies wird noch nicht unterstützt."
#: scripts/Dpkg/Source/Package/V3/git.pm:104
msgid "git config exited nonzero"
@@ -3290,7 +3287,7 @@ msgstr "git config mit nicht-Null-Status beendet"
#: scripts/Dpkg/Source/Package/V3/git.pm:111
msgid "doesn't contain a git repository"
-msgstr "enthlt kein Git-Depot"
+msgstr "enthält kein Git-Depot"
#: scripts/Dpkg/Source/Package/V3/git.pm:167
msgid "git ls-files exited nonzero"
@@ -3299,21 +3296,21 @@ msgstr "git ls-files mit nicht-Null-Status beendet"
#: scripts/Dpkg/Source/Package/V3/git.pm:268
#, perl-format
msgid "executable bit set on %s; clearing"
-msgstr "%s hat das ausfhrbare Bit gesetzt; dies wird entfernt"
+msgstr "%s hat das ausführbare Bit gesetzt; dies wird entfernt"
#: scripts/Dpkg/Source/Package/V3/git.pm:279
#, perl-format
msgid "unable to remove `%s'"
-msgstr "kann %s nicht entfernen"
+msgstr "kann »%s« nicht entfernen"
#: scripts/Dpkg/Source/Package/V3/git.pm:305
msgid "modifying .git/config to comment out some settings"
-msgstr "verndere .git/config um einige Einstellungen auszukommentieren"
+msgstr "verändere .git/config um einige Einstellungen auszukommentieren"
#: scripts/Dpkg/Source/Package/V3/git.pm:307
#, perl-format
msgid "unable to append to %s"
-msgstr "kann nicht an %s anhngen"
+msgstr "kann nicht an %s anhängen"
#: scripts/Dpkg/Source/Package/V3/git.pm:308
msgid "The following setting(s) were disabled by dpkg-source"
@@ -3335,8 +3332,8 @@ msgid ""
"the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
"source might fail when applying patches."
msgstr ""
-"die Seriendatei (%s) enthlt nicht untersttzte Optionen (%s, Zeile %s), "
-"dpkg-source knnte beim Anwenden der Patches scheitern."
+"die Seriendatei (%s) enthält nicht unterstützte Optionen (»%s«, Zeile %s), "
+"dpkg-source könnte beim Anwenden der Patches scheitern."
#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
#, perl-format
@@ -3352,17 +3349,17 @@ msgstr "kann Symlink %s nicht anlegen"
#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
#, perl-format
msgid "unsupported version of the quilt metadata: %s"
-msgstr "nicht untersttzte Version der Quilt-Metadaten: %s"
+msgstr "nicht unterstützte Version der Quilt-Metadaten: %s"
#: scripts/Dpkg/Substvars.pm:150
#, perl-format
msgid "bad line in substvars file %s at line %d"
-msgstr "ungltige Zeile in der substvars-Datei %s in Zeile %d"
+msgstr "ungültige Zeile in der substvars-Datei %s in Zeile %d"
#: scripts/Dpkg/Substvars.pm:217
#, perl-format
msgid "too many substitutions - recursive ? - in `%s'"
-msgstr "zu viele - rekursive? - Substitutionen in %s"
+msgstr "zu viele - rekursive? - Substitutionen in »%s«"
#: scripts/Dpkg/Substvars.pm:224
#, perl-format
@@ -3377,24 +3374,24 @@ msgstr "unbenutzte Substitutionsvariable ${%s}"
#: scripts/Dpkg/Vars.pm:34
#, perl-format
msgid "source package name `%s' contains illegal character `%s'"
-msgstr "Quellpaketname %s enthlt ungltiges Zeichen %s"
+msgstr "Quellpaketname »%s« enthält ungültiges Zeichen »%s«"
#: scripts/Dpkg/Vars.pm:37
#, perl-format
msgid "source package name `%s' starts with non-alphanum"
-msgstr "Quellpaketname %s beginnt mit einem nicht alphanumerischen Zeichen"
+msgstr "Quellpaketname »%s« beginnt mit einem nicht alphanumerischen Zeichen"
#: scripts/Dpkg/Vars.pm:46
#, perl-format
msgid "source package has two conflicting values - %s and %s"
-msgstr "Quellpaket hat zwei widersprchliche Werte - %s und %s"
+msgstr "Quellpaket hat zwei widersprüchliche Werte - %s und %s"
#: scripts/Dpkg/Vendor/Ubuntu.pm:59 scripts/Dpkg/Vendor/Ubuntu.pm:61
msgid ""
"Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
"address"
msgstr ""
-"Versionsnummer lsst Ubuntu-nderungen vermuten, aber Maintainer: enthlt "
+"Versionsnummer lässt Ubuntu-Änderungen vermuten, aber Maintainer: enthält "
"keine Ubuntu-Adresse"
#: scripts/Dpkg/Vendor/Ubuntu.pm:65
@@ -3402,45 +3399,51 @@ msgid ""
"Version number suggests Ubuntu changes, but there is no XSBC-Original-"
"Maintainer field"
msgstr ""
-"Versionsnummer lsst Ubuntu-nderungen vermuten, aber es gibt kein Feld XSBC-"
+"Versionsnummer lässt Ubuntu-Änderungen vermuten, aber es gibt kein Feld XSBC-"
"Original-Maintainer"
#: scripts/Dpkg/Version.pm:197 scripts/Dpkg/Version.pm:198
#, perl-format
msgid "%s is not a valid version"
-msgstr "%s ist keine gltige Version"
+msgstr "%s ist keine gültige Version"
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr "Versionsnummer darf nicht leer sein"
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
-msgstr "Versionsnummer enthlt ungltiges Zeichen %s"
+msgstr "Versionsnummer enthält ungültiges Zeichen »%s«"
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
-msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
+msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: »%s«"
+
+#~ msgid "%s: use %s from environment: %s\n"
+#~ msgstr "%s: verwende %s aus Umgebung: %s\n"
+
+#~ msgid "%s: set %s to default value: %s\n"
+#~ msgstr "%s: setze %s auf Standardwert: %s\n"
#~ msgid "source format `%s' discarded: %s"
-#~ msgstr "Quellformat %s verworfen: %s"
+#~ msgstr "Quellformat »%s« verworfen: %s"
#~ msgid "cannot open .dsc file %s"
-#~ msgstr "kann .dsc-Datei %s nicht ffnen"
+#~ msgstr "kann .dsc-Datei %s nicht öffnen"
#~ msgid "source control file %s"
#~ msgstr "Quell-Steuerdatei %s"
#~ msgid "Files field contains bad line `%s'"
-#~ msgstr "Files-Feld enthlt ungltige Zeile %s"
+#~ msgstr "Files-Feld enthält ungültige Zeile »%s«"
#~ msgid "Conflicting sizes `%u' and `%u' for file `%s'"
-#~ msgstr "Widersprchliche Gren %u und %u fr Datei %s"
+#~ msgstr "Widersprüchliche Größen »%u« und »%u« für Datei »%s«"
#~ msgid "fork for du"
-#~ msgstr "Fork fr du"
+#~ msgstr "Fork für du"
#~ msgid ""
#~ "Usage: %s [<option> ...]\n"
@@ -3473,20 +3476,20 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ "Aufruf: %s [<Option> ...]\n"
#~ "\n"
#~ "Optionen:\n"
-#~ " -p<Paket> erstelle Symbol-Datei fr Paket.\n"
-#~ " -P<Paketbauverz> temporres Bauverzeichnis (statt debian/tmp).\n"
+#~ " -p<Paket> erstelle Symbol-Datei für Paket.\n"
+#~ " -P<Paketbauverz> temporäres Bauverzeichnis (statt debian/tmp).\n"
#~ " -e<Bibliothek> explizite Liste von zu durchsuchenden "
#~ "Dateien.\n"
-#~ " -v<Version> Version des Pakets (standardmig\n"
+#~ " -v<Version> Version des Pakets (standardmäßig\n"
#~ " aus debian/changelog extrahierte Version).\n"
#~ " -c<Stufe> vergleiche erstellte Symbol-Datei mit der\n"
#~ " Referenzdatei im debian-Verzeichnis.\n"
-#~ "\t\t\t Schlgt fehl, falls die Unterschiede zu wichtig\n"
-#~ "\t\t\t sind (Stufe luft von 0 fr keine Prfung bis zu\n"
-#~ "\t\t\t 4 fr alle Prfungen). Standardmig wird auf\n"
-#~ "\t\t\t Stufe 1 geprft.\n"
+#~ "\t\t\t Schlägt fehl, falls die Unterschiede zu wichtig\n"
+#~ "\t\t\t sind (Stufe läuft von 0 für keine Prüfung bis zu\n"
+#~ "\t\t\t 4 für alle Prüfungen). Standardmäßig wird auf\n"
+#~ "\t\t\t Stufe 1 geprüft.\n"
#~ " -I<Datei> erzwingt Verwendung von <Datei> statt der\n"
-#~ " standardmigen Datei als Referenz-Symbol-"
+#~ " standardmäßigen Datei als Referenz-Symbol-"
#~ "Datei.\n"
#~ " -O<Datei> schreibe in <Datei> nicht .../DEBIAN/symbols.\n"
#~ " -O schreibe nach Stdout nicht .../DEBIAN/"
@@ -3495,7 +3498,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ "werden\n"
#~ " nicht verarbeitet und in die Ausgabe "
#~ "aufgenommen).\n"
-#~ " -V geschwtzige Ausgabe. Schreibe veraltete "
+#~ " -V geschwätzige Ausgabe. Schreibe veraltete "
#~ "Symbole\n"
#~ " und Muster, die auf Symbole passen, als "
#~ "Kommmentare\n"
@@ -3508,36 +3511,36 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "einige Symbole sind aus der Symbol-Datei verschwunden: %s"
#~ msgid "invalid flag in DEB_BUILD_OPTIONS: %s"
-#~ msgstr "ungltiger Schalter in DEB_BUILD_OPTIONS: %s"
+#~ msgstr "ungültiger Schalter in DEB_BUILD_OPTIONS: %s"
#~ msgid "fork for %s"
-#~ msgstr "Fork fr %s"
+#~ msgstr "Fork für %s"
#~ msgid "Unknown checksum algorithm `%s', ignoring"
-#~ msgstr "Ignoriere unbekannter Prfsummenalgorithmus %s"
+#~ msgstr "Ignoriere unbekannter Prüfsummenalgorithmus »%s«"
#~ msgid "Checksums-%s field contains bad line `%s'"
-#~ msgstr "Prfsummen-%s-Feld enthlt ungltige Zeile %s"
+#~ msgstr "Prüfsummen-%s-Feld enthält ungültige Zeile »%s«"
#~ msgid "you can't use wildcards on unversioned symbols: %s"
#~ msgstr ""
-#~ "Sie knnen keine Joker-Zeichen fr unversionierte Symbole verwenden: %s"
+#~ "Sie können keine Joker-Zeichen für unversionierte Symbole verwenden: %s"
#~ msgid "Dpkg::Source::Compressor can only start one subprocess at a time"
#~ msgstr ""
#~ "Dpkg::Source::Compressor kann nur einen Subprozess auf einmal starten"
#~ msgid "file `%s' listed twice in Files field"
-#~ msgstr "Datei %s zweimal im Feld Files aufgefhrt"
+#~ msgstr "Datei »%s« zweimal im Feld Files aufgeführt"
#~ msgid "unable to open substvars file %s: %s"
-#~ msgstr "kann substvars-Datei %s nicht ffnen: %s"
+#~ msgstr "kann substvars-Datei %s nicht öffnen: %s"
#~ msgid "applying all patches with %s"
#~ msgstr "wende alle Patches mit %s an"
#~ msgid "Couldn't call dpkg-deb on %s: %s, skipping package"
-#~ msgstr "Konnte dpkg-deb auf %s nicht aufrufen: %s, berspringe Paket"
+#~ msgstr "Konnte dpkg-deb auf %s nicht aufrufen: %s, überspringe Paket"
#~ msgid ""
#~ "Unprocessed text from %s control file; info:\n"
@@ -3550,7 +3553,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "fataler Fehler"
#~ msgid "can't open file %s: %s"
-#~ msgstr "kann Datei %s nicht ffnen: %s"
+#~ msgstr "kann Datei %s nicht öffnen: %s"
#~ msgid "can't load IO::String: %s"
#~ msgstr "kann IO::String nicht laden: %s"
@@ -3559,22 +3562,22 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "keine Changelog-Datei angegeben"
#~ msgid "can't close file %s: %s"
-#~ msgstr "kann Datei %s nicht schlieen: %s"
+#~ msgstr "kann Datei %s nicht schließen: %s"
#~ msgid "Couldn't open override file %s"
-#~ msgstr "konnte override-Datei %s nicht ffnen"
+#~ msgstr "konnte override-Datei %s nicht öffnen"
#~ msgid "can't read override file %s"
#~ msgstr "kann Override-Datei %s nicht lesen"
#~ msgid "error closing override file"
-#~ msgstr "Fehler beim Schlieen der Override-Datei"
+#~ msgstr "Fehler beim Schließen der Override-Datei"
#~ msgid "can't read source override file %s"
#~ msgstr "kann Quell-Override-Datei %s nicht lesen"
#~ msgid "error closing source override file"
-#~ msgstr "Fehler beim Schlieen der Quell-Override-Datei"
+#~ msgstr "Fehler beim Schließen der Quell-Override-Datei"
#~ msgid "parsing an empty file %s"
#~ msgstr "kann leere Datei %s nicht auswerten"
@@ -3583,22 +3586,22 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "exec du"
#~ msgid "can't fork"
-#~ msgstr "kann keinen Fork durchfhren"
+#~ msgstr "kann keinen Fork durchführen"
#~ msgid "cannot fork for dpkg --search"
-#~ msgstr "kann Fork fr dpkg --search nicht durchfhren"
+#~ msgstr "kann Fork für »dpkg --search« nicht durchführen"
#~ msgid "unable to open cputable"
-#~ msgstr "konnte cputable nicht ffnen"
+#~ msgstr "konnte cputable nicht öffnen"
#~ msgid "unable to open ostable"
-#~ msgstr "konnte ostable nicht ffnen"
+#~ msgstr "konnte ostable nicht öffnen"
#~ msgid "unable to open triplettable"
-#~ msgstr "konnte triplettable nicht ffnen"
+#~ msgstr "konnte triplettable nicht öffnen"
#~ msgid "cannot fork for objdump"
-#~ msgstr "kann keinen Fork fr Objdump ausfhren"
+#~ msgstr "kann keinen Fork für Objdump ausführen"
#~ msgid "can't write %s"
#~ msgstr "kann %s nicht schreiben"
@@ -3607,56 +3610,56 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "kann %s nicht lesen"
#~ msgid "%s has PGP start token but not end token"
-#~ msgstr "%s hat PGP start-Markierung aber keine end-Markierung"
+#~ msgstr "%s hat PGP »start«-Markierung aber keine »end«-Markierung"
#~ msgid "can't read %s: %s"
#~ msgstr "kann %s nicht lesen: %s"
#~ msgid "error closing %s: %s"
-#~ msgstr "Fehler beim Schlieen von %s: %s"
+#~ msgstr "Fehler beim Schließen von %s: %s"
#~ msgid "%s invalid (contains blank line)"
-#~ msgstr "%s ungltig (enthlt Leerzeile)"
+#~ msgstr "%s ungültig (enthält Leerzeile)"
#~ msgid "duplicate source field in %s"
#~ msgstr "doppeltes Quell-Feld in %s"
#~ msgid "invalid source field in %s"
-#~ msgstr "ungltiges Quell-Feld in %s"
+#~ msgstr "ungültiges Quell-Feld in %s"
#~ msgid "duplicate binary field in %s"
-#~ msgstr "doppeltes Binrfeld in %s"
+#~ msgstr "doppeltes Binärfeld in %s"
#~ msgid "Strange text from 'md5sum < %s': '%s'"
-#~ msgstr "Merkwrdiger Text von md5sum < %s: %s"
+#~ msgstr "Merkwürdiger Text von »md5sum < %s«: »%s«"
#~ msgid "Couldn't stat %s"
-#~ msgstr "konnte kein Stat auf %s ausfhren"
+#~ msgstr "konnte kein Stat auf %s ausführen"
#~ msgid "error doing fstat on %s: %s"
#~ msgstr "Fehler beim Fstat auf %s: %s"
#~ msgid "can't fork: %s"
-#~ msgstr "kann keinen Fork durchfhren: %s"
+#~ msgstr "kann keinen Fork durchführen: %s"
#~ msgid "can't dup %s"
-#~ msgstr "kann dup von %s nicht ausfhren"
+#~ msgstr "kann dup von %s nicht ausführen"
#~ msgid "can't rewind %s"
-#~ msgstr "kann %s nicht zurckspulen"
+#~ msgstr "kann %s nicht zurückspulen"
#~ msgid "can't exec md5sum"
-#~ msgstr "kann md5sum nicht ausfhren"
+#~ msgstr "kann md5sum nicht ausführen"
#~ msgid "invalid md5 output for %s (%s)"
-#~ msgstr "ungltige md5-Ausgabe fr %s (%s)"
+#~ msgstr "ungültige md5-Ausgabe für %s (%s)"
#~ msgid "Usage: 822-date"
#~ msgstr "Aufruf: 822-date"
#~ msgid "This program is deprecated. Please use 'date -R' instead."
#~ msgstr ""
-#~ "Dieses Programm ist veraltet. Bitte verwenden Sie stattdessen date -R."
+#~ "Dieses Programm ist veraltet. Bitte verwenden Sie stattdessen »date -R«."
#~ msgid "cannot combine %s and -S"
#~ msgstr "kann %s und -S nicht kombinieren"
@@ -3664,7 +3667,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgid ""
#~ "substvars support is deprecated (see README.feature-removal-schedule)"
#~ msgstr ""
-#~ "Substvars-Untersttzung ist veraltet (lesen Sie README.feature-removal-"
+#~ "Substvars-Unterstützung ist veraltet (lesen Sie README.feature-removal-"
#~ "schedule)"
#~ msgid "Dpkg::Deps::Simple can't evaluate implication with a %s!"
@@ -3681,28 +3684,28 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "Feld %s hat Leerzeilen >%s<"
#~ msgid "field %s has trailing newline >%s<"
-#~ msgstr "Feld %s hat ein abschlieenden Zeilenumbruch >%s<"
+#~ msgstr "Feld %s hat ein abschließenden Zeilenumbruch >%s<"
#~ msgid "invalid exec parameter in fork_and_exec()"
-#~ msgstr "ungltiger Ausfhrparameter in fork_and_exec()"
+#~ msgstr "ungültiger Ausführparameter in fork_and_exec()"
#~ msgid "no PID set, cannot wait end of process"
#~ msgstr "keine PID gesetzt, kann nicht auf Prozessende warten"
#~ msgid "tried to add file `%s' twice"
-#~ msgstr "versuchte zweimal Datei %s hinzuzufgen"
+#~ msgstr "versuchte zweimal Datei »%s« hinzuzufügen"
#~ msgid "diff `%s' patches file with no subdirectory"
-#~ msgstr "Diff %s patcht Datei ohne Unterverzeichnis"
+#~ msgstr "Diff »%s« patcht Datei ohne Unterverzeichnis"
#~ msgid "diff `%s' is missing trailing newline"
-#~ msgstr "Diff %s fehlt ein abschlieender Zeilenumbruch"
+#~ msgstr "Diff »%s« fehlt ein abschließender Zeilenumbruch"
#~ msgid "cannot open upload file %s for reading"
-#~ msgstr "kann hochzuladene Datei %s nicht zum Lesen ffnen"
+#~ msgstr "kann hochzuladene Datei %s nicht zum Lesen öffnen"
#~ msgid "cannot fstat upload file %s"
-#~ msgstr "kann keinen fstat auf hochzuladene Datei %s durchfhren"
+#~ msgstr "kann keinen »fstat« auf hochzuladene Datei %s durchführen"
#~ msgid "upload file %s is empty"
#~ msgstr "hochzuladene Datei %s ist leer"
@@ -3712,7 +3715,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgid "md5sum upload file %s gave strange output `%s'"
#~ msgstr ""
-#~ "Die Ausgabe von md5sum fr die hochzuladene Datei %s war merkwrdig: %s"
+#~ "Die Ausgabe von md5sum für die hochzuladene Datei %s war merkwürdig: »%s«"
#~ msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
#~ msgstr ""
@@ -3729,7 +3732,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "kann Quellpaketnamen nicht bestimmen!"
#~ msgid "fork for tar"
-#~ msgstr "Fork fr Tar"
+#~ msgstr "Fork für Tar"
#~ msgid "chdir to above (orig) source %s"
#~ msgstr "Chdir zu obigen (original-)Quellen %s"
@@ -3741,13 +3744,13 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "schreibe unter Benutzung existierender tar-Meldungen"
#~ msgid "fork for find"
-#~ msgstr "Fork fr Find"
+#~ msgstr "Fork für Find"
#~ msgid "chdir to %s for find"
-#~ msgstr "wechsle fr find Verzeichnis nach %s"
+#~ msgstr "wechsle für find Verzeichnis nach %s"
#~ msgid "exec find"
-#~ msgstr "fhre find aus"
+#~ msgstr "führe find aus"
#~ msgid "cannot read orig link %s"
#~ msgstr "kann Originallink %s nicht lesen"
@@ -3756,13 +3759,13 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "etwas anderes"
#~ msgid "fork for diff"
-#~ msgstr "Fork fr Diff"
+#~ msgstr "Fork für Diff"
#~ msgid "diff gave 1 but no diff lines found"
#~ msgstr "Diff ergab 1 aber keine Diffzeilen gefunden"
#~ msgid "fork for 2nd find"
-#~ msgstr "For fr zweiten Find"
+#~ msgstr "For für zweiten Find"
#~ msgid "create %s"
#~ msgstr "lege %s an"
@@ -3771,19 +3774,19 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "schreibe Fehlermeldung: %s"
#~ msgid "cannot open .dsc file %s: %s"
-#~ msgstr "kann .dsc-Datei %s nicht ffnen: %s"
+#~ msgstr "kann .dsc-Datei %s nicht öffnen: %s"
#~ msgid "Unsupported format of .dsc file (%s)"
-#~ msgstr "Nicht untersttztes Format der .dsc-Datei (%s)"
+#~ msgstr "Nicht unterstütztes Format der .dsc-Datei (%s)"
#~ msgid "Files field contains invalid filename `%s'"
-#~ msgstr "Feld Files enthlt ungltigen Dateinamen %s"
+#~ msgstr "Feld »Files« enthält ungültigen Dateinamen »%s«"
#~ msgid "repeated file type - files `%s' and `%s'"
-#~ msgstr "wiederholter Dateityp - Dateien %s und %s"
+#~ msgstr "wiederholter Dateityp - Dateien »%s« und »%s«"
#~ msgid "unrecognised file type - `%s'"
-#~ msgstr "unerkannter Dateityp - %s"
+#~ msgstr "unerkannter Dateityp - »%s«"
#~ msgid "debian.tar in %s format dsc"
#~ msgstr "debian.tar im %s-Format dsc"
@@ -3792,34 +3795,34 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "Fehler beim Anlegen des Unterverzeichnisses %s"
#~ msgid "fork for patch"
-#~ msgstr "Fork fr Patch"
+#~ msgstr "Fork für Patch"
#~ msgid "wait for patch"
#~ msgstr "Warte auf Patch"
#~ msgid "fork for cpio"
-#~ msgstr "Fork fr Cpio"
+#~ msgstr "Fork für Cpio"
#~ msgid "fork for tar -t"
-#~ msgstr "Fork fr tar -t"
+#~ msgstr "Fork für tar -t"
#~ msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
-#~ msgstr "Tardatei %s enthlt Datei deren Namen auf .dpkg-orig endet"
+#~ msgstr "Tardatei »%s« enthält Datei deren Namen auf ».dpkg-orig« endet"
#~ msgid "tarfile `%s' contains object `debian' that isn't a directory"
-#~ msgstr "Tardatei %s enthlt ein Objekt debian das kein Verzeichnis ist"
+#~ msgstr "Tardatei »%s« enthält ein Objekt »debian« das kein Verzeichnis ist"
#~ msgid "Expected ^@@ in line %d of diff `%s'"
-#~ msgstr "Erwartete ^@@ in Zeile %d des Diffs %s"
+#~ msgstr "Erwartete ^@@ in Zeile %d des Diffs »%s«"
#~ msgid "fork for tar -xkf -"
-#~ msgstr "Fork fr tar -xkf -"
+#~ msgstr "Fork für tar -xkf -"
#~ msgid "wait for tar -xkf -"
#~ msgstr "Warte auf tar -xkf -"
#~ msgid "Unable to close dir %s"
-#~ msgstr "Kann Verzeichnis %s nicht schlieen"
+#~ msgstr "Kann Verzeichnis %s nicht schließen"
#~ msgid "Unable to mkdir %s"
#~ msgstr "Kann %s nicht erstellen"
@@ -3828,7 +3831,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "lege Datei %s an"
#~ msgid "fork for gzip"
-#~ msgstr "Fork fr Gzip"
+#~ msgstr "Fork für Gzip"
#~ msgid "exec gzip"
#~ msgstr "exec gzip"
@@ -3837,55 +3840,55 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "Warte auf gzip"
#~ msgid "could not stat output file `%s'"
-#~ msgstr "konnte keinen Stat auf Ausgabedatei %s durchfhren"
+#~ msgstr "konnte keinen Stat auf Ausgabedatei »%s« durchführen"
#~ msgid "bogus character `\\%s' in `%s'"
-#~ msgstr "fehlerhaftes Zeichen \\%s in %s"
+#~ msgstr "fehlerhaftes Zeichen »\\%s« in »%s«"
#~ msgid "couldn't open %s"
-#~ msgstr "konnte %s nicht ffnen"
+#~ msgstr "konnte %s nicht öffnen"
#~ msgid "couldn't close %s"
-#~ msgstr "konnte %s nicht schlieen"
+#~ msgstr "konnte %s nicht schließen"
#~ msgid "Can't open %s for test: %s"
-#~ msgstr "Kann %s nicht zum Testen ffnen: %s"
+#~ msgstr "Kann %s nicht zum Testen öffnen: %s"
#~ msgid "Can't execute objdump: %s"
-#~ msgstr "Kann objdump nicht ausfhren: %s"
+#~ msgstr "Kann objdump nicht ausführen: %s"
#~ msgid "Can't open %s: %s"
-#~ msgstr "Kann %s nicht ffnen: %s"
+#~ msgstr "Kann %s nicht öffnen: %s"
#~ msgid "Can't open %s for writing: %s"
-#~ msgstr "Kann %s nicht zum Schreiben ffnen: %s"
+#~ msgstr "Kann %s nicht zum Schreiben öffnen: %s"
#~ msgid "unable to get login information for username \"%s\""
-#~ msgstr "Kann Anmeldeinformationen fr den Benutzernamen %s nicht ermitteln"
+#~ msgstr "Kann Anmeldeinformationen für den Benutzernamen »%s« nicht ermitteln"
#~ msgid ""
#~ "no utmp entry available and LOGNAME not defined; using uid of process (%d)"
#~ msgstr ""
-#~ "kein utmp-Eintrag verfgbar und LOGNAME nicht definiert; verwende UID von "
+#~ "kein utmp-Eintrag verfügbar und LOGNAME nicht definiert; verwende UID von "
#~ "Prozess (%d)"
#~ msgid "unable to get login information for uid %d"
-#~ msgstr "kann Anmeldeinformationen fr UID %d nicht ermitteln"
+#~ msgstr "kann Anmeldeinformationen für UID %d nicht ermitteln"
#~ msgid "write error on close control data"
-#~ msgstr "Schreibfehler beim Schlieen der Steuerdaten (control data)"
+#~ msgstr "Schreibfehler beim Schließen der Steuerdaten (»control data«)"
#~ msgid "control file must have at least one binary package part"
-#~ msgstr "Steuerdatei muss mindestens einen Binrpaket-Anteil haben"
+#~ msgstr "Steuerdatei muss mindestens einen Binärpaket-Anteil haben"
#~ msgid ""
#~ "per-package paragraph %d in control info file is missing Package line"
#~ msgstr ""
-#~ "die Package-Zeile im pro-Paket Absatz %d in der Steuerinformationsdatei "
+#~ "die »Package«-Zeile im pro-Paket Absatz %d in der Steuerinformationsdatei "
#~ "fehlt"
#~ msgid "source paragraph in control info file is missing Source line"
-#~ msgstr "die Source-Zeile im Quell-Absatz der Steuerinformationsdatei fehlt"
+#~ msgstr "die »Source«-Zeile im Quell-Absatz der Steuerinformationsdatei fehlt"
#~ msgid "fork for parse changelog"
#~ msgstr "forke zum Auswerten des changelogs"
@@ -3897,10 +3900,10 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "erwartete Leerzeile vor PGP-Signatur"
#~ msgid "found several `paragraphs' where only one expected"
-#~ msgstr "fand mehrere Abstze wo nur einer erwartet wurde"
+#~ msgstr "fand mehrere »Absätze« wo nur einer erwartet wurde"
#~ msgid "found start of PGP body but no signature"
-#~ msgstr "fand Anfang des PGP-Krpers aber keine Signatur"
+#~ msgstr "fand Anfang des PGP-Körpers aber keine Signatur"
#~ msgid "empty file"
#~ msgstr "leere Datei"
@@ -3909,7 +3912,7 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ msgstr "chown neue Dateienliste-Datei"
#~ msgid "value from nowhere, with key >%s< and value >%s<"
-#~ msgstr "Wert von nirgendwo, mit Schlssel >%s< und Wert >%s<"
+#~ msgstr "Wert von nirgendwo, mit Schlüssel >%s< und Wert >%s<"
#~ msgid "cannot combine -b or -B and -S"
#~ msgstr "kann -b oder -B nicht mit -S kombinieren"
@@ -3918,5 +3921,5 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s"
#~ "couldn't find library %s (note: only packages with 'shlibs' files are "
#~ "looked into)."
#~ msgstr ""
-#~ "konnte Bibliothek %s nicht finden (Hinweis: nur Pakete mit shlibs-"
+#~ "konnte Bibliothek %s nicht finden (Hinweis: nur Pakete mit »shlibs«-"
#~ "Dateien werden betrachtet)."
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 6de582387..7e03a0bee 100644
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.pot
@@ -8,22 +8,23 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
+#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr ""
@@ -35,11 +36,12 @@ msgid ""
"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
msgstr ""
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -69,10 +71,10 @@ msgid ""
" --version show the version.\n"
msgstr ""
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
msgstr ""
@@ -109,7 +111,37 @@ msgstr ""
msgid "%s is not a supported variable name"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildflags.pl:33
+msgid ""
+"\n"
+"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:44
+#, perl-format
+msgid ""
+"Usage: %s [<action>]\n"
+"\n"
+"Actions:\n"
+" --get <flag> output the requested flag to stdout.\n"
+" --origin <flag> output the origin of the flag to stdout:\n"
+" value is one of vendor, system, user, env.\n"
+" --list output a list of the flags supported by the current "
+"vendor.\n"
+" --help show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:61 scripts/dpkg-buildflags.pl:66
+#, perl-format
+msgid "two commands specified: --%s and --%s"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:80
+msgid "need an action option"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl:39
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson.\n"
@@ -117,7 +149,7 @@ msgid ""
"Copyright (C) 2007 Frank Lichtenheld"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, perl-format
msgid ""
"\n"
@@ -172,147 +204,142 @@ msgid ""
" --version show the version.\n"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, perl-format
msgid "unknown option or argument %s"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, perl-format
msgid "cannot combine %s and %s"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:234
+#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:253
+#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:256
+#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:275
#, perl-format
-msgid "%s: use %s from environment: %s\n"
+msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
msgstr ""
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:298
+#: scripts/dpkg-buildpackage.pl:285
msgid "source version"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:308
+#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:326
+#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
msgstr ""
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr ""
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr ""
@@ -351,7 +378,7 @@ msgstr ""
msgid "%s: Build conflicts: "
msgstr ""
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr ""
@@ -381,27 +408,27 @@ msgstr ""
msgid "filename, section and priority may contain no whitespace"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
msgstr ""
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr ""
@@ -545,13 +572,13 @@ msgstr ""
msgid "write original source message"
msgstr ""
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
msgstr ""
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
msgstr ""
@@ -638,12 +665,12 @@ msgid ""
"architecture all"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
@@ -651,36 +678,36 @@ msgstr ""
msgid "cannot fork for %s"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
msgstr ""
@@ -776,6 +803,44 @@ msgstr ""
msgid "no debian/symbols file used as basis for generating %s"
msgstr ""
+#: scripts/dpkg-mergechangelogs.pl:53
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+
+#: scripts/dpkg-mergechangelogs.pl:56
+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 ""
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: 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:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, perl-format
+msgid "cannot write %s"
+msgstr ""
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -805,7 +870,7 @@ msgstr ""
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, perl-format
msgid "cannot open %s"
msgstr ""
@@ -1291,37 +1356,38 @@ msgstr ""
msgid "directory argument %s is not a directory"
msgstr ""
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, perl-format
msgid "using options from %s: %s"
msgstr ""
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
msgstr ""
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr ""
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
msgstr ""
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
msgstr ""
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
msgstr ""
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -1332,18 +1398,23 @@ msgstr ""
msgid "cannot read %s"
msgstr ""
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
+#, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:324
#, perl-format
msgid "can't build with source format '%s': %s"
msgstr ""
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
msgstr ""
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1351,43 +1422,43 @@ msgstr ""
msgid "building %s in %s"
msgstr ""
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
msgstr ""
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr ""
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
msgstr ""
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr ""
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
msgstr ""
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr ""
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, perl-format
msgid "extracting %s in %s"
msgstr ""
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr ""
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson\n"
@@ -1395,7 +1466,7 @@ msgid ""
"Copyright (C) 2008 Raphael Hertzog"
msgstr ""
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1408,7 +1479,7 @@ msgid ""
" used to build the source package."
msgstr ""
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, perl-format
msgid ""
"Build options:\n"
@@ -1430,7 +1501,7 @@ msgid ""
" supported are: '1'-'9', 'best', 'fast')"
msgstr ""
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1440,14 +1511,14 @@ msgid ""
"signature"
msgstr ""
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
msgid ""
"General options:\n"
" -h, --help show this help message.\n"
" --version show the version."
msgstr ""
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
@@ -1524,24 +1595,19 @@ msgid ""
"Unknown gcc system type %s, falling back to default (native compilation)"
msgstr ""
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildFlags.pm:197
#, perl-format
-msgid "invalid flag in %s: %s"
+msgid "line %d of %s mentions unknown flag %s"
msgstr ""
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#: scripts/Dpkg/BuildFlags.pm:206
#, perl-format
-msgid "cannot write %s"
+msgid "line %d of %s is invalid, it has been ignored."
+msgstr ""
+
+#: scripts/Dpkg/BuildOptions.pm:91
+#, perl-format
+msgid "invalid flag in %s: %s"
msgstr ""
#: scripts/Dpkg/Compression/Process.pm:71
@@ -2013,7 +2079,7 @@ msgstr ""
msgid "cannot create directory %s"
msgstr ""
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, perl-format
msgid "cannot opendir %s"
@@ -2226,7 +2292,7 @@ msgstr ""
msgid "nonexistent"
msgstr ""
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
msgstr ""
@@ -2260,96 +2326,96 @@ msgstr ""
msgid "named socket"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
msgstr ""
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2358,127 +2424,127 @@ msgstr ""
msgid "unpacking %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, perl-format
msgid "cannot stat orig argument %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
"orig.tar.<ext>)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
"orig/)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
"s wants something"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
"override"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
@@ -2486,35 +2552,35 @@ msgstr ""
msgid "unable to change permission of `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, perl-format
msgid "building %s using existing %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
"sP to override"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
msgstr ""
@@ -2823,16 +2889,16 @@ msgstr ""
msgid "%s is not a valid version"
msgstr ""
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr ""
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
msgstr ""
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
msgstr ""
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 2c6928086..8d06d3c1e 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-01-03 16:41+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -19,13 +19,14 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Lokalize 1.0\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
+#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr "Debian %s version %s.\n"
@@ -40,11 +41,12 @@ msgstr ""
"Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -102,10 +104,10 @@ msgstr ""
" --help afficher ce message d'aide.\n"
" --version afficher la version.\n"
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
msgstr "option inconnue « %s »"
@@ -148,7 +150,40 @@ msgstr "le type du système GNU indiqué %s ne correspond pas au type de gcc %s"
msgid "%s is not a supported variable name"
msgstr "%s n'est pas le nom d'une variable reconnue"
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+msgid ""
+"\n"
+"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-buildflags.pl:44
+#, perl-format
+msgid ""
+"Usage: %s [<action>]\n"
+"\n"
+"Actions:\n"
+" --get <flag> output the requested flag to stdout.\n"
+" --origin <flag> output the origin of the flag to stdout:\n"
+" value is one of vendor, system, user, env.\n"
+" --list output a list of the flags supported by the current "
+"vendor.\n"
+" --help show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:61 scripts/dpkg-buildflags.pl:66
+#, fuzzy, perl-format
+msgid "two commands specified: --%s and --%s"
+msgstr "plus d'un fichier indiqué (%s et %s)"
+
+#: scripts/dpkg-buildflags.pl:80
+msgid "need an action option"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl:39
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson.\n"
@@ -160,7 +195,7 @@ msgstr ""
"Copyright (C) 2000 Wichert Akkerman.\n"
"Copyright (C) 2007 Frank Lichtenheld."
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, fuzzy, perl-format
msgid ""
"\n"
@@ -276,29 +311,29 @@ msgstr ""
" -h, --help afficher ce message d'aide.\n"
" --version afficher la version.\n"
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr "La gestion de -E et -W est obsolète (ces paramètres sont sans effet)"
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, perl-format
msgid "unknown option or argument %s"
msgstr "option ou paramètre inconnu %s"
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, perl-format
msgid "cannot combine %s and %s"
msgstr "impossible de combiner %s et %s"
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr ""
"utilisation d'une commande pour obtenir les privilèges administrateur en "
"tant qu'administrateur"
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
@@ -307,68 +342,63 @@ msgstr ""
"soit indiquer une commande avec l'option -r ou exécuter cette\n"
"commande en tant qu'administrateur"
-#: scripts/dpkg-buildpackage.pl:234
+#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
msgstr "commande pour obtenir les privilèges administrateur « %s » non trouvée"
-#: scripts/dpkg-buildpackage.pl:253
+#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
msgstr "commande de signature inconnue, suppose une interface de style pgp"
-#: scripts/dpkg-buildpackage.pl:256
+#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr ""
"La gestion de PGP est obsolète (voir le fichier README.feature-removal-"
"schedule)."
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:275
#, perl-format
-msgid "%s: use %s from environment: %s\n"
-msgstr "%s : utiliser %s depuis l'environnement : %s\n"
+msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+msgstr ""
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr "%s : définir %s à la valeur par défaut : %s\n"
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr "paquet source"
-#: scripts/dpkg-buildpackage.pl:298
+#: scripts/dpkg-buildpackage.pl:285
msgid "source version"
msgstr "version source"
-#: scripts/dpkg-buildpackage.pl:308
+#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
msgstr "source changé par"
-#: scripts/dpkg-buildpackage.pl:326
+#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
msgstr "architecture hôte"
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
msgstr "debian/rules n'est pas exécutable: corrigé."
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
msgstr "Dépendances de construction et conflits non satisfaits ; échec."
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
msgstr "(Utilisez l'option -d pour forcer.)"
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr "Ceci est actuellement un avertissement sans conséquence avec -S, mais"
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr "deviendra fatal dans le futur."
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
@@ -376,60 +406,60 @@ msgstr ""
"Il est déconseillé de créer un paquet source sans le nettoyer préalablement. "
"Il peut contenir des fichiers non souhaités."
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
msgstr "Appuyez sur Entrée pour commencer le processus de signature\n"
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr "Échec de signature des fichiers .dsc et .changes"
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr "écriture du fichier changes"
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr "dpkg-genchanges"
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr "envoi de source uniquement : paquet Debian natif"
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr ""
"source uniquement, envoi du fichier diff uniquement (aucune inclusion du "
"code source d'origine)"
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr "envoi du source seulement (inclusion du code source d'origine)"
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr "envoi complet (inclusion du code source d'origine)"
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
msgstr "envoi d'un binaire seulement (aucune inclusion de code source)"
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr "envoi complet ; paquet Debian natif (inclusion du code source complet)"
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
msgstr ""
"envoi d'un binaire et du fichier diff (aucune inclusion du code source "
"d'origine)"
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr "Échec de signature du fichier .changes"
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr "impossible de déterminer %s"
@@ -483,7 +513,7 @@ msgstr "%s : dépendances de construction non trouvées : "
msgid "%s: Build conflicts: "
msgstr "%s : conflits de construction du paquet : "
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr "erreur rencontrée lors de l'analyse de %s"
@@ -522,27 +552,27 @@ msgstr "Il est demandé exactement un fichier, une section et une priorité"
msgid "filename, section and priority may contain no whitespace"
msgstr "fichier, section et priorité ne peuvent contenir d'espace"
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
msgstr "ouverture du nouveau fichier des fichiers"
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr "copie de l'ancienne entrée dans le nouveau fichier des fichiers"
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr "lecture du nouveau fichier des fichiers"
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr "écriture de la nouvelle entrée dans le nouveau fichier des fichiers"
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
msgstr "fermeture du nouveau fichier des fichiers"
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr "installation du nouveau fichier des fichiers"
@@ -744,13 +774,13 @@ msgstr "envoi d'un binaire - aucune inclusion de code source"
msgid "write original source message"
msgstr "écriture du message source original"
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
msgstr "il manque l'information pour l'important champ de sortie %s"
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
msgstr "information manquante pour le champ de sortie %s"
@@ -868,12 +898,12 @@ msgid ""
"architecture all"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr "paquet %s avec champ spécifique udeb %s"
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
@@ -881,36 +911,36 @@ msgstr "paquet %s avec champ spécifique udeb %s"
msgid "cannot fork for %s"
msgstr "fork impossible pour %s"
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
msgstr "chdir pour du vers %s"
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
msgstr "exec %s"
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
msgstr "du dans %s"
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
msgstr "résultat inattendu de du %s"
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
msgstr "fermeture de l'ancien fichier des fichiers"
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
msgstr "impossible d'ouvrir le nouveau fichier de contrôle en sortie %s"
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
msgstr "impossible d'installer le nouveau fichier de contrôle en sortie %s"
@@ -1041,6 +1071,60 @@ msgstr "%s ne correspond pas complètement à %s"
msgid "no debian/symbols file used as basis for generating %s"
msgstr "pas de fichier debian/symbols utilisé comme base pour générer %s"
+#: scripts/dpkg-mergechangelogs.pl:53
+#, fuzzy
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:56
+#, 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 ""
+"\n"
+"Ce logiciel est un logiciel libre. Voyez la licence « GNU General Public "
+"License »\n"
+"dans la version 2 ou une version supérieure pour les conditions de copie. Il "
+"n'y a PAS de garantie.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, fuzzy, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+"Syntaxe : %s [<option>...] <fichier> <section> <priorité>\n"
+"\n"
+"Options :\n"
+" -f <fichier_des_fichiers> lister les fichiers dans ce fichier plutôt "
+"que debian/files.\n"
+" -h, --help afficher ce message d'aide.\n"
+" --version afficher la version.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: 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:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, perl-format
+msgid "cannot write %s"
+msgstr "impossible d'écrire %s"
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -1087,7 +1171,7 @@ msgstr "impossible de trouver %s"
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, perl-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
@@ -1710,38 +1794,39 @@ msgstr "« stat » du répertoire %s impossible"
msgid "directory argument %s is not a directory"
msgstr "paramètre répertoire %s n'est pas un répertoire"
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, perl-format
msgid "using options from %s: %s"
msgstr "utilisation des options depuis %s : %s"
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
msgstr "%s n'est pas une compression gérée"
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr "%s n'est pas un niveau de compression"
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
msgstr "-x ou -b nécessaire"
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
msgstr "%s n'est pas une architecture autorisée"
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
msgstr ""
"architecture %s seulement autorisée toute seule (liste pour paquet %s est %s)"
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -1752,18 +1837,23 @@ msgstr ""
msgid "cannot read %s"
msgstr "impossible de lire %s"
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
+#, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:324
#, fuzzy, perl-format
msgid "can't build with source format '%s': %s"
msgstr "utilisation du format source « %s »"
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
msgstr "utilisation du format source « %s »"
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1771,44 +1861,44 @@ msgstr "utilisation du format source « %s »"
msgid "building %s in %s"
msgstr "construction de %s dans %s"
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
msgstr "-x demande au moins un paramètre, le fichier .dsc"
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr "-x ne prend pas plus de deux paramètres"
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
msgstr "-x demande le fichier .dsc comme premier paramètre, pas un répertoire"
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr "cible non compressée existe : %s"
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
msgstr "%s ne contient pas de signature OpenPGP valable"
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr "extraction d'un paquet source non signé (%s)"
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, perl-format
msgid "extracting %s in %s"
msgstr "extraction de %s dans %s"
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr ""
"une seule option -x, -b ou --print-format est autorisée, et une seule fois"
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
#, fuzzy
msgid ""
"\n"
@@ -1820,7 +1910,7 @@ msgstr ""
"Copyright (C) 1996 Ian Jackson et Klee Dienes.\n"
"Copyright (C) 2008 Raphael Hertzog"
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1842,7 +1932,7 @@ msgstr ""
"<dir> afficher le format source qui serait\n"
" utilisé pour construire le paquet source."
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, perl-format
msgid ""
"Build options:\n"
@@ -1888,7 +1978,7 @@ msgstr ""
" les valeurs gérées sont : « 1 » - « 9 », « best », "
"« fast »)"
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1904,7 +1994,7 @@ msgstr ""
" ---require-valid-signature imposer que le paquet comporte une\n"
" signature valable."
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
msgid ""
"General options:\n"
" -h, --help show this help message.\n"
@@ -1914,7 +2004,7 @@ msgstr ""
" -h, --help afficher ce message d'aide.\n"
" --version afficher la version."
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
@@ -2032,26 +2122,21 @@ msgid ""
msgstr ""
"type de gcc %s inconnu, retour au système par défaut (compilation native)"
+#: scripts/Dpkg/BuildFlags.pm:197
+#, perl-format
+msgid "line %d of %s mentions unknown flag %s"
+msgstr ""
+
+#: scripts/Dpkg/BuildFlags.pm:206
+#, perl-format
+msgid "line %d of %s is invalid, it has been ignored."
+msgstr ""
+
#: scripts/Dpkg/BuildOptions.pm:91
#, fuzzy, perl-format
msgid "invalid flag in %s: %s"
msgstr "champ invalide dans %s : %s"
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
-#, perl-format
-msgid "cannot write %s"
-msgstr "impossible d'écrire %s"
-
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
@@ -2544,7 +2629,7 @@ msgstr "écriture sur la sortie de tar"
msgid "cannot create directory %s"
msgstr "impossible de créer le répertoire %s"
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, perl-format
msgid "cannot opendir %s"
@@ -2765,7 +2850,7 @@ msgstr "suppression du fichier de sauvegarde %s"
msgid "nonexistent"
msgstr "inexistant"
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
msgstr "stat de %s impossible"
@@ -2799,17 +2884,17 @@ msgstr "tube nommé"
msgid "named socket"
msgstr "« socket » nommé"
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr "%s n'est pas un nom de fichier"
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr "un champ de contrôle vital manque, %s"
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
@@ -2817,82 +2902,82 @@ msgstr ""
"le format de paquet source « %s » n'est pas géré (le module Perl %s est "
"requis)"
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
msgstr "champ Format « %s » non valable"
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr ""
"la source et la version sont indispensables pour calculer le nom de base de "
"la source"
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
msgstr "impossible de vérifier la signature sur %s"
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
msgstr "impossible de vérifier la signature sur %s, gpg n'est pas installé"
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
msgstr "%s n'est pas une option valable pour %s"
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr "%s n'existe pas"
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
msgstr "impossible de rendre %s exécutable"
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
msgstr "%s n'est pas un fichier normal"
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
msgstr "l'option -s%s annule une précédente option -s%s"
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr "gestion des sources avec -s%s non autorisée avec -x"
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr "plusieurs fichiers tar dans un paquet source v1.0"
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
msgstr "type de fichier non reconnu pour un fichier source %s : %s"
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr "pas de fichier tar dans le champ Files"
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr "paquet natif avec .orig.tar"
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
msgstr "impossible de modifier %s en %s"
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2901,36 +2986,36 @@ msgstr "impossible de modifier %s en %s"
msgid "unpacking %s"
msgstr "extraction de %s"
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr "impossible de garder répertoire orig, il existe déjà"
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr "impossible de modifier le fichier extrait %s en %s"
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr "impossible de modifier le fichier sauvegardé %s en %s"
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr "mise en place de %s"
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
msgstr "fichiers amont modifiés : %s"
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
msgstr "ne gère que la compression gzip"
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
@@ -2938,23 +3023,23 @@ msgstr ""
"il faut au plus un paramètre répertoire et un paramètre source d'origine "
"avec -b (pour les paquets source v1.0)"
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr "gestion des sources avec -s%s non autorisée avec -b"
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
msgstr ""
"le fichier original compressé %s existe mais ce n'est pas un simple fichier"
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, perl-format
msgid "cannot stat orig argument %s"
msgstr "« stat » du paramètre origine %s impossible"
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2963,7 +3048,7 @@ msgstr ""
"le paramètre source n'est pas compressé mais l'option -s%s demande des "
"sources compressées (.orig.tar.<ext>)"
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2972,12 +3057,12 @@ msgstr ""
"le paramètre source est compressé mais l'option -s%s demande des sources non "
"compressées (.orig/)"
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr "le paramètre source %s n'est pas un fichier ou un répertoire"
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -2986,34 +3071,34 @@ msgstr ""
"le paramètre source est vide (pas d'orig, pas de diff) mais l'option -s%s "
"veut quelque chose."
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
msgstr ""
"Le fichier original non compressé %s existe mais ce n'est pas un répertoire"
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr "stat impossible du supposé orig non compressé %s"
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
msgstr "répertoire source %s n'est pas <paquet_source>-<version_amont> %s"
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr "répertoire .orig %s n'est pas <paquet>-<version_amont> (%s demandé)"
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
msgstr ".orig.tar %s n'est pas <paquet>_<version_amont>.orig.tar (%s demandé)"
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -3022,18 +3107,18 @@ msgstr ""
"le fichier tar %s existe déjà, pas de modification, abandon ; utiliser -sU "
"ou -sR pour forcer."
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
msgstr "impossible de vérifier l'existence de %s"
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
msgstr "impossible de modifier %s (nouvellement créé) en %s"
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
@@ -3041,12 +3126,12 @@ msgstr "impossible de modifier %s (nouvellement créé) en %s"
msgid "unable to change permission of `%s'"
msgstr "impossible de modifier les permissions de %s"
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, perl-format
msgid "building %s using existing %s"
msgstr "construction de %s à partir de %s"
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3055,17 +3140,17 @@ msgstr ""
"le répertoire orig %s existe déjà, pas de modification, abandon ; utiliser -"
"sA, -sK ou -sP pour forcer."
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
msgstr "impossible de vérifier l'existence du répertoire orig %s"
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
msgstr "le fichier de différences modifie les fichiers amont suivants : %s"
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
@@ -3073,7 +3158,7 @@ msgstr ""
"choisissez le format « 3.0 (quilt) » pour utiliser des modifications séparées "
"et documentées dans les sources amont, voir dpkg-source(1)"
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
msgstr "%s : modifications non représentables des sources"
@@ -3412,21 +3497,27 @@ msgstr ""
msgid "%s is not a valid version"
msgstr "%s n'est pas une version valable"
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr "le numéro de version ne peut pas être vide"
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
msgstr "le numéro de version contient un caractère « %s » non autorisé"
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
msgstr ""
"la partie d'ère (« epoch ») du numéro de version n'est pas un nombre : « %s »"
+#~ msgid "%s: use %s from environment: %s\n"
+#~ msgstr "%s : utiliser %s depuis l'environnement : %s\n"
+
+#~ msgid "%s: set %s to default value: %s\n"
+#~ msgstr "%s : définir %s à la valeur par défaut : %s\n"
+
#~ msgid "cannot open .dsc file %s"
#~ msgstr "impossible d'ouvrir le fichier .dsc %s"
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index db39ff7b5..1442c5442 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -8,7 +8,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-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-01-03 16:42+0100\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -18,13 +18,14 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
+#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr "Debian %s w wersji %s.\n"
@@ -39,11 +40,12 @@ msgstr ""
"Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -96,10 +98,10 @@ msgstr ""
" --help wyświetla ten komunikat pomocy.\n"
" --version wyświetla informacje o wersji programu.\n"
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
msgstr "nieznana opcja \"%s\""
@@ -138,7 +140,40 @@ msgstr "Podany typ systemu GNU %s nie odpowiada typowi systemu gcc %s."
msgid "%s is not a supported variable name"
msgstr "%s nie jest obsługiwaną nazwą zmiennej"
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+msgid ""
+"\n"
+"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-buildflags.pl:44
+#, perl-format
+msgid ""
+"Usage: %s [<action>]\n"
+"\n"
+"Actions:\n"
+" --get <flag> output the requested flag to stdout.\n"
+" --origin <flag> output the origin of the flag to stdout:\n"
+" value is one of vendor, system, user, env.\n"
+" --list output a list of the flags supported by the current "
+"vendor.\n"
+" --help show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:61 scripts/dpkg-buildflags.pl:66
+#, fuzzy, perl-format
+msgid "two commands specified: --%s and --%s"
+msgstr "podano więcej niż jeden plik (%s i %s)"
+
+#: scripts/dpkg-buildflags.pl:80
+msgid "need an action option"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl:39
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson.\n"
@@ -150,7 +185,7 @@ msgstr ""
"Copyright (C) 2000 Wichert Akkerman\n"
"Copyright (C) 2007 Frank Lichtenheld"
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, fuzzy, perl-format
msgid ""
"\n"
@@ -251,27 +286,27 @@ msgstr ""
" -h, --help wyświetla ten komunikat pomocy.\n"
" --version wyświetla informacje o wersji programu.\n"
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr "-E i -W są przestarzałe, nie mają żadnego efektu"
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, perl-format
msgid "unknown option or argument %s"
msgstr "niepoprawna opcja lub argument %s"
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, perl-format
msgid "cannot combine %s and %s"
msgstr "nie można łączyć %s i %s"
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr "używanie polecenia-uzysk-praw-admin podczas bycia administratorem"
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
@@ -279,67 +314,62 @@ msgstr ""
"nie znaleziono fakeroot, proszę zainstalować pakiet fakeroot lub\n"
"podać polecenie w opcji -r, lub uruchomić ten program jako root"
-#: scripts/dpkg-buildpackage.pl:234
+#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
msgstr "nie znaleziono polecenia-uzysk-praw-admin \"%s\""
-#: scripts/dpkg-buildpackage.pl:253
+#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
msgstr "nieznane polecenie podpisywania, przyjmowanie interfejsu w stylu pgp"
-#: scripts/dpkg-buildpackage.pl:256
+#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr ""
"Wsparcie dla PGP jest przestarzałe (patrz README.feature-removal-schedule)"
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:275
#, perl-format
-msgid "%s: use %s from environment: %s\n"
-msgstr "%s: użycie %s ze środowiska: %s\n"
+msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+msgstr ""
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr "%s: ustawianie %s na domyślną wartość: %s\n"
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr "pakiet źródłowy"
-#: scripts/dpkg-buildpackage.pl:298
+#: scripts/dpkg-buildpackage.pl:285
msgid "source version"
msgstr "wersja pakietu źródłowego"
-#: scripts/dpkg-buildpackage.pl:308
+#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
msgstr "źródła zmienione przez"
-#: scripts/dpkg-buildpackage.pl:326
+#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
msgstr "architektura gościa"
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
msgstr "debian/rules nie jest plikiem wykonywalnym: naprawianie."
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
msgstr "Niespełnione zależności/konflikty czasu budowania; przerywanie."
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
msgstr "(Użyj opcji -d, aby to obejść)."
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr "Obecnie jest to tylko ostrzeżenie generowane, gdy użyje się -S,"
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr "jednak w przyszłości zostanie przekształcone w błąd krytyczny."
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
@@ -347,56 +377,56 @@ msgstr ""
"generowanie pakietu źródłowego bez wcześniejszego czyszczenia jest złym "
"pomysłem, może on zawierać niepotrzebne pliki."
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
msgstr "Naciśnij <enter>, by rozpocząć proces podpisywania\n"
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr "Błąd podpisywania plików .dsc i .changes"
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr "zapisywanie pliku zmian"
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr "dpkg-genchanges"
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr "wydanie tylko źródeł: natywny pakiet Debiana"
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr "wydanie tylko źródeł i różnic (oryginalne źródła NIE dołączone)"
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr "wydanie tylko źródeł (oryginalne źródła dołączone)"
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr "pełne wydanie (oryginalne źródła dołączone)"
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
msgstr "wydanie tylko binarne (bez żadnych źródeł)"
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr "pełne wydanie; natywny pakiet Debiana (pełne źródła dołączone)"
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
msgstr "wydanie binarne i pliku różnic (oryginalne źródła NIE dołączone)"
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr "Błąd podpisywania pliku .changes."
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr "nie można określić %s"
@@ -449,7 +479,7 @@ msgstr "%s: Niespełnione zależności budowania pakietu:"
msgid "%s: Build conflicts: "
msgstr "%s: Konfliktu budowania pakietu:"
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr "wystąpił błąd podczas przetwarzania %s"
@@ -488,27 +518,27 @@ msgstr "należy podać nazwę pliku, sekcję i priorytet"
msgid "filename, section and priority may contain no whitespace"
msgstr "nazwa pliku, sekcja i priorytet nie mogą zawierać białych znaków"
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
msgstr "otwieranie nowego pliku z listą plików"
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr "kopiowanie starego pliku do nowego pliku z listą plików"
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr "czytanie starego pliku z listą plików"
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr "zapisywanie nowego wpisu do nowego pliku z listą plików"
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
msgstr "zamykanie nowego pliku z listą plików"
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr "instalowanie nowego pliku z listą plików"
@@ -693,13 +723,13 @@ msgstr "wydanie tylko binarne - niedołączanie żadnych kodów źródłowych"
msgid "write original source message"
msgstr "wypisywanie oryginalnego komunikatu źródłowego"
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
msgstr "brak informacji o krytycznym polu wyjściowym %s"
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
msgstr "brak informacji o polu wyjściowym %s"
@@ -815,12 +845,12 @@ msgid ""
"architecture all"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr "pakiet %s zawierający pole %s specyficzne dla udeb"
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
@@ -828,36 +858,36 @@ msgstr "pakiet %s zawierający pole %s specyficzne dla udeb"
msgid "cannot fork for %s"
msgstr "nie można wykonać funkcji fork dla %s"
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
msgstr "zmiana katalogu dla du na \"%s\""
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
msgstr "uruchamianie %s"
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
msgstr "du na \"%s\""
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
msgstr "du wypisało dziwny komunikat \"%s\""
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
msgstr "zamykanie starego pliku z listą plików"
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
msgstr "nie można otworzyć nowego pliku kontrolnego \"%s\""
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
msgstr "nie można zainstalować wyjściowego pliku kontrolnego \"%s\""
@@ -981,6 +1011,59 @@ msgstr "%s całkowicie nie pasuje do %s"
msgid "no debian/symbols file used as basis for generating %s"
msgstr "do generowania %s nie użyto żadnego pliku debian/symbols"
+#: scripts/dpkg-mergechangelogs.pl:53
+#, fuzzy
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:56
+#, 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 ""
+"\n"
+"Ten program jest oprogramowaniem wolnym, rozpowszechnianym na warunkach\n"
+"licencji GNU w wersji drugiej lub późniejszej. Brak JAKIEJKOLWIEK "
+"gwarancji.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, fuzzy, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+"Użycie: %s [<opcja> ...] <nazwa_pliku> <sekcja> <priorytet>\n"
+"\n"
+"Opcje:\n"
+" -f<plikzlistąplików> zapisuje pliki do podanego pliku zamiast "
+"debian/files.\n"
+" --help wyświetla ten komunikat pomocy.\n"
+" --version wyświetla informacje o wersji programu.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: 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:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, perl-format
+msgid "cannot write %s"
+msgstr "nie można zapisać %s"
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -1023,7 +1106,7 @@ msgstr "nie można odnaleźć \"%s\""
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, perl-format
msgid "cannot open %s"
msgstr "nie można otworzyć %s"
@@ -1632,38 +1715,39 @@ msgstr "nie można ustalić stanu katalogu %s"
msgid "directory argument %s is not a directory"
msgstr "argument %s nie jest katalogiem"
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, fuzzy, perl-format
msgid "using options from %s: %s"
msgstr "błąd czytania z %s:"
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
msgstr "%s nie jest obsługiwanym typem kompresji"
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr " %s nie jest poziomem kompresji"
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
msgstr "potrzeba -x lub -b"
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
msgstr "\"%s\" nie jest poprawną specyfikacją architektury"
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
msgstr ""
"architektura %s dopuszczalna tylko sama (listą dla pakietu %s jest \"%s\")"
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -1674,18 +1758,23 @@ msgstr ""
msgid "cannot read %s"
msgstr "nie można odczytać %s"
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
+#, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:324
#, fuzzy, perl-format
msgid "can't build with source format '%s': %s"
msgstr "używania formatu źródeł \"%s\""
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
msgstr "używania formatu źródeł \"%s\""
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1693,44 +1782,44 @@ msgstr "używania formatu źródeł \"%s\""
msgid "building %s in %s"
msgstr "budowanie %s w %s"
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
msgstr "-x wymaga co najmniej jednego argumentu, .dsc"
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr "-x pobiera nie więcej niż dwa argumenty"
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
msgstr "-x wymaga pliku .dsc, a nie katalogu, jako pierwszego argumentu"
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr "cel rozpakowania istnieje: %s"
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
msgstr "%s nie zawiera ważnego podpisu OpenPGP"
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr "wydobywanie niepodpisanych pakietów źródłowych (%s)"
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, perl-format
msgid "extracting %s in %s"
msgstr "rozpakowywanie %s w %s"
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
#, fuzzy
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr "dozwolona tylko jedna z opcji -x lub -b, i tylko raz"
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
#, fuzzy
msgid ""
"\n"
@@ -1742,7 +1831,7 @@ msgstr ""
"Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
"Copyright (C) 2008 Raphael Hertzog"
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1755,7 +1844,7 @@ msgid ""
" used to build the source package."
msgstr ""
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, fuzzy, perl-format
msgid ""
"Build options:\n"
@@ -1816,7 +1905,7 @@ msgstr ""
"Dostępne są także inne opcje, ale zależą one od formatu pakietu źródłowego.\n"
"Więcej informacji można znaleźć w dpkg-source(1).\n"
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1826,7 +1915,7 @@ msgid ""
"signature"
msgstr ""
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
#, fuzzy
msgid ""
"General options:\n"
@@ -1841,7 +1930,7 @@ msgstr ""
" --help wyświetla ten komunikat pomocy.\n"
" --version wyświetla informacje o wersji programu.\n"
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
@@ -1952,26 +2041,21 @@ msgid ""
"Unknown gcc system type %s, falling back to default (native compilation)"
msgstr "Nieznany typ systemu gcc %s, używanie domyślnego (kompilacja natywna)"
+#: scripts/Dpkg/BuildFlags.pm:197
+#, perl-format
+msgid "line %d of %s mentions unknown flag %s"
+msgstr ""
+
+#: scripts/Dpkg/BuildFlags.pm:206
+#, perl-format
+msgid "line %d of %s is invalid, it has been ignored."
+msgstr ""
+
#: scripts/Dpkg/BuildOptions.pm:91
#, fuzzy, perl-format
msgid "invalid flag in %s: %s"
msgstr "niepoprawne pole w %s: %s"
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
-#, perl-format
-msgid "cannot write %s"
-msgstr "nie można zapisać %s"
-
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
@@ -2450,7 +2534,7 @@ msgstr "zamykanie wejścia tar"
msgid "cannot create directory %s"
msgstr "nie można utworzyć katalogu %s"
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, perl-format
msgid "cannot opendir %s"
@@ -2672,7 +2756,7 @@ msgstr "usuwanie kopii zapasowej pliku łatki %s"
msgid "nonexistent"
msgstr "nieistniejące"
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
msgstr "nie można ustalić stanu %s"
@@ -2706,17 +2790,17 @@ msgstr "nazwany potok"
msgid "named socket"
msgstr "nazwane gniazdo"
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr "%s nie jest nazwą pliku"
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr "brak krytycznego źródłowego pola kontrolnego %s "
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
@@ -2724,80 +2808,80 @@ msgstr ""
"format \"%s\" pakietu źródłowego nie jest obsługiwany (wymagany moduł Perla %"
"s)"
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
msgstr "niepoprawne pole Format \"%s\""
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr "źródło i wersja są wymagane do określenia nazwy bazowej źródeł"
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
msgstr "błąd weryfikowania sygnatury w %s"
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
msgstr "nie można zweryfikować sygnatury w %s, ponieważ nie zainstalowano gpg"
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
msgstr "%s nie jest prawidłową opcją dla %s"
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr "%s nie istnieje"
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
msgstr "nie można uczynić %s plikiem wykonywalnym"
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
msgstr " %s nie jest zwykłym plikiem"
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
msgstr "opcja -s%s nadpisuje wcześniejszą opcję -s%s"
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr "opcja przetwarzania źródeł -s%s nie jest dopuszczalna z -x"
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr "wiele archiwów tar w pakiecie źródłowym wersji 1.0"
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
msgstr "nierozpoznany plik w pakiecie źródłowym %s: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr "pole Files nie zawiera nazwy archiwum tar"
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr "pakiet natywny z rozszerzeniem .orig.tar"
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
msgstr "nie można zmienić nazwy \"%s\" na \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2806,36 +2890,36 @@ msgstr "nie można zmienić nazwy \"%s\" na \"%s\""
msgid "unpacking %s"
msgstr "rozpakowywanie %s"
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr "nie można zachować oryginalnego katalogu (już istnieje)"
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr "nie można zmienić nowo wypakowanego %s na %s"
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr "nie można zmienić nazwy zachowanego %s na %s"
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr "aplikowanie %s"
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
msgstr "obsługuje tylko kompresję gzip"
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
@@ -2843,22 +2927,22 @@ msgstr ""
"-b pobiera co najwyżej dwa argumenty: katalog i oryginalne źródła (z wersją "
"1.0 pakietu źródłowego)"
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr "nie można łączyć -s%s, odnoszącej się do obsługi źródeł, z -b"
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
msgstr "spakowany oryg. \"%s\" istnieje, ale nie jest zwykłym plikiem"
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, perl-format
msgid "cannot stat orig argument %s"
msgstr "nie można ustalić stanu dla argumentu orig %s"
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2867,7 +2951,7 @@ msgstr ""
"argument orig jest niespakowany, ale opcja przetwarzania źródeł -s%s "
"oczekuje spakowanego (.orig.tar.<rozszerzenie>)"
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2876,12 +2960,12 @@ msgstr ""
"argument orig jest spakowany, ale opcja przetwarzania źródeł -s%s oczekuje "
"niespakowanego (.orig/)"
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr "argument oryg %s nie jest zwykłym plikiem ani katalogiem"
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -2890,29 +2974,29 @@ msgstr ""
"argument orig jest pusty (brak orig i różnic), ale opcja przetwarzania "
"źródeł -s%s oczekuje jakiegoś"
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
msgstr "rozpakowany oryg. \"%s\" istnieje, ale nie jest katalogiem"
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr "nie można ustalić stanu domniemanego rozpakowanego oryginalnego \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
msgstr "katalog źródłowy \"%s\" nie jest w postaci <pakiet_źródłowy> \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr ""
"nazwa katalogu .orig %s nie jest w postaci <pakiet>-<wersja_główna> "
"(oczekiwano %s)"
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -2920,7 +3004,7 @@ msgstr ""
"nazwa pliku .orig.tar %s nie jest w postaci <pakiet>-<wersja_główna>.orig."
"tar. (oczekiwano %s)"
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -2929,18 +3013,18 @@ msgstr ""
"archiwum tar \"%s\" już istnieje, nie będzie nadpisany, poddawanie się , "
"użyj -sU lub -sR, aby nadpisać"
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
msgstr "nie można sprawdzić istnienia \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
msgstr "nie można zmienić nazwy (nowo utworzonego) \"%s\" na \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
@@ -2948,12 +3032,12 @@ msgstr "nie można zmienić nazwy (nowo utworzonego) \"%s\" na \"%s\""
msgid "unable to change permission of `%s'"
msgstr "nie można zmienić praw dostępu \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, perl-format
msgid "building %s using existing %s"
msgstr "budowanie %s, używając istniejącego %s"
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -2962,23 +3046,23 @@ msgstr ""
"oryg. katalog \"%s\" już istnieje, nie będzie nadpisany, poddawanie się; "
"użyj -sA, -sK lub -sP, aby nadpisać"
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
msgstr "nie można sprawdzić istnienia katalogu orig \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
msgstr "%s: niereprezentowalne zmiany w źródle"
@@ -3311,20 +3395,26 @@ msgstr ""
msgid "%s is not a valid version"
msgstr "%s nie jest prawidłową opcją dla %s"
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr ""
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
msgstr "numer wersji zawiera niepoprawny znak \"%s\""
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
msgstr ""
+#~ msgid "%s: use %s from environment: %s\n"
+#~ msgstr "%s: użycie %s ze środowiska: %s\n"
+
+#~ msgid "%s: set %s to default value: %s\n"
+#~ msgstr "%s: ustawianie %s na domyślną wartość: %s\n"
+
#~ msgid "cannot open .dsc file %s"
#~ msgstr "nie można otworzyć pliku .dsc %s"
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 583ed9f3e..63a57fd46 100644
--- a/scripts/po/ru.po
+++ b/scripts/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.3.1\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-01-03 16:42+0100\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -18,13 +18,14 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
+#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr "Debian %s, версия %s.\n"
@@ -39,11 +40,12 @@ msgstr ""
"Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
"Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -97,10 +99,10 @@ msgstr ""
" --help показать это сообщение.\n"
" --version показать версию.\n"
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
msgstr "неизвестный параметр `%s'"
@@ -141,7 +143,40 @@ msgstr "Указанный GNU тип системы %s не совпадает
msgid "%s is not a supported variable name"
msgstr "%s не является поддерживаемым именем переменной"
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+msgid ""
+"\n"
+"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-buildflags.pl:44
+#, perl-format
+msgid ""
+"Usage: %s [<action>]\n"
+"\n"
+"Actions:\n"
+" --get <flag> output the requested flag to stdout.\n"
+" --origin <flag> output the origin of the flag to stdout:\n"
+" value is one of vendor, system, user, env.\n"
+" --list output a list of the flags supported by the current "
+"vendor.\n"
+" --help show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:61 scripts/dpkg-buildflags.pl:66
+#, fuzzy, perl-format
+msgid "two commands specified: --%s and --%s"
+msgstr "указано более одного файла (%s и %s)"
+
+#: scripts/dpkg-buildflags.pl:80
+msgid "need an action option"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl:39
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson.\n"
@@ -153,7 +188,7 @@ msgstr ""
"Copyright (C) 2000 Wichert Akkerman\n"
"Copyright (C) 2007 Frank Lichtenheld"
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, fuzzy, perl-format
msgid ""
"\n"
@@ -263,27 +298,27 @@ msgstr ""
" -h, --help показать это сообщение.\n"
" --version показать версию.\n"
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr "-E и -W устарели, они ничего не изменят"
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, perl-format
msgid "unknown option or argument %s"
msgstr "неизвестный параметр или аргумент %s"
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, perl-format
msgid "cannot combine %s and %s"
msgstr "не удалось объединить %s и %s"
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr "используется команда получения прав root, но уже есть права root"
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
@@ -291,67 +326,62 @@ msgstr ""
"fakeroot не найдена, установите пакет fakeroot и\n"
"запускайте команду с параметром -r, или запускайте её от root"
-#: scripts/dpkg-buildpackage.pl:234
+#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
msgstr "команда-получения-root '%s' не найдена"
-#: scripts/dpkg-buildpackage.pl:253
+#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
msgstr "неизвестная команда подписывания, используется интерфейс как у pgp"
-#: scripts/dpkg-buildpackage.pl:256
+#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr ""
"Поддержка PGP будет исключена (смотрите README.feature-removal-schedule)"
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:275
#, perl-format
-msgid "%s: use %s from environment: %s\n"
-msgstr "%s: использование %s из окружения: %s\n"
+msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+msgstr ""
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr "%s: установка %s в значение по умолчанию: %s\n"
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr "пакет исходных текстов"
-#: scripts/dpkg-buildpackage.pl:298
+#: scripts/dpkg-buildpackage.pl:285
msgid "source version"
msgstr "версия исходных текстов"
-#: scripts/dpkg-buildpackage.pl:308
+#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
msgstr "исходные тексты изменены"
-#: scripts/dpkg-buildpackage.pl:326
+#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
msgstr "архитектура хоста"
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
msgstr "debian/rules не является исполняемым: исправляется."
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
msgstr "Неудовлетворительные зависимости/конфликты при сборке, останов."
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
msgstr "(Используйте параметр -d, чтобы продолжить сборку.)"
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr "В данный момент с -S это только предупреждение, но,"
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr "вероятно, станет останавливающей ошибкой в будущем."
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
@@ -359,63 +389,63 @@ msgstr ""
"не очень хорошая мысль генерировать пакет исходного кода без предварительной "
"очистки; могут добавиться нежелательные файлы."
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
msgstr "Нажмите любую клавишу для запуска процесс подписывания\n"
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr "Отказ при подписывании файлов .dsc и .changes"
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr "запись файла изменений"
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr "dpkg-genchanges"
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr "закачка только пакетов исходного кода: родной пакет Debian"
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr ""
"закачка только пакета исходного кода и diff (пакет оригинального исходного "
"кода НЕ включён)"
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr ""
"закачка только пакета исходного кода и diff (с пакетом оригинального "
"исходного кода)"
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr "закачка всего (с пакетом оригинального исходного кода)"
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
msgstr "закачка только двоичных пакетов (без пакетов исходного кода)"
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr ""
"закачка всего; родной пакет Debian (включены все пакеты исходного кода)"
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
msgstr ""
"закачка только двоичных пакетов и diff (без пакетов оригинального исходного "
"кода)"
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr "Отказ при подписывании файла .changes"
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr "невозможно определить %s"
@@ -468,7 +498,7 @@ msgstr "%s: Неудовлетворённые сборочные зависим
msgid "%s: Build conflicts: "
msgstr "%s: Сборочные конфликты: "
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr "ошибка при анализе %s"
@@ -506,27 +536,27 @@ msgstr "нужно указать имя файла, секцию и приор
msgid "filename, section and priority may contain no whitespace"
msgstr "имя файла, секция и приоритет не могут содержать пробельных символов"
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
msgstr "открытие нового файла со списком файлов"
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr "копирование старой записи в новый файл со списком файлов"
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr "чтение старого файла со списком файлов"
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr "запись новой записи в новый файл со списком файлов"
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
msgstr "закрытие нового файла со списком файлов"
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr "установка нового файла с списком файлов"
@@ -711,13 +741,13 @@ msgstr "закачка только двоичных пакетов, без па
msgid "write original source message"
msgstr "запись оригинального исходного сообщения"
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
msgstr "отсутствует информация о критическом поле вывода %s"
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
msgstr "отсутствует информация о поле вывода %s"
@@ -833,12 +863,12 @@ msgid ""
"architecture all"
msgstr ""
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr "пакет %s со специальным udeb-полем %s"
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
@@ -846,36 +876,36 @@ msgstr "пакет %s со специальным udeb-полем %s"
msgid "cannot fork for %s"
msgstr "не удалось выполнить fork %s"
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
msgstr "вызов chdir для du в `%s'"
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
msgstr "вызов exec для %s"
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
msgstr "вызов du в `%s'"
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
msgstr "du выдала неожиданные данные `%s'"
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
msgstr "закрытие старого файла с списком файлов"
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
msgstr "не удалось открыть новый выходной управляющий файл %s"
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
msgstr "не удалось установить новый выходной управляющий файл '%s'"
@@ -998,6 +1028,58 @@ msgstr "%s совпадает не полностью с %s"
msgid "no debian/symbols file used as basis for generating %s"
msgstr "файл debian/symbols не используется в качестве основы для генерации %s"
+#: scripts/dpkg-mergechangelogs.pl:53
+#, fuzzy
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+"\n"
+"Copyright (C) 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:56
+#, 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 ""
+"\n"
+"Это свободное программное обеспечение. См. условия распространения в\n"
+"Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
+"НИКАКИЕ гарантии не предоставляются.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, fuzzy, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+"Использование: %s [<параметр>...] <имя_файла> <секция> <приоритет>\n"
+"\n"
+"Параметры:\n"
+" -f<файл-списка> записать файлы в ук. файл, а не в debian/files.\n"
+" -h, --help показать это сообщение.\n"
+" --version показать версию.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: 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:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, perl-format
+msgid "cannot write %s"
+msgstr "не удалось записать %s"
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -1042,7 +1124,7 @@ msgstr "не удалось найти %s"
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, perl-format
msgid "cannot open %s"
msgstr "не удалось открыть %s"
@@ -1645,39 +1727,40 @@ msgstr "не удалось выполнить функцию stat для кат
msgid "directory argument %s is not a directory"
msgstr "значение параметра каталога %s не является каталогом"
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, fuzzy, perl-format
msgid "using options from %s: %s"
msgstr "ошибка чтения из %s: %s"
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
msgstr "неподдерживаемый метод сжатия %s"
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr "%s не является степенью сжатия"
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
msgstr "требуется параметр -x или -b"
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
msgstr "`%s' не является разрешённой строкой архитектуры"
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
msgstr ""
"архитектура %s должна быть только из указанных в пакете (список для пакета %"
"s: `%s')"
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -1688,18 +1771,23 @@ msgstr ""
msgid "cannot read %s"
msgstr "не удалось прочитать %s"
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
+#, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:324
#, fuzzy, perl-format
msgid "can't build with source format '%s': %s"
msgstr "используется формат исходника `%s'"
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
msgstr "используется формат исходника `%s'"
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1707,44 +1795,44 @@ msgstr "используется формат исходника `%s'"
msgid "building %s in %s"
msgstr "сборка %s в %s"
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
msgstr "-x требует указания хотя бы одного значения .dsc"
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr "-x может иметь не более двух значений"
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
msgstr "-x принимает .dsc файл первым значением, а не каталог"
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr "цель распаковки существует: %s"
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
msgstr "%s не содержит корректной подписи OpenPGP"
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr "распаковка неподписанного пакета с исходным кодом (%s)"
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, perl-format
msgid "extracting %s in %s"
msgstr "извлечение %s в %s"
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
#, fuzzy
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr "разрешено что-то одно: -x или -b и только один раз"
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
#, fuzzy
msgid ""
"\n"
@@ -1756,7 +1844,7 @@ msgstr ""
"Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
"Copyright (C) 2008 Raphael Hertzog"
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1769,7 +1857,7 @@ msgid ""
" used to build the source package."
msgstr ""
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, fuzzy, perl-format
msgid ""
"Build options:\n"
@@ -1832,7 +1920,7 @@ msgstr ""
"кода.\n"
"Подробней см. в dpkg-source(1).\n"
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1842,7 +1930,7 @@ msgid ""
"signature"
msgstr ""
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
#, fuzzy
msgid ""
"General options:\n"
@@ -1856,7 +1944,7 @@ msgstr ""
" -h, --help показать это сообщение.\n"
" --version показать версию.\n"
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
@@ -1966,26 +2054,21 @@ msgstr ""
"Неизвестный gcc тип системы %s, переход к использованию значения по "
"умолчанию (родная компиляция)"
+#: scripts/Dpkg/BuildFlags.pm:197
+#, perl-format
+msgid "line %d of %s mentions unknown flag %s"
+msgstr ""
+
+#: scripts/Dpkg/BuildFlags.pm:206
+#, perl-format
+msgid "line %d of %s is invalid, it has been ignored."
+msgstr ""
+
#: scripts/Dpkg/BuildOptions.pm:91
#, fuzzy, perl-format
msgid "invalid flag in %s: %s"
msgstr "неправильное поле в %s: %s"
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
-#, perl-format
-msgid "cannot write %s"
-msgstr "не удалось записать %s"
-
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
@@ -2465,7 +2548,7 @@ msgstr "закрытие ввода tar"
msgid "cannot create directory %s"
msgstr "не удалось создать каталог %s"
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, perl-format
msgid "cannot opendir %s"
@@ -2681,7 +2764,7 @@ msgstr "удаление резервной копии заплатки %s"
msgid "nonexistent"
msgstr "несуществующий"
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
msgstr "не удалось выполнить функцию stat %s"
@@ -2715,17 +2798,17 @@ msgstr "именованный канал"
msgid "named socket"
msgstr "именованный сокет"
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr "%s не является именем файла"
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr "отсутствует критическое управляющее поле исходников %s"
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
@@ -2733,80 +2816,80 @@ msgstr ""
"формат пакета с исходным кодом `%s' не поддерживается (требуется Perl модуль "
"%s)"
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
msgstr "неправильное поле Format '%s'"
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr "для определения базового имени исходника требуется исходник и версия"
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
msgstr "проверка подписи для %s завершилась неудачно"
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
msgstr "невозможно проверить подпись для %s, так как gpg не установлена"
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
msgstr "%s не является допустимым параметром для %s"
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr "%s не существует"
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
msgstr "не удалось сделать %s исполняемым"
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
msgstr "%s не является простым файлом"
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
msgstr "параметр -s%s заменит ранее указанный параметр -s%s"
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr "указывать обработчик исходников -s%s не разрешено вместе с -x"
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr "несколько tar-файлов в пакете с исходным кодом версии v1.0"
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
msgstr "нераспознанный файл в пакете с исходным кодом %s: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr "нет tar-файла в поле Files"
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr "родной пакет с .orig.tar"
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
msgstr "невозможно переименовать '%s' в '%s'"
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2815,36 +2898,36 @@ msgstr "невозможно переименовать '%s' в '%s'"
msgid "unpacking %s"
msgstr "распаковывается %s"
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr "невозможно сохранить orig каталог (уже существует)"
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr "отказ при переименовании только что извлечённого %s в %s"
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr "отказ при переименовании сохранённого %s в %s"
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr "накладывается %s"
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
msgstr "поддерживается только метод сжатия gzip"
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
@@ -2852,22 +2935,22 @@ msgstr ""
"значением параметра -b является только каталог и orig исходник (для "
"исходника пакета v1.0)"
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr "тип работы с исходниками -s%s нельзя указывать вместе с -b"
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
msgstr "упакованный orig '%s' существует, но не является простым файлом"
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, perl-format
msgid "cannot stat orig argument %s"
msgstr "не удалось выполнить функцию stat для orig параметра %s"
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2876,7 +2959,7 @@ msgstr ""
"orig параметр распакован, но вызываются методы -s%s как для упакованных "
"исходников (.orig.tar.<расш>)"
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2885,12 +2968,12 @@ msgstr ""
"orig параметр упакован, но вызываются методы -s%s как для распакованных "
"исходников (.orig/)"
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr "orig параметр %s не является обычным файлом или каталогом"
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -2899,32 +2982,32 @@ msgstr ""
"orig параметр пуст (то есть не orig и не diff), но указана команда что-то "
"сделать -s%s"
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
msgstr "существует распакованный orig `%s', но не является каталогом"
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr ""
"невозможно выполнить функцию stat для предполагаемого распакованного orig `%"
"s'"
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
msgstr ""
"каталог исходников '%s' не в виде <пакет исходников>-<оригинальная версия> '%"
"s'"
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr ""
"имя каталога .orig %s не в виде <пакет>-<оригинальная версия> (требуется %s)"
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -2932,7 +3015,7 @@ msgstr ""
"имя .orig.tar %s не в виде <пакет>_<оригинальная версия>.orig.tar (требуется "
"%s)"
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -2941,18 +3024,18 @@ msgstr ""
"tar-файл `%s' уже существует, не перезаписывается, останов; используйте -sU "
"или -sR для перезаписи"
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
msgstr "невозможно проверить существование `%s'"
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
msgstr "невозможно переименовать '%s' (недавно созданный) в '%s'"
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
@@ -2960,12 +3043,12 @@ msgstr "невозможно переименовать '%s' (недавно с
msgid "unable to change permission of `%s'"
msgstr "невозможно изменить права '%s'"
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, perl-format
msgid "building %s using existing %s"
msgstr "сборка %s с использованием существующего %s"
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -2974,23 +3057,23 @@ msgstr ""
"каталог orig `%s' уже существует, не перезаписан, останов; используйте -sA, -"
"sK или -sP для перезаписи"
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
msgstr "невозможно проверить существование orig каталога `%s'"
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
msgstr ""
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
msgstr "%s: нехарактерные изменения в исходнике"
@@ -3324,20 +3407,26 @@ msgstr ""
msgid "%s is not a valid version"
msgstr "%s не является допустимым параметром для %s"
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr ""
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
msgstr "номер версии содержит недопустимый символ `%s'"
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
msgstr ""
+#~ msgid "%s: use %s from environment: %s\n"
+#~ msgstr "%s: использование %s из окружения: %s\n"
+
+#~ msgid "%s: set %s to default value: %s\n"
+#~ msgstr "%s: установка %s в значение по умолчанию: %s\n"
+
#~ msgid "cannot open .dsc file %s"
#~ msgstr "не удалось открыть файл .dsc %s"
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index c291d4d7d..b05bd45a1 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -7,22 +7,23 @@ msgid ""
msgstr ""
"Project-Id-Version: dpkg 1.15.6\n"
"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-24 13:59+0100\n"
+"POT-Creation-Date: 2010-04-21 04:19+0200\n"
"PO-Revision-Date: 2010-03-15 12:25+0100\n"
"Last-Translator: Peter Krefting <peterk@debian.org>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:36
-#: scripts/dpkg-checkbuilddeps.pl:36 scripts/dpkg-distaddfile.pl:33
-#: scripts/dpkg-genchanges.pl:95 scripts/dpkg-gencontrol.pl:56
-#: scripts/dpkg-gensymbols.pl:49 scripts/dpkg-name.pl:46
+#: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
+#: scripts/dpkg-mergechangelogs.pl:51 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-source.pl:395 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:400 scripts/changelog/debian.pl:34
#, perl-format
msgid "Debian %s version %s.\n"
msgstr "Debian %s version %s.\n"
@@ -37,11 +38,12 @@ msgstr ""
"Copyright © 1999-2001 Marcus Brinkmann <brinkmd@debian.org>.\n"
"Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>."
-#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:43
-#: scripts/dpkg-distaddfile.pl:38 scripts/dpkg-genchanges.pl:101
-#: scripts/dpkg-gencontrol.pl:62 scripts/dpkg-gensymbols.pl:55
-#: scripts/dpkg-parsechangelog.pl:37 scripts/dpkg-shlibdeps.pl:527
-#: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39
+#: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
+#: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:407
+#: scripts/changelog/debian.pl:39
msgid ""
"\n"
"This is free software; see the GNU General Public License version 2 or\n"
@@ -94,10 +96,10 @@ msgstr ""
" --help visa detta hjälpmeddelande.\n"
" --version visa versionsnummer.\n"
-#: scripts/dpkg-architecture.pl:119 scripts/dpkg-distaddfile.pl:68
-#: scripts/dpkg-genchanges.pl:193 scripts/dpkg-gencontrol.pl:133
-#: scripts/dpkg-gensymbols.pl:141 scripts/dpkg-parsechangelog.pl:113
-#: scripts/dpkg-shlibdeps.pl:118
+#: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:76
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
+#: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
#, perl-format
msgid "unknown option `%s'"
msgstr "okänd flagga \"%s\""
@@ -136,7 +138,40 @@ msgstr "Angiven GNU-systemtyp %s stämmer inte med gcc-systemtypen %s."
msgid "%s is not a supported variable name"
msgstr "%s är inte ett variabelnamn som stöds"
-#: scripts/dpkg-buildpackage.pl:38
+#: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+msgid ""
+"\n"
+"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+msgstr ""
+"\n"
+"Copyright © 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-buildflags.pl:44
+#, perl-format
+msgid ""
+"Usage: %s [<action>]\n"
+"\n"
+"Actions:\n"
+" --get <flag> output the requested flag to stdout.\n"
+" --origin <flag> output the origin of the flag to stdout:\n"
+" value is one of vendor, system, user, env.\n"
+" --list output a list of the flags supported by the current "
+"vendor.\n"
+" --help show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+
+#: scripts/dpkg-buildflags.pl:61 scripts/dpkg-buildflags.pl:66
+#, fuzzy, perl-format
+msgid "two commands specified: --%s and --%s"
+msgstr "mer än en fil angavs (%s och %s)"
+
+#: scripts/dpkg-buildflags.pl:80
+msgid "need an action option"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl:39
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson.\n"
@@ -148,7 +183,7 @@ msgstr ""
"Copyright © 2000 Wichert Akkerman.\n"
"Copyright © 2007 Frank Lichtenheld."
-#: scripts/dpkg-buildpackage.pl:50
+#: scripts/dpkg-buildpackage.pl:51
#, perl-format
msgid ""
"\n"
@@ -256,27 +291,27 @@ msgstr ""
" -h, --help visa detta hjälpmeddelande.\n"
" --version visa versionsnummer.\n"
-#: scripts/dpkg-buildpackage.pl:207 scripts/dpkg-source.pl:176
+#: scripts/dpkg-buildpackage.pl:208 scripts/dpkg-source.pl:179
msgid "-E and -W are deprecated, they are without effect"
msgstr "-E och -W rekommenderas ej, de har ingen effekt"
-#: scripts/dpkg-buildpackage.pl:211
+#: scripts/dpkg-buildpackage.pl:212
#, perl-format
msgid "unknown option or argument %s"
msgstr "okänd flagga eller argument %s"
-#: scripts/dpkg-buildpackage.pl:216 scripts/dpkg-genchanges.pl:142
+#: scripts/dpkg-buildpackage.pl:217 scripts/dpkg-genchanges.pl:142
#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
#: scripts/dpkg-genchanges.pl:153
#, perl-format
msgid "cannot combine %s and %s"
msgstr "kan inte kombinera %s och %s"
-#: scripts/dpkg-buildpackage.pl:224
+#: scripts/dpkg-buildpackage.pl:225
msgid "using a gain-root-command while being root"
msgstr "använder ett gain-root-command fast jag redan är root"
-#: scripts/dpkg-buildpackage.pl:230
+#: scripts/dpkg-buildpackage.pl:231
msgid ""
"fakeroot not found, either install the fakeroot\n"
"package, specify a command with the -r option, or run this as root"
@@ -284,66 +319,61 @@ msgstr ""
"fakeroot hittades inte, du kan installera paketet fakeroot,\n"
"ange ett kommando med flaggan -r, eller köra som root"
-#: scripts/dpkg-buildpackage.pl:234
+#: scripts/dpkg-buildpackage.pl:235
#, perl-format
msgid "gain-root-commmand '%s' not found"
msgstr "få-root-kommandot \"%s\" hittades inte"
-#: scripts/dpkg-buildpackage.pl:253
+#: scripts/dpkg-buildpackage.pl:254
msgid "unknown sign command, assuming pgp style interface"
msgstr "okänt signeringskommando, antar pgp-gränssnittstyp"
-#: scripts/dpkg-buildpackage.pl:256
+#: scripts/dpkg-buildpackage.pl:257
msgid "PGP support is deprecated (see README.feature-removal-schedule)"
msgstr "PGP-stödet undanbes (se README.feature-removal-schedule)"
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:275
#, perl-format
-msgid "%s: use %s from environment: %s\n"
-msgstr "%s: använd %s från miljön: %s\n"
+msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+msgstr ""
#: scripts/dpkg-buildpackage.pl:284
-#, perl-format
-msgid "%s: set %s to default value: %s\n"
-msgstr "%s: sätt %s till standardvärde: %s\n"
-
-#: scripts/dpkg-buildpackage.pl:297
msgid "source package"
msgstr "källkodspaket"
-#: scripts/dpkg-buildpackage.pl:298
+#: scripts/dpkg-buildpackage.pl:285
msgid "source version"
msgstr "källkodsversion"
-#: scripts/dpkg-buildpackage.pl:308
+#: scripts/dpkg-buildpackage.pl:295
msgid "source changed by"
msgstr "källkod ändrad av"
-#: scripts/dpkg-buildpackage.pl:326
+#: scripts/dpkg-buildpackage.pl:313
msgid "host architecture"
msgstr "värdarkitektur"
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:326
msgid "debian/rules is not executable: fixing that."
msgstr "debian/rules är inte exekverbar: rättar."
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:339
msgid "Build dependencies/conflicts unsatisfied; aborting."
msgstr "Byggberoenden/-konflikter ej uppfyllda; avbryter."
-#: scripts/dpkg-buildpackage.pl:353
+#: scripts/dpkg-buildpackage.pl:340
msgid "(Use -d flag to override.)"
msgstr "(Använd flaggan -d för att överstyra.)"
-#: scripts/dpkg-buildpackage.pl:356
+#: scripts/dpkg-buildpackage.pl:343
msgid "This is currently a non-fatal warning with -S, but"
msgstr "Detta är för närvarande en icke-ödesdiger varning med -S, men"
-#: scripts/dpkg-buildpackage.pl:357
+#: scripts/dpkg-buildpackage.pl:344
msgid "will probably become fatal in the future."
msgstr "den kommer troligen att bli ödesdiger i framtiden."
-#: scripts/dpkg-buildpackage.pl:379
+#: scripts/dpkg-buildpackage.pl:366
msgid ""
"it is a bad idea to generate a source package without cleaning up first, it "
"might contain undesired files."
@@ -351,57 +381,57 @@ msgstr ""
"det är inte någon bra idé att generera ett källkodspaket utan att först "
"städa upp det, det kan innehålla oönskade filer."
-#: scripts/dpkg-buildpackage.pl:392
+#: scripts/dpkg-buildpackage.pl:379
msgid "Press the return key to start signing process\n"
msgstr "Tryck på Enter för att inleda signeringsproceduren\n"
-#: scripts/dpkg-buildpackage.pl:399
+#: scripts/dpkg-buildpackage.pl:386
msgid "Failed to sign .dsc and .changes file"
msgstr "Misslyckades att signera .dsc- och .changes-filerna"
-#: scripts/dpkg-buildpackage.pl:414 scripts/dpkg-buildpackage.pl:418
-#: scripts/dpkg-buildpackage.pl:431
+#: scripts/dpkg-buildpackage.pl:401 scripts/dpkg-buildpackage.pl:405
+#: scripts/dpkg-buildpackage.pl:418
msgid "write changes file"
msgstr "skriv ändringsfil"
-#: scripts/dpkg-buildpackage.pl:430
+#: scripts/dpkg-buildpackage.pl:417
msgid "dpkg-genchanges"
msgstr "dpkg-genchanges"
-#: scripts/dpkg-buildpackage.pl:439
+#: scripts/dpkg-buildpackage.pl:426
msgid "source only upload: Debian-native package"
msgstr "insändning med endast källkod: Debianeget paket"
-#: scripts/dpkg-buildpackage.pl:441
+#: scripts/dpkg-buildpackage.pl:428
msgid "source only, diff-only upload (original source NOT included)"
msgstr ""
"insändning enbart med källkod, enbart med diff (originalkällkod tas EJ med)"
-#: scripts/dpkg-buildpackage.pl:443
+#: scripts/dpkg-buildpackage.pl:430
msgid "source only upload (original source is included)"
msgstr "insändning enbart med källkod (originalkällkod tas med)"
-#: scripts/dpkg-buildpackage.pl:446 scripts/dpkg-buildpackage.pl:454
+#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:441
msgid "full upload (original source is included)"
msgstr "komplett insändning (originalkällkod tas med)"
-#: scripts/dpkg-buildpackage.pl:448
+#: scripts/dpkg-buildpackage.pl:435
msgid "binary only upload (no source included)"
msgstr "endast binär insändning (ingen källkod tas med)"
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:437
msgid "full upload; Debian-native package (full source is included)"
msgstr "komplett insändnig; Debianeget paket (komplett källkod tas med)"
-#: scripts/dpkg-buildpackage.pl:452
+#: scripts/dpkg-buildpackage.pl:439
msgid "binary and diff upload (original source NOT included)"
msgstr "binär- och diffinsändning (originalkällkod tas EJ med)"
-#: scripts/dpkg-buildpackage.pl:459
+#: scripts/dpkg-buildpackage.pl:446
msgid "Failed to sign .changes file"
msgstr "Misslyckades att signera .changes-fil"
-#: scripts/dpkg-buildpackage.pl:483
+#: scripts/dpkg-buildpackage.pl:470
#, perl-format
msgid "unable to determine %s"
msgstr "kan inte bestämma %s"
@@ -451,7 +481,7 @@ msgstr "%s: Ej uppfyllda byggberoenden: "
msgid "%s: Build conflicts: "
msgstr "%s: Byggkonflikter: "
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:223
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:226
#, perl-format
msgid "error occurred while parsing %s"
msgstr "fel vid tolkning av %s"
@@ -489,27 +519,27 @@ msgstr "behöver exakt ett filnamn, en sektion och en prioritet"
msgid "filename, section and priority may contain no whitespace"
msgstr "filnamn, sektion och prioritet kan inte innehålla blanktecken"
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
msgid "open new files list file"
msgstr "öppnar ny fillistfil"
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:343
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
msgid "copy old entry to new files list file"
msgstr "kopiera gammal post till ny fillistfil"
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:347
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
msgid "read old files list file"
msgstr "läs gammal fillistfil"
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:357
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
msgid "write new entry to new files list file"
msgstr "skriv ny post i ny fillistfil"
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
msgid "close new files list file"
msgstr "stäng ny fillistfil"
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
msgid "install new files list file"
msgstr "installerar ny fillistfil"
@@ -686,13 +716,13 @@ msgstr "endast binär insändning - tar inte med någon källkod"
msgid "write original source message"
msgstr "skriver meddelande om originalkällkod"
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:412
+#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:418
#, perl-format
msgid "missing information for critical output field %s"
msgstr "saknar information för kritiskt utdatafält %s"
#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:417
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:423
#, perl-format
msgid "missing information for output field %s"
msgstr "saknar information för utdatafält %s"
@@ -805,12 +835,12 @@ msgstr ""
"Fältet %s innehåller ett arkitekturspecifikt beroende, men paketet är för "
"alla arkitekturer"
-#: scripts/dpkg-gencontrol.pl:286
+#: scripts/dpkg-gencontrol.pl:287
#, perl-format
msgid "%s package with udeb specific field %s"
msgstr "%s-paket med udeb-specifikt fält %s"
-#: scripts/dpkg-gencontrol.pl:299 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:300 scripts/dpkg-scansources.pl:313
#: scripts/dpkg-shlibdeps.pl:819 scripts/Dpkg/Changelog/Parse.pm:138
#: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:84
#: scripts/Dpkg/Shlibs/Objdump.pm:158
@@ -818,36 +848,36 @@ msgstr "%s-paket med udeb-specifikt fält %s"
msgid "cannot fork for %s"
msgstr "kan inte grena för %s"
-#: scripts/dpkg-gencontrol.pl:302
+#: scripts/dpkg-gencontrol.pl:303
#, perl-format
msgid "chdir for du to `%s'"
msgstr "chdir för du till \"%s\""
-#: scripts/dpkg-gencontrol.pl:303 scripts/Dpkg/IPC.pm:271
+#: scripts/dpkg-gencontrol.pl:304 scripts/Dpkg/IPC.pm:271
#, perl-format
msgid "exec %s"
msgstr "exekverar %s"
-#: scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-gencontrol.pl:311
#, perl-format
msgid "du in `%s'"
msgstr "du i \"%s\""
-#: scripts/dpkg-gencontrol.pl:312
+#: scripts/dpkg-gencontrol.pl:313
#, perl-format
msgid "du gave unexpected output `%s'"
msgstr "du gav oväntade utdata \"%s\""
-#: scripts/dpkg-gencontrol.pl:345
+#: scripts/dpkg-gencontrol.pl:346
msgid "close old files list file"
msgstr "stänger gammal fillistfil"
-#: scripts/dpkg-gencontrol.pl:367
+#: scripts/dpkg-gencontrol.pl:368
#, perl-format
msgid "cannot open new output control file `%s'"
msgstr "kan inte skapa ny utdatastyrfil \"%s\""
-#: scripts/dpkg-gencontrol.pl:378
+#: scripts/dpkg-gencontrol.pl:379
#, perl-format
msgid "cannot install output control file `%s'"
msgstr "kan inte installera utdatastyrfil \"%s\""
@@ -969,6 +999,57 @@ msgstr "%s stämmer inte helt överens med %s"
msgid "no debian/symbols file used as basis for generating %s"
msgstr "använde ingen debian/symbols-fil som grund för att generera %s"
+#: scripts/dpkg-mergechangelogs.pl:53
+#, fuzzy
+msgid "Copyright (C) 2009-2010 Raphaël Hertzog."
+msgstr ""
+"\n"
+"Copyright © 2007 Raphael Hertzog.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:56
+#, 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 ""
+"\n"
+"Detta program är fri programvara. Se GNU General Public License version 2\n"
+"eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:63
+#, fuzzy, perl-format
+msgid ""
+"Usage: %s [<option> ...] <old> <new-a> <new-b> [<out>]\n"
+"\n"
+"Options:\n"
+" --merge-prereleases, -m merge pre-releases together, ignores everything\n"
+" after the last '~' in the version.\n"
+" --help, -h, -? show this help message.\n"
+" --version show the version.\n"
+msgstr ""
+"Användning: %s [<flagga>...] <filnamn> <sektion> <prioritet>\n"
+"\n"
+"Flaggor:\n"
+" -f<fillistfil> skriver filer här istället för debian/files.\n"
+" -h, --help visa detta hjälpmeddelande.\n"
+" --version visa versionsnummer.\n"
+
+#: scripts/dpkg-mergechangelogs.pl:127
+#: scripts/Dpkg/Compression/FileHandle.pm:385
+#: 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:436 scripts/Dpkg/Source/Package/V2.pm:196
+#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#, perl-format
+msgid "cannot write %s"
+msgstr "kan inte skriva %s"
+
#: scripts/dpkg-name.pl:51
#, perl-format
msgid "Usage: %s [<option>...] <file>...\n"
@@ -1010,7 +1091,7 @@ msgstr "kan inte hitta %s"
#: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:137 scripts/Dpkg/Arch.pm:156
#: scripts/Dpkg/Arch.pm:175 scripts/Dpkg/Changelog/Parse.pm:142
#: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:134
+#: scripts/Dpkg/Source/Package.pm:138
#, perl-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
@@ -1609,37 +1690,38 @@ msgstr "kan inte ta status på katalogen %s"
msgid "directory argument %s is not a directory"
msgstr "katalogargumentet %s är inte en katalog"
-#: scripts/dpkg-source.pl:113
+#: scripts/dpkg-source.pl:115
#, perl-format
msgid "using options from %s: %s"
msgstr "använder flaggor från %s: %s"
-#: scripts/dpkg-source.pl:127 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:130 scripts/Dpkg/Compression.pm:168
#, perl-format
msgid "%s is not a supported compression"
msgstr "%s är inte en komprimering som stöds"
-#: scripts/dpkg-source.pl:133 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:136 scripts/Dpkg/Compression.pm:193
#: scripts/Dpkg/Compression/Process.pm:86
#, perl-format
msgid "%s is not a compression level"
msgstr "%s är inte en komprimeringsnivå"
-#: scripts/dpkg-source.pl:188
+#: scripts/dpkg-source.pl:191
msgid "need -x or -b"
msgstr "behöver -x eller -b"
-#: scripts/dpkg-source.pl:247
+#: scripts/dpkg-source.pl:250
#, perl-format
msgid "`%s' is not a legal architecture string"
msgstr "\"%s\" är inte en giltig arkitektursträng"
-#: scripts/dpkg-source.pl:250
+#: scripts/dpkg-source.pl:253
#, perl-format
msgid "architecture %s only allowed on its own (list for package %s is `%s')"
msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")"
-#: scripts/dpkg-source.pl:298 scripts/Dpkg/Compression/FileHandle.pm:401
+#: scripts/dpkg-source.pl:301 scripts/Dpkg/BuildFlags.pm:189
+#: scripts/Dpkg/Compression/FileHandle.pm:401
#: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:99
#: scripts/Dpkg/Source/Package/V2.pm:317 scripts/Dpkg/Source/Package/V2.pm:455
#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
@@ -1650,18 +1732,23 @@ msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")"
msgid "cannot read %s"
msgstr "kan inte läsa %s"
-#: scripts/dpkg-source.pl:319
+#: scripts/dpkg-source.pl:306
+#, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:324
#, perl-format
msgid "can't build with source format '%s': %s"
msgstr "kan inte bygga med källkodsformatet \"%s\": %s"
-#: scripts/dpkg-source.pl:320
+#: scripts/dpkg-source.pl:325
#, perl-format
msgid "using source format `%s'"
msgstr "använder källkodsformatet \"%s\""
-#: scripts/dpkg-source.pl:328 scripts/Dpkg/Source/Package/V1.pm:291
-#: scripts/Dpkg/Source/Package/V1.pm:336 scripts/Dpkg/Source/Package/V2.pm:438
+#: scripts/dpkg-source.pl:333 scripts/Dpkg/Source/Package/V1.pm:296
+#: scripts/Dpkg/Source/Package/V1.pm:341 scripts/Dpkg/Source/Package/V2.pm:438
#: scripts/Dpkg/Source/Package/V3/bzr.pm:152
#: scripts/Dpkg/Source/Package/V3/native.pm:83
#: scripts/Dpkg/Source/Package/V3/git.pm:216
@@ -1669,43 +1756,43 @@ msgstr "använder källkodsformatet \"%s\""
msgid "building %s in %s"
msgstr "bygger %s i %s"
-#: scripts/dpkg-source.pl:339
+#: scripts/dpkg-source.pl:344
msgid "-x needs at least one argument, the .dsc"
msgstr "-x behöver åtminstone ett argument, .dsc-filen"
-#: scripts/dpkg-source.pl:342
+#: scripts/dpkg-source.pl:347
msgid "-x takes no more than two arguments"
msgstr "-x tar maximalt två argument"
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:351
msgid "-x needs the .dsc file as first argument, not a directory"
msgstr "-x måste ha .dsc-filen som första argument, inte en katalog"
-#: scripts/dpkg-source.pl:362
+#: scripts/dpkg-source.pl:367
#, perl-format
msgid "unpack target exists: %s"
msgstr "mål för uppackning finns redan: %s"
-#: scripts/dpkg-source.pl:372
+#: scripts/dpkg-source.pl:377
#, perl-format
msgid "%s doesn't contain a valid OpenPGP signature"
msgstr "%s innehåller inte en giltig OpenPGP-signatur"
-#: scripts/dpkg-source.pl:374
+#: scripts/dpkg-source.pl:379
#, perl-format
msgid "extracting unsigned source package (%s)"
msgstr "extraherar osignerat källkodspaket (%s)"
-#: scripts/dpkg-source.pl:381
+#: scripts/dpkg-source.pl:386
#, perl-format
msgid "extracting %s in %s"
msgstr "extraherar %s i %s"
-#: scripts/dpkg-source.pl:389
+#: scripts/dpkg-source.pl:394
msgid "only one of -x, -b or --print-format allowed, and only once"
msgstr "endast en av -x, -b och --print-format tillåts, och endast en gång"
-#: scripts/dpkg-source.pl:397
+#: scripts/dpkg-source.pl:402
msgid ""
"\n"
"Copyright (C) 1996 Ian Jackson\n"
@@ -1717,7 +1804,7 @@ msgstr ""
"Copyright © 1997 Klee Dienes\n"
"Copyright © 2008 Raphael Hertzog"
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:415
#, perl-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
@@ -1738,7 +1825,7 @@ msgstr ""
" --print-format <kat> visa källkodsformatet som skulle användas\n"
" för att bygga källkodspaketet."
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:424
#, perl-format
msgid ""
"Build options:\n"
@@ -1781,7 +1868,7 @@ msgstr ""
" \"%d\", värden som stöds är: \"1\"-\"9\", \"best"
"\", \"fast\")"
-#: scripts/dpkg-source.pl:437
+#: scripts/dpkg-source.pl:442
msgid ""
"Extract options:\n"
" --no-copy don't copy .orig tarballs\n"
@@ -1796,7 +1883,7 @@ msgstr ""
"uppackning\n"
" --require-valid-signature avbryt om paketet saknar giltig signatur"
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:447
msgid ""
"General options:\n"
" -h, --help show this help message.\n"
@@ -1806,7 +1893,7 @@ msgstr ""
" -h, --help visa detta hjälpmeddelande.\n"
" --version visa versionsnummer."
-#: scripts/dpkg-source.pl:446
+#: scripts/dpkg-source.pl:451
msgid ""
"More options are available but they depend on the source package format.\n"
"See dpkg-source(1) for more info."
@@ -1915,26 +2002,21 @@ msgid ""
msgstr ""
"Okänd gcc-systemtyp %s, faller tillbaka på standard (lokal kompilering)"
+#: scripts/Dpkg/BuildFlags.pm:197
+#, perl-format
+msgid "line %d of %s mentions unknown flag %s"
+msgstr ""
+
+#: scripts/Dpkg/BuildFlags.pm:206
+#, perl-format
+msgid "line %d of %s is invalid, it has been ignored."
+msgstr ""
+
#: scripts/Dpkg/BuildOptions.pm:91
#, perl-format
msgid "invalid flag in %s: %s"
msgstr "felaktig flagga i %s: %s"
-#: scripts/Dpkg/Compression/FileHandle.pm:385
-#: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
-#: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Package.pm:342
-#: scripts/Dpkg/Source/Package.pm:430 scripts/Dpkg/Source/Package/V2.pm:196
-#: scripts/Dpkg/Source/Package/V2.pm:427 scripts/Dpkg/Source/Package/V2.pm:472
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:296
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
-#, perl-format
-msgid "cannot write %s"
-msgstr "kan inte skriva %s"
-
#: scripts/Dpkg/Compression/Process.pm:71
#, perl-format
msgid "%s is not a supported compression method"
@@ -2410,7 +2492,7 @@ msgstr "stängning av tar-indata"
msgid "cannot create directory %s"
msgstr "kan inte skapa katalogen %s"
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:227
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
#: scripts/Dpkg/Source/Package/V2.pm:177
#, perl-format
msgid "cannot opendir %s"
@@ -2627,7 +2709,7 @@ msgstr "tar bort patchsäkerhetskopian %s"
msgid "nonexistent"
msgstr "saknas"
-#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:352
+#: scripts/Dpkg/Source/Patch.pm:516 scripts/Dpkg/Source/Package.pm:358
#, perl-format
msgid "cannot stat %s"
msgstr "kan inte ta status på %s"
@@ -2661,96 +2743,96 @@ msgstr "namngivet rör"
msgid "named socket"
msgstr "namngivet uttag"
-#: scripts/Dpkg/Source/Package.pm:129
+#: scripts/Dpkg/Source/Package.pm:133
#, perl-format
msgid "%s is not the name of a file"
msgstr "%s är inte namnet på en fil"
-#: scripts/Dpkg/Source/Package.pm:149
+#: scripts/Dpkg/Source/Package.pm:153
#, perl-format
msgid "missing critical source control field %s"
msgstr "saknar kritiska källkodsstyrfältet %s"
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:181
#, perl-format
msgid ""
"source package format `%s' is not supported (Perl module %s is required)"
msgstr "källkodsformatet \"%s\" stöds inte (Perlmodulen %s krävs)"
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:185
#, perl-format
msgid "invalid Format field `%s'"
msgstr "ogiltigt Format-fält \"%s\""
-#: scripts/Dpkg/Source/Package.pm:208
+#: scripts/Dpkg/Source/Package.pm:212
msgid "source and version are required to compute the source basename"
msgstr "källkod och version behövs för att beräkna basnamn för källkod"
-#: scripts/Dpkg/Source/Package.pm:274 scripts/Dpkg/Source/Package.pm:276
+#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
#, perl-format
msgid "failed to verify signature on %s"
msgstr "misslyckades verifiera signaturen på %s"
-#: scripts/Dpkg/Source/Package.pm:283 scripts/Dpkg/Source/Package.pm:285
+#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
#, perl-format
msgid "could not verify signature on %s since gpg isn't installed"
msgstr "kunde inte verifiera signaturen på %s eftersom gpg inte installerats"
-#: scripts/Dpkg/Source/Package.pm:294
+#: scripts/Dpkg/Source/Package.pm:298
#, perl-format
msgid "%s is not a valid option for %s"
msgstr "%s är inte en giltig flagga för %s"
-#: scripts/Dpkg/Source/Package.pm:354
+#: scripts/Dpkg/Source/Package.pm:360
#, perl-format
msgid "%s does not exist"
msgstr "%s finns inte"
-#: scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Package.pm:364
#, perl-format
msgid "cannot make %s executable"
msgstr "kan inte göra %s exekverbar"
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:366
#, perl-format
msgid "%s is not a plain file"
msgstr "%s är inte en vanlig fil"
-#: scripts/Dpkg/Source/Package/V1.pm:54
+#: scripts/Dpkg/Source/Package/V1.pm:59
#, perl-format
msgid "-s%s option overrides earlier -s%s option"
msgstr "flaggan -s%s ersätter tidigare flagga -s%s"
-#: scripts/Dpkg/Source/Package/V1.pm:73
+#: scripts/Dpkg/Source/Package/V1.pm:78
#, perl-format
msgid "source handling style -s%s not allowed with -x"
msgstr "källkodshanteringstyp -s%s tillåts inte med -x"
-#: scripts/Dpkg/Source/Package/V1.pm:85
+#: scripts/Dpkg/Source/Package/V1.pm:90
#: scripts/Dpkg/Source/Package/V3/native.pm:50
msgid "multiple tarfiles in v1.0 source package"
msgstr "flera tarfiler i v1.0-källkodspaket"
-#: scripts/Dpkg/Source/Package/V1.pm:90 scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V1.pm:95 scripts/Dpkg/Source/Package/V2.pm:112
#, perl-format
msgid "unrecognized file for a %s source package: %s"
msgstr "okänd fil för ett %s-källkodspaket: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:95
+#: scripts/Dpkg/Source/Package/V1.pm:100
#: scripts/Dpkg/Source/Package/V3/native.pm:57
msgid "no tarfile in Files field"
msgstr "ej tarfil i Files-fältet"
-#: scripts/Dpkg/Source/Package/V1.pm:98
+#: scripts/Dpkg/Source/Package/V1.pm:103
msgid "native package with .orig.tar"
msgstr "Debianspecifikt paket med .orig.tar"
-#: scripts/Dpkg/Source/Package/V1.pm:111
+#: scripts/Dpkg/Source/Package/V1.pm:116
#, perl-format
msgid "unable to rename `%s' to `%s'"
msgstr "kan inte byta namn på \"%s\" till \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:115 scripts/Dpkg/Source/Package/V2.pm:124
+#: scripts/Dpkg/Source/Package/V1.pm:120 scripts/Dpkg/Source/Package/V2.pm:124
#: scripts/Dpkg/Source/Package/V2.pm:131 scripts/Dpkg/Source/Package/V2.pm:144
#: scripts/Dpkg/Source/Package/V3/bzr.pm:190
#: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2759,36 +2841,36 @@ msgstr "kan inte byta namn på \"%s\" till \"%s\""
msgid "unpacking %s"
msgstr "packar upp %s"
-#: scripts/Dpkg/Source/Package/V1.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:127
msgid "unable to keep orig directory (already exists)"
msgstr "kan inte behålla originalkatalog (finns redan)"
-#: scripts/Dpkg/Source/Package/V1.pm:129
+#: scripts/Dpkg/Source/Package/V1.pm:134
#, perl-format
msgid "failed to rename newly-extracted %s to %s"
msgstr "misslyckades att ta bort %s, som just extraherats, till %s"
-#: scripts/Dpkg/Source/Package/V1.pm:135
+#: scripts/Dpkg/Source/Package/V1.pm:140
#, perl-format
msgid "failed to rename saved %s to %s"
msgstr "misslyckades att byta namn på sparad %s till %s"
-#: scripts/Dpkg/Source/Package/V1.pm:142 scripts/Dpkg/Source/Package/V2.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:147 scripts/Dpkg/Source/Package/V2.pm:199
#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
#, perl-format
msgid "applying %s"
msgstr "tillämpar %s"
-#: scripts/Dpkg/Source/Package/V1.pm:148
+#: scripts/Dpkg/Source/Package/V1.pm:153
#, perl-format
msgid "upstream files that have been modified: %s"
msgstr "uppströmsfiler som har ändrats: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:158
+#: scripts/Dpkg/Source/Package/V1.pm:163
msgid "only supports gzip compression"
msgstr "stöder endast gzip-komprimering"
-#: scripts/Dpkg/Source/Package/V1.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:174
msgid ""
"-b takes at most a directory and an orig source argument (with v1.0 source "
"package)"
@@ -2796,22 +2878,22 @@ msgstr ""
"-b tar som mest en katalog och en originalkällkod som argument (med v1.0-"
"källkodspaket)"
-#: scripts/Dpkg/Source/Package/V1.pm:175
+#: scripts/Dpkg/Source/Package/V1.pm:180
#, perl-format
msgid "source handling style -s%s not allowed with -b"
msgstr "källkodshanteringstyp -s%s tillåts inte med -b"
-#: scripts/Dpkg/Source/Package/V1.pm:190
+#: scripts/Dpkg/Source/Package/V1.pm:195
#, perl-format
msgid "packed orig `%s' exists but is not a plain file"
msgstr "packad orig \"%s\" finns men är inte en vanlig fil"
-#: scripts/Dpkg/Source/Package/V1.pm:202
+#: scripts/Dpkg/Source/Package/V1.pm:207
#, perl-format
msgid "cannot stat orig argument %s"
msgstr "kunde inte ta status på originalargumentet %s"
-#: scripts/Dpkg/Source/Package/V1.pm:208
+#: scripts/Dpkg/Source/Package/V1.pm:213
#, perl-format
msgid ""
"orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2820,7 +2902,7 @@ msgstr ""
"originalargument har packats upp men källkodshanteringstypen -s%s ber om en "
"packad (.orig.tar.<ändelse>)"
-#: scripts/Dpkg/Source/Package/V1.pm:216
+#: scripts/Dpkg/Source/Package/V1.pm:221
#, perl-format
msgid ""
"orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2829,12 +2911,12 @@ msgstr ""
"originalargument har packats men källkodshanteringstypen -s%s ber om en "
"uppackad (orig/)"
-#: scripts/Dpkg/Source/Package/V1.pm:221
+#: scripts/Dpkg/Source/Package/V1.pm:226
#, perl-format
msgid "orig argument %s is not a plain file or directory"
msgstr "orig-parametern %s är inte en vanlig fil eller katalog"
-#: scripts/Dpkg/Source/Package/V1.pm:227
+#: scripts/Dpkg/Source/Package/V1.pm:232
#, perl-format
msgid ""
"orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -2843,35 +2925,35 @@ msgstr ""
"originalargument är tomt (betyder ingen orig, ingen diff) men "
"källkodshanteringstypen -s%s ber om något"
-#: scripts/Dpkg/Source/Package/V1.pm:240
+#: scripts/Dpkg/Source/Package/V1.pm:245
#, perl-format
msgid "unpacked orig `%s' exists but is not a directory"
msgstr "uppackad orig \"%s\" finns men är inte en katalog"
-#: scripts/Dpkg/Source/Package/V1.pm:245
+#: scripts/Dpkg/Source/Package/V1.pm:250
#, perl-format
msgid "unable to stat putative unpacked orig `%s'"
msgstr "kan inte ta status på förmodad uppackad orig \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:259
#, perl-format
msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
msgstr ""
"källkodskatalog \"%s\" är inte <källkodspaket>-<uppströmsversion> \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:268
#, perl-format
msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
msgstr ".orig-katalognamnet %s är inte <paket>-<uppströmsversion> (önskade %s)"
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:277
#, perl-format
msgid ""
".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
msgstr ""
".orig.tar-namnet %s är inte <paket>_<uppströmsversion>.orig.tar (önskade %s)"
-#: scripts/Dpkg/Source/Package/V1.pm:284
+#: scripts/Dpkg/Source/Package/V1.pm:289
#, perl-format
msgid ""
"tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -2880,18 +2962,18 @@ msgstr ""
"tarfilen \"%s\" finns redan, skriver inte över, ger upp, använd -sU eller -"
"sR för att överstyra"
-#: scripts/Dpkg/Source/Package/V1.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:293
#, perl-format
msgid "unable to check for existence of `%s'"
msgstr "kunde inte se om \"%s\" existerar"
-#: scripts/Dpkg/Source/Package/V1.pm:303 scripts/Dpkg/Source/Package/V1.pm:363
+#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V1.pm:368
#: scripts/Dpkg/Source/Package/V3/native.pm:96
#, perl-format
msgid "unable to rename `%s' (newly created) to `%s'"
msgstr "kunde inte byta namn på \"%s\" (precis skapad) till \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V1.pm:366
+#: scripts/Dpkg/Source/Package/V1.pm:311 scripts/Dpkg/Source/Package/V1.pm:371
#: scripts/Dpkg/Source/Package/V2.pm:414
#: scripts/Dpkg/Source/Package/V3/native.pm:99
#: scripts/Dpkg/Source/Package/V3/git.pm:270
@@ -2899,12 +2981,12 @@ msgstr "kunde inte byta namn på \"%s\" (precis skapad) till \"%s\""
msgid "unable to change permission of `%s'"
msgstr "kunde inte ändra beroenden på \"%s\""
-#: scripts/Dpkg/Source/Package/V1.pm:308 scripts/Dpkg/Source/Package/V2.pm:288
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V2.pm:288
#, perl-format
msgid "building %s using existing %s"
msgstr "bygger %s med befintlig %s"
-#: scripts/Dpkg/Source/Package/V1.pm:317
+#: scripts/Dpkg/Source/Package/V1.pm:322
#, perl-format
msgid ""
"orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -2913,17 +2995,17 @@ msgstr ""
"originalkatalog \"%s\" finns redan, skriver inte över, ger upp; använd -sA, -"
"sK eller -sP för att överstyra"
-#: scripts/Dpkg/Source/Package/V1.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:330
#, perl-format
msgid "unable to check for existence of orig dir `%s'"
msgstr "kan inte se om existerande originalkatalog \"%s\" finns"
-#: scripts/Dpkg/Source/Package/V1.pm:356
+#: scripts/Dpkg/Source/Package/V1.pm:361
#, perl-format
msgid "the diff modifies the following upstream files: %s"
msgstr "diffen modifierar följande uppströmsfiler: %s"
-#: scripts/Dpkg/Source/Package/V1.pm:358
+#: scripts/Dpkg/Source/Package/V1.pm:363
msgid ""
"use the '3.0 (quilt)' format to have separate and documented changes to "
"upstream files, see dpkg-source(1)"
@@ -2931,7 +3013,7 @@ msgstr ""
"använd formatet \"3.0 (quilt)\" för att ha separata och dokumenterade "
"ändringar på uppströmsfiler, se dpkg-source(1)"
-#: scripts/Dpkg/Source/Package/V1.pm:376
+#: scripts/Dpkg/Source/Package/V1.pm:381
#, perl-format
msgid "%s: unrepresentable changes to source"
msgstr "%s: ändring i källkod kan inte representeras"
@@ -3258,20 +3340,26 @@ msgstr ""
msgid "%s is not a valid version"
msgstr "%s är inte en giltig version"
-#: scripts/Dpkg/Version.pm:359
+#: scripts/Dpkg/Version.pm:360
msgid "version number cannot be empty"
msgstr "versionsnumret kan inte vara tomt"
-#: scripts/Dpkg/Version.pm:364
+#: scripts/Dpkg/Version.pm:365
#, perl-format
msgid "version number contains illegal character `%s'"
msgstr "versionsnummer innehåller ogiltigt tecken \"%s\""
-#: scripts/Dpkg/Version.pm:370
+#: scripts/Dpkg/Version.pm:371
#, perl-format
msgid "epoch part of the version number is not a number: '%s'"
msgstr "epokdelen av versionsnumret är inte ett tal: \"%s\""
+#~ msgid "%s: use %s from environment: %s\n"
+#~ msgstr "%s: använd %s från miljön: %s\n"
+
+#~ msgid "%s: set %s to default value: %s\n"
+#~ msgstr "%s: sätt %s till standardvärde: %s\n"
+
#~ msgid "source format `%s' discarded: %s"
#~ msgstr "källkodsformatet \"%s\" förkastades: %s"