Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:
	po/es.po

debian/changelog

@@ -1,7 +1,106 @@
-dpkg (1.16.8) UNRELEASED; urgency=low
+dpkg (1.16.9) unstable; urgency=low
+
+  [ Raphaël Hertzog ]
+  * Fix dpkg-source regression in "3.0 (quilt)" source packages while
+    unapplying patches that remove all files in a directory. Closes: #683547
+  * Fix segfault in field format parsing on empty strings, affecting
+    «dpkg-query -W -f ''» and «dpkg-deb -W --showformat=''». LP: #1035512
+  * Fix dpkg's French usage string which was missing the final “s“ in
+    --print-foreign-architectures. Closes: #685863
+
+  [ Guillem Jover ]
+  * Use “statoverrides” instead of “statusoverrides” in dpkg-statoverride.
+    Closes: #686995
+  * Comment out dpkg(1) documentation about disabled --command-fd option.
+    Closes: #685677
+  * Cleanup dpkg-divert unit-test environment to avoid build failures.
+    Closes: #687656
+  * Fix update-alternatives test suite to behave correctly on non-Debian
+    binary paths. Known to be affecting at least Gentoo and Mac OS X.
+  * Do not leak subcall command arguments in update-alternatives.
+  * Fix segfault on update-alternatives when passing --slave without any
+    action at all. LP: #1037431
+  * Fix memory leak in dpkg filesavespackage().
+  * Do not print garbage (or worse) on dpkg shared conffile debug output.
+  * Use a hash instead of a ref to a hash for keys() in Dpkg::BuildFlags
+    get_feature_areas(). This causes compilation failures with older perl
+    versions, which can be an issue with partial upgrades.
+  * Fix filter subpattern debug output format string to print an actual
+    value instead of just blanks.
+  * Ignore trailing filter subpattern slashes on reinclusion comparison.
+    This makes sure to reinclude directories previously excluded so that
+    contained files marked for inclusion do not fail to unpack due to a
+    missing directory. Closes: #688416
+  * Do not consider obsolete conffiles as actively owned by the package.
+    This ensures conffile entries are not misshandled nor mixed up when
+    configuring packages owning the non-obsolete conffiles. Closes: #689836
+    Based on a patch by Andreas Beckmann <debian@abeckmann.de>.
+  * Properly mark in the database obsolete conffiles on package replaces.
+  * Sync the Conffiles field values for all package instances. Because
+    only the first package instance being configured will have a *.dpkg-new
+    conffile available to be processed, the subsequent ones need to use the
+    hash from the previously processed entries.
+  * Fix logic for previously configured conffiles, so that the shared
+    conffile checks actually work on reinstallation. Closes: #684776
+  * Avoid info database corruption and bogus accesses on unknown format
+    values, by always reading the format file and validating it.
+  * Clarify that the most probable reason for multiarch database
+    inconcistencies is due to upgrades from unofficial dpkg versions.
+  * Only satisfy a dependency on a “Multi-Arch: foreign” if arch-unqualified.
+  * Take architecture into account in virtual packages on remove and
+    configure dpkg actions. Closes: #683411
+  * Update update-alternatives --query format and examples in man page to
+    match the implementation.
+  * Add two missing 3rd person ‘s’ in dpkg-gensymbols(1). Closes: #689863
+    Thanks to Paul Menzel <pm.debian@googlemail.com>.
+  * Fix regression on old-style binNMUs for packages that specify an
+    explicit binary version to dpkg-gencontrol, by always fixing up the
+    source version. Closes: #690823
+
+  [ Updated programs translations ]
+  * Catalan (Guillem Jover).
+  * Czech (Miroslav Kure).
+  * Danish (Joe Dalton). Closes: #690808
+  * French (Christian Perrier).
+  * German (Sven Joachim).
+  * Italian (Milo Casagrande).
+  * Japanese (Kenshi Muto).
+  * Polish (Michał Kułach). Closes: #690449
+  * Portuguese (Miguel Figueiredo). Closes: #682582, #690431
+  * Russian (Yuri Kozlov). Closes: #688050, #690415
+  * Slovak (Ivan Masár). Closes: #690426
+  * Swedish (Peter Krefting).
+  * Thai (Theppitak Karoonboonyanan). Closes: #690678
+  * Traditional Chinese (imacat). Closes: #687002
+
+  [ Updated scripts translations ]
+  * Polish (Michał Kułach). Closes: #683104
+  * Spanish (Omar Campagne). Closes: #685297
+
+  [ Updated dselect translations ]
+  * Basque (Iñaki Larrañaga Murgoitio). Closes: #686421
+  * Czech (Miroslav Kure).
+  * Danish (Joe Dalton). Closes: #689820
+  * Polish (Michał Kułach).
+
+  [ Updated man page translations ]
+  * French (Thomas Vincent, Sylvestre Ledru, Christian Perrier).
+    Closes: #682978, #683221
+  * German (Helge Kreutzmann).
+  * Japanese (Hideki Yamane). Closes: #685103
+  * Polish (Michał Kułach).
+  * Spanish (Omar Campagne, Guillem Jover). Closes: #683514
+  * Swedish (Peter Krefting).
+
+ -- Guillem Jover <guillem@debian.org>  Sat, 20 Oct 2012 05:59:50 +0200
+
+dpkg (1.16.8) unstable; urgency=low
 
   [ Updated programs translations ]
+  * Esperanto (Felipe Castro).
   * French (Christian Perrier).
+  * Polish (Michał Kułach). Closes: #680561
+  * Russian (Yuri Kozlov). Closes: #677850, #680411
   * Slovak (Ivan Masár).
   * Spanish (Javier Fernández-Sanguino)
 
@@ -10,8 +109,14 @@ dpkg (1.16.8) UNRELEASED; urgency=low
 
   [ Updated scripts translations ]
   * French (Christian Perrier).
+  * Russian (Yuri Kozlov).
+
+  [ Updated dselect translations ]
+  * Danish (Joe Dalton). Closes: #680108
+  * Russian (Yuri Kozlov).
+  * Traditional Chinese (Asho Yeh - 阿信).
 
- -- Raphaël Hertzog <hertzog@debian.org>  Mon, 02 Jul 2012 21:37:00 +0200
+ -- Guillem Jover <guillem@debian.org>  Sat, 21 Jul 2012 02:11:04 +0200
 
 dpkg (1.16.7) unstable; urgency=low
 

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-02-17 08:55+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"

dselect/po/ca.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 17:30+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"

dselect/po/cs.po

@@ -1,7 +1,7 @@
 # Czech translation for dpkg.
 #
 # Petr Cech <cech@debian.org>, 1999, 2000, 2001.
-# Miroslav Kure <kurem@debian.cz>, 2004, 2005, 2006, 2007, 2008, 2009.
+# Miroslav Kure <kurem@debian.cz>, 2004-2012.
 #
 # Thanks go to:
 # Milan Zamazal <pdm@debian.org>
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
-"PO-Revision-Date: 2009-09-11 20:35+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-07-15 21:27+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "Language: cs\n"
@@ -228,8 +228,6 @@ msgid "Search for a package whose name contains a string"
 msgstr "Hledání balíku, jehož jméno obsahuje daný řetězec"
 
 #: dselect/bindings.cc:162
-#, fuzzy
-#| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Zopakování posledního hledání"
 
@@ -815,15 +813,13 @@ msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' rozhraní pro správu balíků verze %s.\n"
 
 #: dselect/main.cc:161
-#, 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 ""
 "Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n"
-"v Obecné veřejné licenci GNU (GNU General Public License) verze 2 nebo\n"
-"pozdější. Toto programové vybavení je absolutně bez záruky.\n"
-"Více informací získáte použitím %s --licence.\n"
+"v GNU GPL (GNU General Public License) verze 2 nebo pozdější.\n"
+"Toto programové vybavení je absolutně bez záruky.\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
@@ -839,17 +835,7 @@ msgstr ""
 "\n"
 
 #: dselect/main.cc:185
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>     Use <directory> instead of %s.\n"
-#| "  --expert                   Turn on expert mode.\n"
-#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
-#| "<file>.\n"
-#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
-#| "+..]]\n"
-#| "                             Configure screen colours.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
@@ -863,12 +849,12 @@ msgstr ""
 "  --admindir <adresář>       Místo %s použije <adresář>.\n"
 "  --expert                   Zapne pokročilý režim.\n"
 "  --debug <soub> | -D<soub>  Zapne ladicí režim s výstupem do <soub>.\n"
-"  --colour | --color částobraz:[popředí],[pozadí][:atrib[+atrib+..]]\n"
+"  --colour | --color částobraz:[popředí],[pozadí][:atrib[+atrib+...]]\n"
 "                             Nastaví barvy.\n"
 "\n"
 
 #: dselect/main.cc:194
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
@@ -876,14 +862,12 @@ msgid ""
 msgstr ""
 "  --help                     Zobrazí tuto nápovědu.\n"
 "  --version                  Zobrazí verzi.\n"
-"  --license                  Zobrazí licenci.\n"
 "\n"
 
 #: dselect/main.cc:198
-#, fuzzy, c-format
-#| msgid "Section"
+#, c-format
 msgid "Actions:\n"
-msgstr "Sekce"
+msgstr "Akce:\n"
 
 #: dselect/main.cc:203
 #, c-format
@@ -906,20 +890,17 @@ msgid "couldn't open debug file `%.255s'\n"
 msgstr "nepodařilo se otevřít ladící soubor `%.255s'\n"
 
 #: dselect/main.cc:251
-#, fuzzy, c-format
-#| msgid "Invalid %s `%s'\n"
+#, c-format
 msgid "invalid %s '%s'"
-msgstr "Neplatné %s `%s'\n"
+msgstr "neplatné %s '%s'"
 
 #: dselect/main.cc:268
 msgid "screen part"
 msgstr "část obrazovky"
 
 #: dselect/main.cc:274
-#, fuzzy
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
-msgstr "Zadání prázdné barvy\n"
+msgstr "zadání prázdné barvy"
 
 #: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
@@ -952,7 +933,7 @@ msgstr "terminál postrádá nezbytné funkce, vzdávám to"
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr ""
+msgstr "cizí architektury jsou povoleny, ale multi-arch není podporován"
 
 #: dselect/main.cc:422
 msgid ""
@@ -1240,7 +1221,7 @@ msgstr "rozbalený (nezkonfigurovaný)"
 
 #: dselect/pkgdisplay.cc:55
 msgid "half configured (config failed)"
-msgstr ""
+msgstr "zpola nastavený (konfigurace selhala)"
 
 #: dselect/pkgdisplay.cc:56
 msgid "awaiting trigger processing"
@@ -1523,10 +1504,8 @@ msgid "Available control file information"
 msgstr "Dostupné informace ze souboru control"
 
 #: dselect/pkglist.cc:421
-#, fuzzy
-#| msgid "There are no packages."
 msgid "there are no packages"
-msgstr "Nejsou zde žádné balíky."
+msgstr "žádné balíky"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"

dselect/po/da.po

@@ -1,23 +1,22 @@
-# translation of dpkg_1.13.9_da.po to Danish
-# Danish messages for Debian dpkg
-# Copyright (C) 2005
-#
-# Claus Hindsgaul <claus_h@image.dk>, 2002, 2004, 2005, 2006.
+# Danish translation dpkg_dselect.
+# Copyright (C) 2012 dpkg_dselect & nedenstående oversættere.
+# This file is distributed under the same license as the dpkg_dselect package.
+# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2002, 2004, 2005, 2006.
 # reviewed by Ole Laursen <olau@hardworking.dk>, 2002.
-# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006.
+# Joe Hansen <joedalton2@yahoo.dk>, 2012.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg_1.10.19_da\n"
+"Project-Id-Version: dpkg_dselect_1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+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"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-10-06 02:33+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: dselect/basecmds.cc:125
@@ -117,9 +116,8 @@ msgid "failed to create query window"
 msgstr "kunne ikke oprette forespørgselsvindue"
 
 #: dselect/baselist.cc:247
-#, fuzzy
 msgid "Keybindings"
-msgstr "tastebindinger"
+msgstr "Tastebindinger"
 
 #: dselect/baselist.cc:295
 #, c-format
@@ -230,10 +228,8 @@ msgid "Search for a package whose name contains a string"
 msgstr "Søg efter en pakke, der indeholder en streng"
 
 #: dselect/bindings.cc:162
-#, fuzzy
-#| msgid "Repeat last search."
 msgid "Repeat last search"
-msgstr "Gentag sidste søgning."
+msgstr "Gentag sidste søgning"
 
 #: dselect/bindings.cc:163
 msgid "Swap sort order priority/section"
@@ -268,9 +264,8 @@ msgid "Revert to directly requested state for all packages"
 msgstr "Genskab direkte angivet status for alle pakker"
 
 #: dselect/bindings.cc:171
-#, fuzzy
 msgid "Revert to currently installed state for all packages"
-msgstr "Genskab direkte angivet status for alle pakker"
+msgstr "Genskab til aktuelt installeret tilstand for alle pakker"
 
 #: dselect/bindings.cc:174
 msgid "Select currently-highlighted access method"
@@ -285,7 +280,6 @@ msgid "Keystrokes"
 msgstr "Taster"
 
 #: dselect/helpmsgs.cc:29
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -316,23 +310,22 @@ msgid ""
 "cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
-"Bevægelsestaster: Næste/Tidligere, Top/Bund, Op/Ned, Baglæns/Forlæns:\n"
-"  Pil-ned, j            Pil-op, k               Flyt markering\n"
-"  N, PgDn, mellemrum    P, PgUp, rettetast      rul listen 1 side\n"
+"Bevægelsestaster: næste/tidligere, top/bund, op/ned, baglæns/forlæns:\n"
+"  j, Pil-ned            k, Pil-op               Flyt markering\n"
+"  N, PgDn, mellemrum    P, PgUp, slet tilbage   rul listen 1 side\n"
 "  ^n                    ^p                      rul listen 1 linje\n"
 "  t, Home               e, End                  hop til start/slutning af "
 "liste\n"
 "  u                     d                       rul info 1 side\n"
 "  ^u                    ^d                      rul info 1 linje\n"
-"  B, Pil-venstre        F, Pil-højre            panorér med 1/3 af "
-"skærmbredden\n"
+"  B, Pil-venstre        F, Pil-højre            panorér 1/3 skærmbredde\n"
 "  ^b                    ^f                      panorér med 1 tegn\n"
 "\n"
 "Markér pakker for senere behandling:\n"
 " +, Indsæt, installér el. opgradér  =, H  tilbagehold i nuværende status\n"
 " -, Slet, afinstallér               :, G  frigør, opgradér eller forbliv "
 "ikke-installeret\n"
-" _    afinstallér & udrens konfiguration\n"
+" _    afinstallér & fjern konfiguration\n"
 "                                             Forskelligt:\n"
 "Afslut, afbryd, overskriv (bemærk versaler!): ?, F1 vis hjælp (også Help)\n"
 " Retur   Bekræft, afslut (tjek afhængigheder) i, I  vis/skift info-"
@@ -342,7 +335,7 @@ msgstr ""
 "   R     Genskab status før denne liste        ^l   gentegn skærm\n"
 "   U     sæt alle til foreslået status          /   søg (Retur for at "
 "fortryde)\n"
-"   D     sæt alle til direkte ønsket status   n \\  gentag sidste søgning\n"
+"   D     sæt alle til direkte ønsket status   n, \\  gentag sidste søgning\n"
 
 #: dselect/helpmsgs.cc:55
 msgid "Introduction to package selections"
@@ -518,7 +511,6 @@ msgid "Display, part 1: package listing and status chars"
 msgstr "Visning, del 1: pakkeliste og statustegn"
 
 #: dselect/helpmsgs.cc:125
-#, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -552,7 +544,7 @@ msgid ""
 msgstr ""
 "Den øverste halvdel af skærmen viser en liste over pakkerne. For hver pakke "
 "ser\n"
-"du fire søjler for dens aktuelle status på system og mark. I detaljeret "
+"du fire søjler for dens aktuelle status på system og markering. I detaljeret "
 "visning\n"
 "(brug 'v' til at skifte detaljering) er disse enkelttegn fra venstre til "
 "højre:\n"
@@ -561,14 +553,14 @@ msgstr ""
 "nedenfor)\n"
 "              'R'  - alvorlig fejl under installation, kræver "
 "geninstallation\n"
-" Instal.status: Mellemrum - ikke installeret\n"
-"                     '*'  - installeret\n"
-"                     '-'  - ikke installeret, men konfigurationsfiler "
-"beholdt\n"
-"       pakker i    { 'U'  - udpakket, men endnu ikke konfigureret\n"
-"   disse tilstande { 'C'  - halvt konfigureret (der skete en fejl)\n"
-"      er ødelagte  { 'I'  - halvt installeret (der skete en fejl)\n"
-" Gammelt mærke: det, der planlagdes for denne pakker inden denne liste\n"
+" Instal.status:     Mellemrum   - ikke installeret\n"
+"                       '*'      - installeret\n"
+"                       '-'      - ikke installeret, men konf.filer beholdt\n"
+" pakker i disse      { 'U'      - udpakket, men endnu ikke konfigureret\n"
+" tilstande er        { 'C'      - halvt konfigureret (der skete en fejl)\n"
+" ikke (helt) korrekt { 'I'      - halvt installeret (der skete en fejl)\n"
+" installeret         { 'W', 't' - udløsere afventes\n"
+" Gammelt mærke: det, der planlagdes for denne pakke inden denne liste\n"
 " Mærke: det, er planlægges for denne pakke\n"
 "  '*': markeret for installation eller opgradering\n"
 "  '-': markeret for afinstallation, men konfigurationsfiler består\n"
@@ -684,7 +676,6 @@ msgid "Keystrokes for method selection"
 msgstr "Taster til metodevalg"
 
 #: dselect/helpmsgs.cc:196
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -708,25 +699,24 @@ msgid ""
 "  /                search (just return to cancel)\n"
 "  \\                repeat last search\n"
 msgstr ""
-"Bevægelsestaster: Næste/Tidligere, Top/Bund, Op/Ned, Baglæns/Forlæns:\n"
-"  n, Pil-ned            p, Pil-op               Flyt markering\n"
-"  N, PgDn, mellemrum    P, PgUp, rettetast      rul listen 1 side\n"
+"Bevægelsestaster: næste/tidligere, top/bund, op/ned, baglæns/forlæns:\n"
+"  j, Pil-ned            k, Pil-op               Flyt markering\n"
+"  N, PgDn, mellemrum    P, PgUp, slet tilbage   rul listen 1 side\n"
 "  ^n                    ^p                      rul listen 1 linje\n"
 "  t, Home               e, End                  hop til start/slutning af "
 "liste\n"
 "  u                     d                       rul info 1 side\n"
 "  ^u                    ^d                      rul info 1 linje\n"
-"  B, Pil-venstre        F, Pil-højre            panorér med 1/3 af "
-"skærmbredden\n"
+"  B, Pil-venstre        F, Pil-højre            panorér 1/3 skærmbredde\n"
 "  ^b                    ^f                      panorér med 1 tegn\n"
 "(Disse bevægelsestaster er identiske med dem i pakkeliste-visningen.)\n"
 "\n"
 "Afslut:\n"
-" Retur, Enter     vælg denne metode og gå til dets konfigurationsdialog\n"
+" Retur, Enter     vælg denne metode og gå til dens konfigurationsdialog\n"
 " x, X             afbryd uden at ændre installationsmetode\n"
 "\n"
 "Forskelligt:\n"
-"  ?, Hjælp, F1     vi hjælp\n"
+"  ?, Hjælp, F1     bed om hjælp\n"
 " ^l                gentegn skærm\n"
 "  /                søg (fortryd umiddelbart med retur)\n"
 "  \\                gentag sidste søgning\n"
@@ -829,18 +819,16 @@ msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian '%s' pakkehåndterings-brugerflade version %s.\n"
 
 #: dselect/main.cc:161
-#, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
-"Dette er frit programmel; se \"GNU General Public License\" version 2 eller\n"
-"senere for forhold vedrørende ophavsret. Der er INGEN garanti.\n"
-"Se %s --license for detaljer vedrørende ophavsret og licens.\n"
+"Dette er frit programmel; se \"GNU General Public License\" version 2\n"
+"eller senere for forhold vedrørende kopiering. Der er INGEN garanti.\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
-msgstr ""
+msgstr "<standardud>"
 
 #: dselect/main.cc:181
 #, c-format
@@ -851,18 +839,11 @@ msgstr ""
 "Brug: %s [<tilvalg> ...] [<handling> ...]\n"
 "\n"
 
+# jeg kan ikke overskue den med color og screepart - om screenpart,
+# foreground og baggrund kan oversættes.  Det er nok bedst at beholde
+# dem i så fald
 #: dselect/main.cc:185
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>     Use <directory> instead of %s.\n"
-#| "  --expert                   Turn on expert mode.\n"
-#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
-#| "<file>.\n"
-#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
-#| "+..]]\n"
-#| "                             Configure screen colours.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
@@ -875,28 +856,27 @@ msgstr ""
 "Tilvalg:\n"
 "  --admindir <mappe>         Benyt <mappe> i stedet for %s.\n"
 "  --expert                   Aktivér eksperttilstand.\n"
-"  --debug <fil> | -D<fil>    Aktiverer aflusning, sender uddata til <file>.\n"
+"  --debug <fil> | -D<fil>    Aktiverer fejlsøgning, sender uddata til "
+"<fil>.\n"
 "  --colour | --color skærmområde:[forgrund],[baggrund][:attr[+attr+..]]\n"
 "                             Indstil skærmfarver.\n"
 "\n"
 
 #: dselect/main.cc:194
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
 "\n"
 msgstr ""
-"  --help                     Vis denne hjælpebesked.\n"
+"  --help                     Vis denne hjælpetekst.\n"
 "  --version                  Vis versionsnummer.\n"
-"  --license | --licence      Vis licensen.\n"
 "\n"
 
 #: dselect/main.cc:198
-#, fuzzy, c-format
-#| msgid "Section"
+#, c-format
 msgid "Actions:\n"
-msgstr "Gruppe"
+msgstr "Handlinger:\n"
 
 #: dselect/main.cc:203
 #, c-format
@@ -919,20 +899,17 @@ msgid "couldn't open debug file `%.255s'\n"
 msgstr "kunne ikke åbne aflusningsfil '%.255s'\n"
 
 #: dselect/main.cc:251
-#, fuzzy, c-format
-#| msgid "Invalid %s `%s'\n"
+#, c-format
 msgid "invalid %s '%s'"
-msgstr "Ugyldig %s '%s'\n"
+msgstr "ugyldig %s '%s'"
 
 #: dselect/main.cc:268
 msgid "screen part"
 msgstr "skærmområde"
 
 #: dselect/main.cc:274
-#, fuzzy
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
-msgstr "Nulfarveangivelse\n"
+msgstr "null-farveangivelse"
 
 #: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
@@ -966,6 +943,8 @@ msgstr "teminalen mangler nødvendige funktioner. Giver op"
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
 msgstr ""
+"fremmede arkitekturer aktiveret men der er ikke understøttelse af fremmede "
+"arkitekturer"
 
 #: dselect/main.cc:422
 msgid ""
@@ -1042,9 +1021,8 @@ msgid "getch failed"
 msgstr "'getch' mislykkedes"
 
 #: dselect/methlist.cc:183
-#, fuzzy
 msgid "Explanation"
-msgstr "forklaring af"
+msgstr "Forklaring"
 
 #: dselect/methlist.cc:192
 msgid "No explanation available."
@@ -1075,9 +1053,8 @@ msgid "Press <enter> to continue.\n"
 msgstr "Tryk <retur> for at fortsætte.\n"
 
 #: dselect/method.cc:162
-#, fuzzy
 msgid "<standard error>"
-msgstr "skrivefejl på standard-fejl"
+msgstr "<standardfejl>"
 
 #: dselect/method.cc:165
 msgid "error reading acknowledgement of program failure message"
@@ -1254,15 +1231,15 @@ msgstr "udpakket (ikke sat op)"
 
 #: dselect/pkgdisplay.cc:55
 msgid "half configured (config failed)"
-msgstr ""
+msgstr "halvt konfigureret (konfiguration mislykkedes)"
 
 #: dselect/pkgdisplay.cc:56
 msgid "awaiting trigger processing"
-msgstr ""
+msgstr "venter på udløserbehandling"
 
 #: dselect/pkgdisplay.cc:57
 msgid "triggered"
-msgstr ""
+msgstr "udløst"
 
 #: dselect/pkgdisplay.cc:58
 msgid "installed"
@@ -1312,9 +1289,10 @@ msgstr "afhænger af"
 msgid "pre-depends on"
 msgstr "forhånds-afhænger af"
 
+# ('breaks' nogle andre pakker, typisk)
 #: dselect/pkgdisplay.cc:74
 msgid "breaks"
-msgstr ""
+msgstr "ødelægger"
 
 #: dselect/pkgdisplay.cc:75
 msgid "conflicts with"
@@ -1521,30 +1499,24 @@ msgstr ""
 "selv mulighed for at markere pakkerne i andre grupper."
 
 #: dselect/pkginfo.cc:93
-#, fuzzy
 msgid "Interrelationships"
-msgstr "sammenhænge"
+msgstr "Sammenhænge"
 
 #: dselect/pkginfo.cc:112
-#, fuzzy
 msgid "No description available."
-msgstr "ingen tilgængelig beskrivelse."
+msgstr "Ingen tilgængelig beskrivelse."
 
 #: dselect/pkginfo.cc:130
-#, fuzzy
 msgid "Installed control file information"
-msgstr "installeret kontrolinformation for"
+msgstr "Installeret kontrolfilinformation"
 
 #: dselect/pkginfo.cc:146
-#, fuzzy
 msgid "Available control file information"
-msgstr "tilgængelig version af kontrolinformation for fil"
+msgstr "Tilgængelig kontrolfilinformation"
 
 #: dselect/pkglist.cc:421
-#, fuzzy
-#| msgid "Installed packages"
 msgid "there are no packages"
-msgstr "Installerede pakker"
+msgstr "der er ingen pakker"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"
@@ -1639,113 +1611,3 @@ msgstr "Inst.ver"
 #: dselect/pkgtop.cc:290
 msgid "Avail.ver"
 msgstr "Tilg.ver"
-
-#~ msgid ""
-#~ "Actions:\n"
-#~ "  access update select install config remove quit\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Handlinger:\n"
-#~ "  access update select install config remove quit\n"
-#~ "\n"
-
-#~ msgid "unable to open new option file `%.250s'"
-#~ msgstr "kunne ikke åbne ny tilvalgsfil '%.250s'"
-
-#~ msgid "unable to close new option file `%.250s'"
-#~ msgstr "kunne ikke lukke ny tilvalgsfil '%.250s'"
-
-#~ msgid "unable to install new option as `%.250s'"
-#~ msgstr "kunne ikke installere ny tilvalgsfil '%.250s'"
-
-#~ msgid "returned error exit status %d.\n"
-#~ msgstr "returnerede afslutningsstatus %d.\n"
-
-#~ msgid "was interrupted.\n"
-#~ msgstr "blev afbrudt.\n"
-
-#~ msgid "was terminated by a signal: %s.\n"
-#~ msgstr "blev afsluttet af signal: %s.\n"
-
-#~ msgid "(It left a coredump.)\n"
-#~ msgstr "(Det efterlod en 'core'-fil.)\n"
-
-#~ msgid "failed with an unknown wait return code %d.\n"
-#~ msgstr "mislykkedes med en ukendt vente-returkode %d.\n"
-
-#~ msgid "unable to run %.250s process `%.250s'"
-#~ msgstr "kunne ikke køre %.250s processer '%.250s'"
-
-#~ msgid "failed config"
-#~ msgstr "mislykket konfigurering"
-
-#~ msgid "unable to wait for %.250s"
-#~ msgstr "kunne ikke vente på %.250s"
-
-#~ msgid "got wrong child's status - asked for %ld, got %ld"
-#~ msgstr "fik forkert barns status - bad om %ld, fik %ld"
-
-#~ msgid "Recommended"
-#~ msgstr "anbefalede"
-
-#~ msgid "Contrib"
-#~ msgstr "contrib"
-
-#~ msgid "Rec"
-#~ msgstr "Anb"
-
-#~ msgid "Ctb"
-#~ msgstr "Ctb"
-
-#~ msgid ""
-#~ "baselist::startdisplay() done ...\n"
-#~ "\n"
-#~ " xmax=%d, ymax=%d;\n"
-#~ "\n"
-#~ " title_height=%d, colheads_height=%d, list_height=%d;\n"
-#~ " thisstate_height=%d, info_height=%d, whatinfo_height=%d;\n"
-#~ "\n"
-#~ " colheads_row=%d, thisstate_row=%d, info_row=%d;\n"
-#~ " whatinfo_row=%d, list_row=%d;\n"
-#~ "\n"
-#~ msgstr ""
-#~ "baselist::startdisplay() done ...\n"
-#~ "\n"
-#~ " xmax=%d, ymax=%d;\n"
-#~ "\n"
-#~ " title_height=%d, colheads_height=%d, list_height=%d;\n"
-#~ " thisstate_height=%d, info_height=%d, whatinfo_height=%d;\n"
-#~ "\n"
-#~ " colheads_row=%d, thisstate_row=%d, info_row=%d;\n"
-#~ " whatinfo_row=%d, list_row=%d;\n"
-#~ "\n"
-
-#~ msgid "[none]"
-#~ msgstr "[ingen]"
-
-#~ msgid "error un-catching signal %d: %s\n"
-#~ msgstr "fejl under af-fangning af signal %d: %s\n"
-
-#~ msgid "unable to ignore signal %d before running %.250s"
-#~ msgstr "kunne ikke ignorere signal %d før kørsel af %.250s"
-
-#~ msgid "(no clientdata)"
-#~ msgstr "(ingen klientdata)"
-
-#~ msgid "<null>"
-#~ msgstr "<tom>"
-
-#~ msgid "interrelationships affecting "
-#~ msgstr "sammenhænge der berører "
-
-#~ msgid "description of "
-#~ msgstr "beskrivelse af "
-
-#~ msgid "description"
-#~ msgstr "beskrivelse"
-
-#~ msgid "currently installed control info"
-#~ msgstr "aktuelt installeret kontrolinformation"
-
-#~ msgid "available version of control info for "
-#~ msgstr "tilgængelig version af kontrolinformation for "

dselect/po/de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 09:35+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"

dselect/po/dselect.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.6-1-g3aa48\n"
+"Project-Id-Version: dpkg 1.16.9\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

dselect/po/el.po

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

dselect/po/es.po

@@ -41,8 +41,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
-"PO-Revision-Date: 2012-07-08 00:24+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-07-08 01:48+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
@@ -979,7 +979,7 @@ msgstr "no se puede abrir el fichero de depuración `%.255s'\n"
 #: dselect/main.cc:251
 #, c-format
 msgid "invalid %s '%s'"
-msgstr "%s inválido `%s'\n"
+msgstr "%s inválido `%s'"
 
 #: dselect/main.cc:268
 msgid "screen part"
@@ -1020,7 +1020,9 @@ msgstr "el terminal carece de propiedades necesarias: abandonando"
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr "se han activado arquitecturas foráneas pero no se soportan múltiples arquitecturas («multi-arch»)"
+msgstr ""
+"se han activado arquitecturas foráneas pero no se soportan múltiples "
+"arquitecturas («multi-arch»)"
 
 #: dselect/main.cc:422
 msgid ""

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"

dselect/po/eu.po

@@ -1,22 +1,23 @@
-# translation of eu.po to Euskara
-# Copyright (C) 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) YEAR Software in the Public Interest, Inc.
+# This file is distributed under the same license as the PACKAGE package.
 #
 # Jordi Blasi <valpur@euskalnet.net>, 2004.
 # Piarres Beobide <pi@beobide.net>, 2004, 2005, 2006, 2008, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: dpkg 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+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"
+"POT-Creation-Date: 2012-09-27 22:38+0200\n"
+"PO-Revision-Date: 2012-09-01 12:21+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: dselect/basecmds.cc:125
 msgid "Search for ? "
@@ -45,8 +46,8 @@ msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"Sakatu goiko zerrendako tekla bat,  <zuriunea> edo `q' laguntzatik irteteko\n"
-", edo '.' (puntua) laguntza-orriak banan-banan irakurtzeko. "
+"Sakatu goiko zerrendako tekla bat,  <zuriunea> edo 'q' laguntzatik irteteko\n"
+" edo '.' (puntua) laguntza-orriak banan-banan irakurtzeko. "
 
 #: dselect/basecmds.cc:207
 msgid "error reading keyboard in help"
@@ -58,7 +59,7 @@ msgstr "ioctl(TIOCGWINSZ): huts egin du"
 
 #: dselect/baselist.cc:60
 msgid "doupdate in SIGWINCH handler failed"
-msgstr "doupdate: huts egin du SIGWINCH maneiatzailean"
+msgstr "doupdate: huts egin du SIGWINCH kudeatzailean"
 
 #: dselect/baselist.cc:67
 msgid "failed to restore old SIGWINCH sigact"
@@ -229,10 +230,8 @@ msgid "Search for a package whose name contains a string"
 msgstr "Bilatu izenean kate bat duen pakete bat"
 
 #: dselect/bindings.cc:162
-#, fuzzy
-#| msgid "Repeat last search."
 msgid "Repeat last search"
-msgstr "Errepikatu azken bilaketa."
+msgstr "Errepikatu azken bilaketa"
 
 #: dselect/bindings.cc:163
 msgid "Swap sort order priority/section"
@@ -326,8 +325,8 @@ msgstr ""
 "                                                    karaktere bat\n"
 "\n"
 "Markatu paketeak geroago prozesatzeko:\n"
-" +, Txert  instalatu edo bertsio-berritu    =, H  hizoztu uneko egoeran\n"
-" -, Ezab   kendu                            :, G  deshizoztu: bertsio-"
+" +, Txert  instalatu edo bertsio-berritu    =, H  izoztu uneko egoeran\n"
+" -, Ezab   kendu                            :, G  desizoztu: bertsio-"
 "berritu\n"
 "                                                   edo utzi instalatu gabe\n"
 " _         kendu eta purgatu konfigurazioa\n"
@@ -383,21 +382,21 @@ msgstr ""
 "\n"
 "Instalatuta edo instalagarri dauden paketeen zerrenda azalduko zaizu.\n"
 "Zerrendan nabigatzeko, erabili kurtsore-teklak, eta markatu paketeak\n"
-"instalatzeko (`+' erabiliz) edo desinstalatzeko (`-' erabiliz).\n"
+"instalatzeko ('+' erabiliz) edo desinstalatzeko ('-' erabiliz).\n"
 "Paketeak banaka nahiz taldeka marka daitezke; hasieran ikusiko duzu \n"
-"`Pakete guztiak' lerroa hautatuta dagoela.  Nabarmendutako lerroan `+', \n"
-"`-' markatzeak, lerroko pakete guztietan izango du eragina.\n"
+"'Pakete guztiak' lerroa hautatuta dagoela.  Nabarmendutako lerroan '+', \n"
+"'-' markatzeak, lerroko pakete guztietan izango du eragina.\n"
 "\n"
 "Zure aukera batzuek gatazkak edo mendekotasun-arazoak sor ditzakete; \n"
 "pakete garrantzitsuen azpizerrenda bat emango zaizu, arazoak konpondu \n"
 "ahal izan ditzazun.\n"
 "\n"
 "Teklen zerrenda eta pantailako azalpenak irakurtzea gomendatzen zaizu.\n"
-"Linean ere badago laguntza erabilgarria zure eskura - sakatu `?' nahi\n"
+"Linean ere badago laguntza erabilgarria zure eskura - sakatu '?' nahi\n"
 "duzunean laguntza lortzeko.\n"
 "\n"
 "Paketeak hautatzen amaitutakoan, sakatu <sartu> aldaketak berresteko, \n"
-"edo `Q' aldaketak gorde gabe irteteko. Gatazken eta mendekotasunen\n"
+"edo 'Q' aldaketak gorde gabe irteteko. Gatazken eta mendekotasunen\n"
 "azken azterketa egingo da - hemen ere azpizerrenda bat ikusiko duzu.\n"
 "\n"
 "Sakatu <sartu> laguntzatik irten eta zerrendara joateko.\n"
@@ -431,14 +430,14 @@ msgstr ""
 "Instalatuta edo instalagarri dauden paketeen zerrenda aurkeztuko zaizu\n"
 "Pakete-egoerak eguneratzeko behar diren pribilegioak ez dituzunez,\n"
 "soilik irakurtzeko moduan zaude. Zerrendan nabiga dezakezu kurtsore-teklen\n"
-"bidez (ikus `Tekla-sakatzeak' laguntza-pantaila), paketeen egoera ikusi, eta "
+"bidez (ikus 'Tekla-sakatzeak' laguntza-pantaila), paketeen egoera ikusi, eta "
 "paketeei buruzko informazioa irakurri.\n"
 "\n"
 "Teklen zerrenda eta pantailako azalpenak irakurtzea gomendatzen zaizu.\n"
-"Linean ere badago laguntza erabilgarria zure eskura - sakatu `?' nahi\n"
+"Linean ere badago laguntza erabilgarria zure eskura - sakatu '?' nahi\n"
 "duzunean laguntza lortzeko.\n"
 "\n"
-"Arakatzen amaitutakoan, sakatu `Q' edo <sartu> irteteko.\n"
+"Arakatzen amaitutakoan, sakatu 'Q' edo <sartu> irteteko.\n"
 "\n"
 "Sakatu <sartu> laguntzatik irten eta zerrendara joateko.\n"
 
@@ -487,27 +486,27 @@ msgstr ""
 "pakete batzuk ezin dira beste pakete batzuekin batera instalatu.\n"
 "\n"
 "Arazoa duten paketeen azpizerrenda bat ikusiko duzu. Pantailaren beheko\n"
-"aldean gatazka eta mendekotasun nagusiak erakusten dira; erabili `i'\n"
+"aldean gatazka eta mendekotasun nagusiak erakusten dira; erabili 'i'\n"
 "hortik pakete-azalpenera eta barneko kontrolaren informazioaren aldatzeko.\n"
 "\n"
-"`Iradokitako' pakete-multzo bat kalkulatu da, eta azpizerrendako markak "
+"'Iradokitako' pakete-multzo bat kalkulatu da, eta azpizerrendako markak "
 "egokitu \n"
 "dira multzo horrekin bat etortzeko; beraz, Sartu sakatzea nahikoa izango "
 "da, \n"
 "nahi baduzu, iradokizunak onartzeko. Arazoak sortu dituzten aldaketak "
 "abortatu \n"
-"ahal izango dituzu, eta zerrenda nagusira itzuli, `X' maiuskula sakatuz.\n"
+"ahal izango dituzu, eta zerrenda nagusira itzuli, 'X' maiuskula sakatuz.\n"
 "\n"
 "Zerrendan zehar mugi zaitezke eta markak aldatu zure nahien arabera, eta\n"
-"nire iradokizunak `ezets' ditzakezu, `D' edo `R' maiuskula teklak sakatuz "
+"nire iradokizunak 'ezets' ditzakezu, 'D' edo 'R' maiuskula teklak sakatuz "
 "(ikus\n"
-"laster-teklen laguntza-pantaila). `Q' maiuskula saka dezakezu "
+"laster-teklen laguntza-pantaila). 'Q' maiuskula saka dezakezu "
 "uneanbistaratutako\n"
 "egoera onar dezadan behartzeko, iradokizun bat gainidatzi nahi baduzu, edo\n"
 "uste baduzu programa oker dabilela.\n"
 "\n"
 "Sakatu <sartu> laguntzatik irten eta azpizerrendara joateko; gogoratu: "
-"laguntza behar izanez gero, sakatu `?'.\n"
+"laguntza behar izanez gero, sakatu '?'.\n"
 
 #: dselect/helpmsgs.cc:125
 msgid "Display, part 1: package listing and status chars"
@@ -549,37 +548,32 @@ msgstr ""
 "lau\n"
 "zutabe ditu sisteman duen egoera eta marka adierazteko. Modu laburtuan "
 "(erabili\n"
-"`v' xeheki bistaratzeko) karaktere bakunak dira, ezkerretik eskuinera:\n"
+"'v' xeheki bistaratzeko) karaktere bakunak dira, ezkerretik eskuinera:\n"
 "\n"
 " Errore-bandera: Zuriunea - errorerik ez (baina hautsita egon liteke - ikus "
 "behean)\n"
-"                 `R'      - errore larria instalazioan, berriro instalatu "
+"                 'R'      - errore larria instalazioan, berriro instalatu "
 "behar da;\n"
 " Instalazio-egoera:  Zuriunea - instalatu gabe;\n"
-"                     `*'      - instalatuta;\n"
-"                     `-'      - instalatu gabe, baina konf. fitxategiak "
+"                     '*'      - instalatuta;\n"
+"                     '-'      - instalatu gabe, baina konf. fitxategiak "
 "badaude;\n"
-"   egoera hauetako { `U'  - deskonprimituta baina oraindik konfiguratu "
+"   egoera hauetako { 'U'  - deskonprimituta baina oraindik konfiguratu "
 "gabe;\n"
-"      paketeak     { `C'  - erdi-konfiguratuta (errore bat gertatu da);\n"
-"    hautsita daude { `I'  - erdi-instalatuta (errore bat gertatu da).\n"
-"   instalatutako     {`W',`t' abiarazleak  falta den erantzunaren zai "
+"      paketeak     { 'C'  - erdi-konfiguratuta (errore bat gertatu da);\n"
+"    hautsita daude { 'I'  - erdi-instalatuta (errore bat gertatu da).\n"
+"   instalatutako     {'W','t' abiarazleak  falta den erantzunaren zai "
 "daude.\n"
 " Marka zaharra: pakete honentzat eskatzen zena zerrenda hau aurkeztu "
 "aurretik;\n"
 " Marka: pakete honentzat eskatutakoa:\n"
-"  `*': instalatzeko edo bertsio-berritzeko markatua;\n"
-"  `-': kentzeko markatua, baina konf. fitxategiak utzi egingo dira;\n"
-"  `=': atxikita: paketea ez da prozesatuko;\n"
-"  `_': erabat purgatzeko markatua - konfigurazioa ere kendu;\n"
-"  `n': paketea berria da, eta markatu egin behar da instalatzeko/kentzeko "
+"  '*': instalatzeko edo bertsio-berritzeko markatua;\n"
+"  '-': kentzeko markatua, baina konf. fitxategiak utzi egingo dira;\n"
+"  '=': atxikita: paketea ez da prozesatuko;\n"
+"  '_': erabat purgatzeko markatua - konfigurazioa ere kendu;\n"
+"  'n': paketea berria da, eta markatu egin behar da instalatzeko/kentzeko "
 "etab.\n"
 "\n"
-"Pakete bakootzaren lehentasuna, atala, izena instalaturiko eta eskuragarri\n"
-"dauden bertsio zenbakiak (shift-V bistarazi/ezkutatzeko) eta laburpen bat "
-"bistaraziko\n"
-" dira ere.\n"
-"\n"
 "Pakete bakoitzaren Lehentasuna, Sekzioa, izena, eta instalatuta eta\n"
 "erabilgarri dauden bertsio-zenbakiak bistaratzen dira (maiuskula-V \n"
 "bistaratzeko/ezkutatzeko), baita laburpenaren azalpena ere.\n"
@@ -614,17 +608,17 @@ msgid ""
 "  Use the `i' key to cycle through the displays, and `I' to hide the\n"
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
-"* Nabarmentzea: Pakete-zerrendako lerro bat nabarmenduta egongo da.  `+', "
-"`-' \n"
-"  eta `_' sakatzean zein pakete sartuko d(ir)en adierazten du.\n"
+"* Nabarmentzea: Pakete-zerrendako lerro bat nabarmenduta egongo da.  '+', "
+"'-' \n"
+"  eta '_' sakatzean zein pakete sartuko d(ir)en adierazten du.\n"
 "\n"
 "* Pantaila erdibitzen duen lerroak unean nabarmendutako paketearen "
 "egoeraren\n"
 "  azalpen laburra erakusten du, edo taldearen azalpena talde-lerroa "
 "nabarmenduta\n"
 "  badago. Ikusten dituzun karaktere batzuk ulertzen ez badituzu, joan\n"
-"  pakete nagusira, eta begiratu lerro banatzailean, edo erabili `v' tekla \n"
-"  informazio xehea izateko. (sakatu `v' berriro laburtuta ikusteko).\n"
+"  pakete nagusira, eta begiratu lerro banatzailean, edo erabili 'v' tekla \n"
+"  informazio xehea izateko. (sakatu 'v' berriro laburtuta ikusteko).\n"
 "\n"
 "* Pantailaren behealdean unean nabarmendutako paketeari buruzko informazio\n"
 "  gehiago bistaratzen da (bat bakarrik badago).\n"
@@ -634,7 +628,7 @@ msgstr ""
 "  edo uneko paketeari dagozkion gatazkei eta mendekotasunei buruzko\n"
 "  informazioa (gatazka/mendekotasuna ebazteko azpizerrendetan).\n"
 "\n"
-"  Erabili `i' tekla pantailetan zehar mugitzeko, eta `I' informazioa\n"
+"  Erabili 'i' tekla pantailetan zehar mugitzeko, eta 'I' informazioa\n"
 "  ezkutatzeko edo ia pantaila osoa erabiltzeko zabaltzeko.\n"
 
 #: dselect/helpmsgs.cc:176
@@ -679,12 +673,12 @@ msgstr ""
 "bakoitzarekin\n"
 "azalpen bat bistaratuko da pantailaren beheko erdian.\n"
 "\n"
-"Ezer aldatu gabe irteteko, erabili `x' tekla instalazio-metodoen zerrendan\n"
+"Ezer aldatu gabe irteteko, erabili 'x' tekla instalazio-metodoen zerrendan\n"
 "zaudenean.\n"
 "\n"
-"Tekla-sakatzeen zerrenda osoa ikusteko, sakatu `k' orain, edo joan laguntza-"
+"Tekla-sakatzeen zerrenda osoa ikusteko, sakatu 'k' orain, edo joan laguntza-"
 "menura\n"
-" `?' sakatuta\n"
+" '?' sakatuta\n"
 
 #: dselect/helpmsgs.cc:196
 msgid "Keystrokes for method selection"
@@ -834,10 +828,9 @@ msgstr "menua"
 #: dselect/main.cc:158
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
-msgstr "Debian-en pakete kudeatzeko `%s' interfazearen %s bertsioa.\n"
+msgstr "Debian-en pakete kudeatzeko '%s' interfazearen %s bertsioa.\n"
 
 #: dselect/main.cc:161
-#, 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"
@@ -845,11 +838,10 @@ msgstr ""
 "Software hau librea da; kopiatzeko baldintzen berri izateko, ikus\n"
 "GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa.\n"
 "EZ dago bermerik.\n"
-"Ikus %s --licence xehetasun gehiago izateko.\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
-msgstr ""
+msgstr "<irteera estandarra>"
 
 #: dselect/main.cc:181
 #, c-format
@@ -861,17 +853,7 @@ msgstr ""
 "\n"
 
 #: dselect/main.cc:185
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>     Use <directory> instead of %s.\n"
-#| "  --expert                   Turn on expert mode.\n"
-#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
-#| "<file>.\n"
-#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
-#| "+..]]\n"
-#| "                             Configure screen colours.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
@@ -882,31 +864,30 @@ msgid ""
 "\n"
 msgstr ""
 "Aukerak:\n"
-"  --admindir <direktorioa>   <direktorioa> erabili %s beharrean.\n"
+"  --admindir <direktorioa>  Erabili <direktorioa> %s ordez.\n"
 "  --expert                   Modu aurreratura pasa.\n"
-"  --debug <fitx> | -D<fitx>  Arazpena gaitu irteera <fitxategia>-ra "
+"  --debug <fitx> | -D<fitx>  Arazketa gaitu irteera <fitxategia>-ra "
 "bidaliz.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"                             Pantaila koloreak konfiguratu.\n"
+"  --colour | --color pantailazatia:screenpart:[aurrekoplanoa],[atzekoplanoa]"
+"[:atrib[+atrib+..]]\n"
+"                             Konfiguratu pantailaren koloreak.\n"
 "\n"
 
 #: dselect/main.cc:194
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
 "\n"
 msgstr ""
-"  --help                     Laguntza testu hau bistarazi.\n"
-"  --version                  Bertsioa bistarazi.\n"
-"  --license                  Lizentzia bistarazi.\n"
+"  --help                     Erakutsi laguntzaren testu hau\n"
+"  --version                 Erakutsi  bertsioa.\n"
 "\n"
 
 #: dselect/main.cc:198
-#, fuzzy, c-format
-#| msgid "Section"
+#, c-format
 msgid "Actions:\n"
-msgstr "Sekzioa"
+msgstr "Ekintzak:\n"
 
 #: dselect/main.cc:203
 #, c-format
@@ -926,23 +907,20 @@ msgstr "Atributuak:\n"
 #: dselect/main.cc:231
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
-msgstr "ezin izan da `%.255s' arazketa-fitxategia ireki\n"
+msgstr "ezin izan da '%.255s' arazketa-fitxategia ireki\n"
 
 #: dselect/main.cc:251
-#, fuzzy, c-format
-#| msgid "Invalid %s `%s'\n"
+#, c-format
 msgid "invalid %s '%s'"
-msgstr "%s `%s' baliogabea\n"
+msgstr "%s '%s' baliogabea"
 
 #: dselect/main.cc:268
 msgid "screen part"
 msgstr "pantaila-zatia"
 
 #: dselect/main.cc:274
-#, fuzzy
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
-msgstr "Kolore-zehaztapen nulua\n"
+msgstr "Kolore-zehaztapen nulua"
 
 #: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
@@ -976,6 +954,7 @@ msgstr "terminalak beharrezko eginbide batzuk falta ditu, utzi egingo da"
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
 msgstr ""
+"Kanpoko arkitekturak gaituta, baina arkitektura anitza ez dago onartuta"
 
 #: dselect/main.cc:422
 msgid ""
@@ -1017,7 +996,7 @@ msgstr "getch: huts egin du menu nagusian"
 #: dselect/main.cc:539
 #, c-format
 msgid "unknown action string `%.50s'"
-msgstr "`%.50s' ekintza-kate ezezaguna"
+msgstr "'%.50s' ekintza-kate ezezaguna"
 
 #: dselect/methlist.cc:72
 msgid "dselect - list of access methods"
@@ -1026,7 +1005,7 @@ msgstr "dselect - atzipen-metodoen zerrenda"
 #: dselect/methlist.cc:81
 #, c-format
 msgid "Access method `%s'."
-msgstr "`%s' atzipen-metodoa."
+msgstr "'%s' atzipen-metodoa."
 
 #: dselect/methlist.cc:115
 msgid "Abbrev."
@@ -1085,9 +1064,8 @@ msgid "Press <enter> to continue.\n"
 msgstr "Jarraitzeko, sakatu <sartu>.\n"
 
 #: dselect/method.cc:162
-#, fuzzy
 msgid "<standard error>"
-msgstr "idazketa-errorea errore estandarrean"
+msgstr "<errore estandarra>"
 
 #: dselect/method.cc:165
 msgid "error reading acknowledgement of program failure message"
@@ -1108,32 +1086,32 @@ msgstr "kontsultaren/instalazioaren script-a"
 #: dselect/methparse.cc:53
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
-msgstr "sintaxi-errorea metodo-aukeren fitxategian: `%.250s' -- %s"
+msgstr "sintaxi-errorea metodo-aukeren fitxategian: '%.250s' -- %s"
 
 #: dselect/methparse.cc:59
 #, c-format
 msgid "error reading options file `%.250s'"
-msgstr "errorea `%.250s' aukeren fitxategia irakurtzean"
+msgstr "errorea '%.250s' aukeren fitxategia irakurtzean"
 
 #: dselect/methparse.cc:90
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
-msgstr "ezin da irakurri `%.250s' direktorioa irakurketa-metodoetan"
+msgstr "ezin da irakurri '%.250s' direktorioa irakurketa-metodoetan"
 
 #: dselect/methparse.cc:106
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
-msgstr "`%.250s' metodoak izen luzeegia dauka (%d > %d karaktere)"
+msgstr "'%.250s' metodoak izen luzeegia dauka (%d > %d karaktere)"
 
 #: dselect/methparse.cc:117
 #, c-format
 msgid "unable to access method script `%.250s'"
-msgstr "ezin da atzitu `%.250s' metodoaren script-a"
+msgstr "ezin da atzitu '%.250s' metodoaren script-a"
 
 #: dselect/methparse.cc:123
 #, c-format
 msgid "unable to read method options file `%.250s'"
-msgstr "ezin da irakurri `%.250s' metodo-aukeren fitxategia"
+msgstr "ezin da irakurri '%.250s' metodo-aukeren fitxategia"
 
 #: dselect/methparse.cc:147
 msgid "non-digit where digit wanted"
@@ -1182,37 +1160,37 @@ msgstr "EOF laburpenean - lerro-jauzia falta da"
 #: dselect/methparse.cc:190
 #, c-format
 msgid "unable to open option description file `%.250s'"
-msgstr "ezin da ireki aukeren azalpeneko `%.250s' fitxategia"
+msgstr "ezin da ireki aukeren azalpeneko '%.250s' fitxategia"
 
 #: dselect/methparse.cc:194
 #, c-format
 msgid "unable to stat option description file `%.250s'"
-msgstr "ezin da atzitu aukeren azalpeneko `%.250s' fitxategia"
+msgstr "ezin da atzitu aukeren azalpeneko '%.250s' fitxategia"
 
 #: dselect/methparse.cc:198
 #, c-format
 msgid "failed to read option description file `%.250s'"
-msgstr "ezin da irakurri aukeren azalpeneko `%.250s' fitxategia"
+msgstr "ezin da irakurri aukeren azalpeneko '%.250s' fitxategia"
 
 #: dselect/methparse.cc:201
 #, c-format
 msgid "error during read of option description file `%.250s'"
-msgstr "errorea aukeren azalpeneko `%.250s' fitxategia irakurtzean"
+msgstr "errorea aukeren azalpeneko '%.250s' fitxategia irakurtzean"
 
 #: dselect/methparse.cc:224
 #, c-format
 msgid "error during read of method options file `%.250s'"
-msgstr "errorea metodo-aukeren `%.250s' fitxategia irakurtzean"
+msgstr "errorea metodo-aukeren '%.250s' fitxategia irakurtzean"
 
 #: dselect/methparse.cc:247
 #, c-format
 msgid "unable to open current option file `%.250s'"
-msgstr "ezin da ireki aukeren azalpeneko `%.250s' fitxategia"
+msgstr "ezin da ireki aukeren azalpeneko '%.250s' fitxategia"
 
 #: dselect/methparse.cc:283
 #, c-format
 msgid "unable to write new option to `%.250s'"
-msgstr "ezin da idatzi aukera berria: `%.250s'"
+msgstr "ezin da idatzi aukera berria: '%.250s'"
 
 #: dselect/pkgdisplay.cc:36
 msgid "new package"
@@ -1248,7 +1226,7 @@ msgstr "BERRINSTALATU"
 
 #: dselect/pkgdisplay.cc:51
 msgid "not installed"
-msgstr "instalatu gabe"
+msgstr "ez dago instalatuta"
 
 #: dselect/pkgdisplay.cc:52
 msgid "removed (configs remain)"
@@ -1264,7 +1242,7 @@ msgstr "deskonprimituta (konfiguratu gabe)"
 
 #: dselect/pkgdisplay.cc:55
 msgid "half configured (config failed)"
-msgstr ""
+msgstr "erdi-konfiguratuta (konfigurazioak huts eginda)"
 
 #: dselect/pkgdisplay.cc:56
 msgid "awaiting trigger processing"
@@ -1272,7 +1250,7 @@ msgstr "abiarazle prozesatzea itxoiten"
 
 #: dselect/pkgdisplay.cc:57
 msgid "triggered"
-msgstr "abiarazia"
+msgstr "abiarazita"
 
 #: dselect/pkgdisplay.cc:58
 msgid "installed"
@@ -1527,7 +1505,7 @@ msgstr ""
 "\n"
 "Nabarmentzea pakete jakin bateko lerro batera eramaten baduzu, pakete horri "
 "buruzko informazioa hemen bistaratuko da.\n"
-"Erabili `o' eta `O' ordena aldatzeko eta aukera izateko talde-mota "
+"Erabili 'o' eta 'O' ordena aldatzeko eta aukera izateko talde-mota "
 "desberdinetako paketeak markatzeko."
 
 #: dselect/pkginfo.cc:93
@@ -1547,10 +1525,8 @@ msgid "Available control file information"
 msgstr "Kontrol fitxategiaren informazio erabilgarria"
 
 #: dselect/pkglist.cc:421
-#, fuzzy
-#| msgid "Installed packages"
 msgid "there are no packages"
-msgstr "Instalatutako paketeak"
+msgstr "ez dago paketerik"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"
@@ -1656,13 +1632,13 @@ msgstr "Berts. erabilg."
 #~ "\n"
 
 #~ msgid "unable to open new option file `%.250s'"
-#~ msgstr "ezin da ireki `%.250s' aukera-fitxategi berria"
+#~ msgstr "ezin da ireki '%.250s' aukera-fitxategi berria"
 
 #~ msgid "unable to close new option file `%.250s'"
-#~ msgstr "ezin da itxi `%.250s' aukera-fitxategi berria"
+#~ msgstr "ezin da itxi '%.250s' aukera-fitxategi berria"
 
 #~ msgid "unable to install new option as `%.250s'"
-#~ msgstr "ezin da instalatu aukera berria `%.250s' gisa"
+#~ msgstr "ezin da instalatu aukera berria '%.250s' gisa"
 
 #~ msgid "returned error exit status %d.\n"
 #~ msgstr "irteeran %d errore-kodea eman du.\n"
@@ -1680,7 +1656,7 @@ msgstr "Berts. erabilg."
 #~ msgstr "huts egin du %d emaitza-kode ezezagunarekin.\n"
 
 #~ msgid "unable to run %.250s process `%.250s'"
-#~ msgstr "ezin da exekutatu %.250s prozesua `%.250s'"
+#~ msgstr "ezin da exekutatu %.250s prozesua '%.250s'"
 
 #~ msgid "failed config"
 #~ msgstr "huts egin du konfiguratzean"

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 08:30+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -273,7 +273,6 @@ msgid "Search for a package whose name contains a string"
 msgstr "Rechercher un paquet dont le nom contient une chaîne particulière"
 
 #: dselect/bindings.cc:162
-#| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Répéter la dernière recherche"
 
@@ -919,16 +918,6 @@ msgstr ""
 
 #: dselect/main.cc:185
 #, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>     Use <directory> instead of %s.\n"
-#| "  --expert                   Turn on expert mode.\n"
-#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
-#| "<file>.\n"
-#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
-#| "+..]]\n"
-#| "                             Configure screen colours.\n"
-#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
@@ -962,7 +951,6 @@ msgstr ""
 
 #: dselect/main.cc:198
 #, c-format
-#| msgid "Section"
 msgid "Actions:\n"
 msgstr "Actions :\n"
 
@@ -988,7 +976,6 @@ msgstr "impossible d'ouvrir le fichier de débogage « %.255s »\n"
 
 #: dselect/main.cc:251
 #, c-format
-#| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Non valable %s « %s »"
 
@@ -997,7 +984,6 @@ msgid "screen part"
 msgstr "Partie de l'écran"
 
 #: dselect/main.cc:274
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Spécification de couleur nulle"
 
@@ -1619,7 +1605,6 @@ msgid "Available control file information"
 msgstr "Informations disponibles du fichier de contrôle"
 
 #: dselect/pkglist.cc:421
-#| msgid "There are no packages."
 msgid "there are no packages"
 msgstr "Il n'existe pas de paquets"
 

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2008-12-27 15:56+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"

dselect/po/hu.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"

dselect/po/id.po

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

dselect/po/it.po

@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2006-10-06 22:01+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"

dselect/po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 23:43+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -330,14 +330,17 @@ msgstr ""
 "  ^b                    ^f                      1 文字だけ水平移動\n"
 "\n"
 "後で処理するためにパッケージにマークを付ける:\n"
-" +, Insert  インストールまたはアップグレード   =, H  現在の状態を維持 (hold)\n"
-" -, Delete  削除                             :, G  維持 (hold) 解除: アップグレードまたはインストールしない\n"
+" +, Insert  インストールまたはアップグレード   =, H  現在の状態を維持 "
+"(hold)\n"
+" -, Delete  削除                             :, G  維持 (hold) 解除: アップグ"
+"レードまたはインストールしない\n"
 " _          (設定ファイルも含め) 完全削除\n"
 "                                             その他:\n"
 "終了、中止、上書き (大文字に注意!):      ?, F1 ヘルプ (または Help)\n"
 " Return  確認後、終了 (依存関係を照合)   i, I  情報画面の切り替え\n"
 "   Q     確認後、終了 (依存関係を無視)   o, O  ソートオプションの切り替え\n"
-" X, Esc  中止 (eXit)。変更は破棄する     v, V  ステータス画面オプションの変更\n"
+" X, Esc  中止 (eXit)。変更は破棄する     v, V  ステータス画面オプションの変"
+"更\n"
 "   R     前のリスト状態に戻す            ^l    画面の再描画\n"
 "   U     提案された状態にすべて従う      /     検索 (リターンでキャンセル)\n"
 "   D     直接要求された状態にすべて従う  n, \\  検索次候補\n"
@@ -547,8 +550,10 @@ msgstr ""
 "1文字でステータスが表されており、左から次のような意味を持ちます\n"
 "(詳細表示は `v' でトグルできます):\n"
 "\n"
-" エラーフラグ: 空欄 - エラーなし (しかし、パッケージが壊れた状態の場合あり - 下記参照)\n"
-"              `R'   - インストール中に重大なエラー発生、再インストールが必要\n"
+" エラーフラグ: 空欄 - エラーなし (しかし、パッケージが壊れた状態の場合あり - "
+"下記参照)\n"
+"              `R'   - インストール中に重大なエラー発生、再インストールが必"
+"要\n"
 " インストール状態:  空欄  - 未インストール\n"
 "                     `*'  - インストール済み\n"
 "                     `-'  - 未インストール (設定ファイルが残存)\n"
@@ -818,7 +823,8 @@ 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 ""
-"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書バージョン\n"
+"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書バージョ"
+"ン\n"
 "2 もしくはそれ以降を参照してください。このソフトウェアは無保証です。\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
@@ -846,7 +852,8 @@ msgstr ""
 "オプション:\n"
 "  --admindir <ディレクトリ>  %s の代わりに <ディレクトリ> を使う\n"
 "  --expert                   上級者モードに切り替える\n"
-"  --debug <ファイル> | -D<ファイル>  デバッグモードに切り替え、出力を<ファイル>に送る\n"
+"  --debug <ファイル> | -D<ファイル>  デバッグモードに切り替え、出力を<ファイ"
+"ル>に送る\n"
 "  --colour | --color 画面:[前景],[背景][:属性[+属性+...]]\n"
 "                             画面の色を設定する\n"
 "\n"
@@ -931,7 +938,8 @@ msgstr "必要とする機能がこの端末にはありません。終了しま
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr "他アーキテクチャが有効ですが、マルチアーキテクチャはサポートされていません"
+msgstr ""
+"他アーキテクチャが有効ですが、マルチアーキテクチャはサポートされていません"
 
 #: dselect/main.cc:422
 msgid ""

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2007-09-16 22:55-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"

dselect/po/nb.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2010-09-02 23:01+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"

dselect/po/nl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg/deselect 1.16.1.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2011-12-12 11:55+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"

dselect/po/nn.po

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

dselect/po/pl.po

@@ -1,19 +1,20 @@
 # Polish translation of dselect
 # Copyright (C) 1999 Software in the Public Interest, Inc.
-# Piotr Roszatycki <dexter@debian.org>, 1999.
-# Bartosz Feński <fenio@debian.org>, 2004-2005
-# Robert Luberda <robert@debian.org>, 2006-2008
-# Wiktor Wandachowicz <siryes@gmail.com>, 2008-2009
 #
 # Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych:
 # http://wiki.debian.org/PolishL10N/PackageInstallers
+# Piotr Roszatycki <dexter@debian.org>, 1999.
+# Bartosz Feński <fenio@debian.org>, 2004-2005.
+# Robert Luberda <robert@debian.org>, 2006-2008.
+# Wiktor Wandachowicz <siryes@gmail.com>, 2008-2009.
+# Michał Kułach <michal.kulach@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
-"PO-Revision-Date: 2009-09-27 02:41+0100\n"
-"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-07-28 20:33+0200\n"
+"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.4\n"
 
 #: dselect/basecmds.cc:125
 msgid "Search for ? "
@@ -233,10 +235,8 @@ msgid "Search for a package whose name contains a string"
 msgstr "Wyszukiwanie pakietu o nazwie zawierającej ciąg znaków"
 
 #: dselect/bindings.cc:162
-#, fuzzy
-#| msgid "Repeat last search."
 msgid "Repeat last search"
-msgstr "Powtórzenie ostatniego wyszukiwania."
+msgstr "Powtórzenie ostatniego wyszukiwania"
 
 #: dselect/bindings.cc:163
 msgid "Swap sort order priority/section"
@@ -836,16 +836,13 @@ msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian \"%s\", nakładka na program zarządzania pakietami, wersja %s.\n"
 
 #: dselect/main.cc:161
-#, 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 ""
 "Niniejszy program jest wolnym oprogramowaniem, proszę sprawdzić\n"
 "Powszechną Licencję Publiczną GNU w wersji drugiej lub późniejszej,\n"
-"by dowiedzieć się o warunkach rozpowszechniania.\n"
-"Brak JAKIEJKOLWIEK gwarancji.\n"
-"Więcej szczegółów w %s --license.\n"
+"by dowiedzieć się o warunkach rozpowszechniania. BRAK gwarancji.\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
@@ -861,17 +858,7 @@ msgstr ""
 "\n"
 
 #: dselect/main.cc:185
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>     Use <directory> instead of %s.\n"
-#| "  --expert                   Turn on expert mode.\n"
-#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
-#| "<file>.\n"
-#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
-#| "+..]]\n"
-#| "                             Configure screen colours.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
@@ -885,12 +872,13 @@ msgstr ""
 "  --admindir <katalog>       Używa <katalogu> zamiast %s.\n"
 "  --expert                   Włącza tryb eksperta.\n"
 "  --debug <plik> | -D<plik>  Włącza debugowanie, wysyła wyjście do <pliku>.\n"
-"  --colour | --color część_widoku:[kolor_tekstu],[kolor_tła][:atr[+atr+..]]\n"
+"  --colour | --color część_widoku:[kolor_tekstu],[kolor_tła][:atr[+atr"
+"+...]]\n"
 "                             Konfiguruje kolory ekranu.\n"
 "\n"
 
 #: dselect/main.cc:194
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
@@ -898,14 +886,12 @@ msgid ""
 msgstr ""
 "  --help                     Wyświetla ten komunikat pomocy.\n"
 "  --version                  Wyświetla informacje o wersji.\n"
-"  --license                  Wyświetla informacje o licencji.\n"
 "\n"
 
 #: dselect/main.cc:198
-#, fuzzy, c-format
-#| msgid "Section"
+#, c-format
 msgid "Actions:\n"
-msgstr "Sekcja"
+msgstr "Działania:\n"
 
 #: dselect/main.cc:203
 #, c-format
@@ -928,20 +914,17 @@ msgid "couldn't open debug file `%.255s'\n"
 msgstr "nie można otworzyć pliku debuggera \"%.255s\"\n"
 
 #: dselect/main.cc:251
-#, fuzzy, c-format
-#| msgid "Invalid %s `%s'\n"
+#, c-format
 msgid "invalid %s '%s'"
-msgstr "Nieprawidłowy %s \"%s\"\n"
+msgstr "nieprawidłowe %s \"%s\""
 
 #: dselect/main.cc:268
 msgid "screen part"
 msgstr "część widoku"
 
 #: dselect/main.cc:274
-#, fuzzy
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
-msgstr "Pusta specyfikacja koloru\n"
+msgstr "pusta specyfikacja koloru"
 
 #: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
@@ -975,6 +958,7 @@ msgstr "brak potrzebnych funkcji terminala, przerywanie"
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
 msgstr ""
+"obce architektury są włączone, lecz nie skonfigurowano wieloarchitekturowości"
 
 #: dselect/main.cc:422
 msgid ""
@@ -1257,11 +1241,11 @@ msgstr "wpół zainstalowany"
 
 #: dselect/pkgdisplay.cc:54
 msgid "unpacked (not set up)"
-msgstr "rozpakowany (nie skonfigurowany)"
+msgstr "rozpakowany (nieskonfigurowany)"
 
 #: dselect/pkgdisplay.cc:55
 msgid "half configured (config failed)"
-msgstr ""
+msgstr "częściowo skonfigurowane (zawiodło konfigurowanie)"
 
 #: dselect/pkgdisplay.cc:56
 msgid "awaiting trigger processing"
@@ -1544,10 +1528,8 @@ msgid "Available control file information"
 msgstr "Informacje o dostępnej wersji pakietu"
 
 #: dselect/pkglist.cc:421
-#, fuzzy
-#| msgid "There are no packages."
 msgid "there are no packages"
-msgstr "Nie ma żadnych pakietów."
+msgstr "nie ma żadnych pakietów"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2008-12-27 16:05+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"

dselect/po/pt_BR.po

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

dselect/po/ro.po

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

dselect/po/ru.po

@@ -4,20 +4,20 @@
 #
 # Michael Sobolev <mss@transas.com>, 1999.
 # Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006, 2007, 2008.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.7.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
-"PO-Revision-Date: 2010-04-25 22:37+0400\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-07-07 08:36+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
 "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"
 
@@ -48,8 +48,8 @@ msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"Нажмите одну из вышеперечисленных клавиш, <space> или `q' для выхода\n"
-"или `.' (точка) для последовательного просмотра страниц. "
+"Нажмите одну из вышеперечисленных клавиш, <space> или «q» для выхода\n"
+"или «.» (точка) для последовательного просмотра страниц. "
 
 #: dselect/basecmds.cc:207
 msgid "error reading keyboard in help"
@@ -233,10 +233,8 @@ msgid "Search for a package whose name contains a string"
 msgstr "Найти пакет, имя которого содержит строку"
 
 #: dselect/bindings.cc:162
-#, fuzzy
-#| msgid "Repeat last search."
 msgid "Repeat last search"
-msgstr "Повторить последний поиск."
+msgstr "Повторить последний поиск"
 
 #: dselect/bindings.cc:163
 msgid "Swap sort order priority/section"
@@ -393,10 +391,10 @@ msgstr ""
 "\n"
 "Вы увидите список пакетов, которые установлены или доступны для установки.\n"
 "Вы можете передвигаться по списку, используя клавиши управления курсором,\n"
-"отмечать пакеты для установки (используя клавишу `+') или удаления\n"
-"(соответственно, `-').\n"
+"отмечать пакеты для установки (используя клавишу «+») или удаления\n"
+"(соответственно, «-»).\n"
 "Пакеты могут помечаться как по отдельности, так и группами. В начале вы\n"
-"увидите, что выделена строка `Все пакеты'. Клавиши `+', `-' и т.д. будут\n"
+"увидите, что выделена строка «Все пакеты». Клавиши «+», «-» и т.д. будут\n"
 "влиять на все пакеты, описанные выделенной строкой.\n"
 "\n"
 "Некоторые ваши решения вызовут конфликты или проблемы зависимостей. В этом\n"
@@ -404,10 +402,10 @@ msgstr ""
 "проблему.\n"
 "\n"
 "Вам следует прочесть список клавиш и пояснения к экранам. Справка доступна\n"
-"в любой момент -- просто нажмите клавишу `?'.\n"
+"в любой момент — просто нажмите клавишу «?».\n"
 "\n"
 "Когда вы закончите выбор пакетов, нажмите <enter>, чтобы подтвердить\n"
-"изменения или клавишу `X', чтобы выйти, не сохраняя ваш выбор. Если "
+"изменения или клавишу «X», чтобы выйти, не сохраняя ваш выбор. Если "
 "изменения\n"
 "подтверждены, производится окончательная проверка конфликтов и "
 "зависимостей.\n"
@@ -444,13 +442,13 @@ msgstr ""
 "Вы увидите список пакетов, которые установлены или доступны для установки.\n"
 "Поскольку у вас нет прав на изменение состояния пактов, вы находитесь в\n"
 "режиме чтения. Вы можете передвигаться по списку, используя клавиши\n"
-"управления курсором (см. экран справки `Горячие клавиши'), видеть состояние\n"
+"управления курсором (см. экран справки «Горячие клавиши»), видеть состояние\n"
 "пакетов и читать касающуюся их информацию.\n"
 "\n"
 "Вам следует прочесть список клавиш и пояснения к экранам. Справка доступна\n"
-"в любой момент -- просто нажмите клавишу `?'.\n"
+"в любой момент — просто нажмите клавишу «?».\n"
 "\n"
-"Когда вы закончите просмотр, нажмите клавишу <enter> или `Q', чтобы\n"
+"Когда вы закончите просмотр, нажмите клавишу <enter> или «Q», чтобы\n"
 "выйти из списка пакетов.\n"
 "\n"
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>.\n"
@@ -495,37 +493,37 @@ msgid ""
 "Press <space> to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
 msgstr ""
-"Разрешение зависимостей и конфликтов -- введение.\n"
+"Разрешение зависимостей и конфликтов — введение.\n"
 "\n"
-"Ваш выбор может вызвать конфликт или проблему зависимостей -- некоторые\n"
+"Ваш выбор может вызвать конфликт или проблему зависимостей — некоторые\n"
 "пакеты могут устанавливаться только вместе с некоторыми другими, а\n"
 "некоторые комбинации пакетов не могут быть установлены совместно.\n"
 "\n"
 "В этом случае вы увидите дополнительный список, содержащий затронутые\n"
 "пакеты. Нижняя половина списка показывает относящиеся к пакету конфликты\n"
-"и зависимости. Клавиша `i' может переключить это окно также в режим\n"
+"и зависимости. Клавиша «i» может переключить это окно также в режим\n"
 "отображения описаний пакетов и внутренней управляющей информации.\n"
 "\n"
-"Программа вычисляет множество `предлагаемых' пакетов и первоначально "
+"Программа вычисляет множество «предлагаемых» пакетов и первоначально "
 "пометки\n"
 "в этом дополнительном списке будут соответствовать именно этому варианту.\n"
 "Таким образом, вы можете просто нажать клавишу Return, приняв предложенный\n"
 "вариант. Можно также отказаться от изменений, вызвавших проблемы, и "
 "вернуться\n"
-"в основной список, введя заглавную `X'.\n"
+"в основной список, введя заглавную «X».\n"
 "\n"
 "Наконец, можно пройти по списку и изменить отметки так, как вам больше\n"
 "нравится. При этом можно отвергнуть предложенные программой изменения, "
 "введя\n"
-"заглавную `D' или `R' (см. экран справки `Горячие клавиши'). Если вас не "
+"заглавную «D» или «R» (см. экран справки «Горячие клавиши»). Если вас не "
 "устраивают\n"
 "предложенные изменения, или если вы думаете, что программа ошибается, можно\n"
-"использовать заглавную `Q', чтобы потребовать принять текущий выбор, "
+"использовать заглавную «Q», чтобы потребовать принять текущий выбор, "
 "несмотря\n"
 "на проблемы зависимостей.\n"
 "\n"
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>. Помните, "
-"что для вызова справки достаточно нажать клавишу `?'.\n"
+"что для вызова справки достаточно нажать клавишу «?».\n"
 
 #: dselect/helpmsgs.cc:125
 msgid "Display, part 1: package listing and status chars"
@@ -569,17 +567,17 @@ msgstr ""
 "переключает между кратким и подробным режимами) это одиночные символы,\n"
 "обозначающие (слева направо):\n"
 "\n"
-" Флаг ошибки: Пробел -- нет ошибки (но пакет может быть неработоспособен, см."
+" Флаг ошибки: Пробел — нет ошибки (но пакет может быть неработоспособен, см."
 "ниже)\n"
-"              R      -- серьёзная ошибка при установке, требуется "
+"              R      — серьёзная ошибка при установке, требуется "
 "переустановка.\n"
-" Флаг установки:  Пробел -- не установлен\n"
-"                      *  -- установлен\n"
-"                      -  -- не установлен, но остались файлы конфигурации\n"
-"    пакеты в этих  {  U  -- распакован, но не настроен\n"
-"     состояниях    {  C  -- наполовину настроен (произошла ошибка)\n"
-"  не установлены   {  I  -- наполовину установлен (произошла ошибка)\n"
-"     правильно     { W, t -- отмечен как ждущий рассмотрения\n"
+" Флаг установки:  Пробел — не установлен\n"
+"                      *  — установлен\n"
+"                      -  — не установлен, но остались файлы конфигурации\n"
+"    пакеты в этих  {  U  — распакован, но не настроен\n"
+"     состояниях    {  C  — наполовину настроен (произошла ошибка)\n"
+"  не установлены   {  I  — наполовину установлен (произошла ошибка)\n"
+"     правильно     { W, t — отмечен как ждущий рассмотрения\n"
 "\n"
 " Старая пометка: состояние, затребованное до входа в этот список\n"
 " Пометка: какое состояние затребовано для пакета:\n"
@@ -587,7 +585,7 @@ msgstr ""
 "   - : помечен для удаления, но файлы конфигурации должны остаться\n"
 "   = : зафиксирован: пакет не будет обрабатываться\n"
 "   _ : помечен для полной вычистки: удаляются также файлы конфигурации\n"
-"   n : это новый пакет и ещё не помечен для установки/удаления и тд\n"
+"   n : это новый пакет и ещё не помечен для установки/удаления и т. д.\n"
 "\n"
 "Также показаны приоритет, раздел, имя каждого пакета, номера установленной\n"
 "и доступной версий (shift-V переключает режим отображения) и краткое\n"
@@ -624,14 +622,15 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 "* Выделение: одна строка списка пакетов будет выделена. Она показывает,\n"
-"  к какому(им) пакету(ам) будет относится нажатие клавиш +, - или _.\n"
+"  к какому(им) пакету(ам) будет относится нажатие клавиш «+»,« »- или «_».\n"
 "\n"
 "* Разделительная линия в середине экрана отображает краткое описание\n"
 "  состояния выделенного пакета или описание выделенной группы. Если вы\n"
 "  не понимаете значение символов, отображающих состояние, перейдите\n"
 "  к соответствующему пакету и посмотрите на разделительную линию, или\n"
-"  с помощью клавиши v переключите программу в режим подробного отображения\n"
-"  (следующее нажатие клавиши v вернёт экран в краткий режим).\n"
+"  с помощью клавиши «v» переключите программу в режим подробного "
+"отображения\n"
+"  (следующее нажатие клавиши «v» вернёт экран в краткий режим).\n"
 "\n"
 "* Нижняя часть экрана показывает более подробную информацию о выделенном\n"
 "  пакете (если выделен только один пакет).\n"
@@ -641,8 +640,9 @@ msgstr ""
 "  информация о конфликтах и зависимостях, затрагивающих данный пакет\n"
 "  (в дополнительных списках разрешения конфликтов и зависимостей).\n"
 "\n"
-"  Клавиша i циклически переключает режимы отображения в этой части экрана,\n"
-"  а клавиша I скрывает её или расширяет почти до размеров экрана.\n"
+"  Клавиша «i» циклически переключает режимы отображения в этой части "
+"экрана,\n"
+"  а клавиша «I» скрывает её или расширяет почти до размеров экрана.\n"
 
 #: dselect/helpmsgs.cc:176
 msgid "Introduction to method selection display"
@@ -683,11 +683,11 @@ msgstr ""
 "При перемещении выделения в нижней части экрана появляется описание\n"
 "каждого метода, для которого оно доступно.\n"
 "\n"
-"Если вы хотите выйти, ничего не меняя, нажмите клавишу x, когда программа\n"
+"Если вы хотите выйти, ничего не меняя, нажмите клавишу «x», когда программа\n"
 "находится в списке методов установки.\n"
 "\n"
-"Полный список горячих клавиш можно получить, нажав клавишу k или войдя\n"
-"в общую справку, нажав клавишу ?.\n"
+"Полный список горячих клавиш можно получить, нажав клавишу «k» или войдя\n"
+"в общую справку, нажав клавишу «?».\n"
 
 #: dselect/helpmsgs.cc:196
 msgid "Keystrokes for method selection"
@@ -841,7 +841,7 @@ msgstr "меню"
 #: dselect/main.cc:158
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
-msgstr "Интерфейс управления пакетами Debian `%s', версия %s.\n"
+msgstr "Интерфейс управления пакетами Debian «%s», версия %s.\n"
 
 #: dselect/main.cc:161
 msgid ""
@@ -862,21 +862,11 @@ msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
-"Использование: %s [<параметр> ...] [<действие> ...]\n"
+"Использование: %s [<параметр> …] [<действие> …]\n"
 "\n"
 
 #: dselect/main.cc:185
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>     Use <directory> instead of %s.\n"
-#| "  --expert                   Turn on expert mode.\n"
-#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
-#| "<file>.\n"
-#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
-#| "+..]]\n"
-#| "                             Configure screen colours.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
@@ -891,7 +881,7 @@ msgstr ""
 "  --expert                   Включить экспертный режим.\n"
 "  --debug <файл> | -D<файл>  Включить отладку, посылать все сообщения в "
 "<файл>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
+"  --colour | --color screenpart:[foreground],[background][:attr[+attr+…]]\n"
 "                             Настроить цвета экрана.\n"
 "\n"
 
@@ -907,10 +897,9 @@ msgstr ""
 "\n"
 
 #: dselect/main.cc:198
-#, fuzzy, c-format
-#| msgid "Section"
+#, c-format
 msgid "Actions:\n"
-msgstr "Раздел"
+msgstr "Действия:\n"
 
 #: dselect/main.cc:203
 #, c-format
@@ -930,23 +919,20 @@ msgstr "Атрибуты:\n"
 #: dselect/main.cc:231
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
-msgstr "не удалось открыть отладочный файл `%.255s'\n"
+msgstr "не удалось открыть отладочный файл «%.255s»\n"
 
 #: dselect/main.cc:251
-#, fuzzy, c-format
-#| msgid "Invalid %s `%s'\n"
+#, c-format
 msgid "invalid %s '%s'"
-msgstr "Некорректный %s `%s'\n"
+msgstr "некорректный %s «%s»"
 
 #: dselect/main.cc:268
 msgid "screen part"
 msgstr "сектор экрана"
 
 #: dselect/main.cc:274
-#, fuzzy
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
-msgstr "Задающие цвет значения пусты\n"
+msgstr "задающие цвет значения пусты"
 
 #: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
@@ -979,7 +965,7 @@ msgstr "у терминала отсутствуют необходимые во
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr ""
+msgstr "включены неродные архитектуры, но multi-arch не поддерживается"
 
 #: dselect/main.cc:422
 msgid ""
@@ -993,7 +979,7 @@ msgstr ""
 "\n"
 "Используйте комбинации клавиш ^P и ^N, стрелки, первые буквы команд или "
 "цифры;\n"
-"Нажмите ввод для выбора действия.  ^L -- перерисовать экран.\n"
+"Нажмите <ввод> для выбора действия.  ^L — перерисовать экран.\n"
 "\n"
 
 #: dselect/main.cc:427
@@ -1021,16 +1007,16 @@ msgstr "ожидание нажатия клавиши в главном мен
 #: dselect/main.cc:539
 #, c-format
 msgid "unknown action string `%.50s'"
-msgstr "неизвестное действие `%.50s'"
+msgstr "неизвестное действие «%.50s»"
 
 #: dselect/methlist.cc:72
 msgid "dselect - list of access methods"
-msgstr "dselect -- список методов доступа"
+msgstr "dselect — список методов доступа"
 
 #: dselect/methlist.cc:81
 #, c-format
 msgid "Access method `%s'."
-msgstr "Метод доступа `%s'."
+msgstr "Метод доступа «%s»."
 
 #: dselect/methlist.cc:115
 msgid "Abbrev."
@@ -1111,33 +1097,32 @@ msgstr "скрипт настройки"
 #: dselect/methparse.cc:53
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
-msgstr "синтаксическая ошибка в файле списка методов %.250s: %s"
+msgstr "синтаксическая ошибка в файле списка методов «%.250s»: %s"
 
 #: dselect/methparse.cc:59
 #, c-format
 msgid "error reading options file `%.250s'"
-msgstr "ошибка чтения списка методов %.250s"
+msgstr "ошибка чтения списка методов «%.250s»"
 
 #: dselect/methparse.cc:90
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
-msgstr "не удалось прочитать список методов доступа из каталога %.250s"
+msgstr "не удалось прочитать список методов доступа из каталога «%.250s»"
 
 #: dselect/methparse.cc:106
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
-msgstr ""
-"название метода (начинается с %.250s) слишком длинное (%d > %d символов)"
+msgstr "слишком длинное название метода «%.250s» (%d > %d символов)"
 
 #: dselect/methparse.cc:117
 #, c-format
 msgid "unable to access method script `%.250s'"
-msgstr "нет доступа к скрипту метода доступа %.250s"
+msgstr "нет доступа к скрипту метода доступа «%.250s»"
 
 #: dselect/methparse.cc:123
 #, c-format
 msgid "unable to read method options file `%.250s'"
-msgstr "не удалось прочитать список возможных методов доступа %.250s"
+msgstr "не удалось прочитать список возможных методов доступа «%.250s»"
 
 #: dselect/methparse.cc:147
 msgid "non-digit where digit wanted"
@@ -1186,42 +1171,42 @@ msgstr "перед описанием метода обнаружен симво
 #: dselect/methparse.cc:180
 msgid "EOF in summary - missing newline"
 msgstr ""
-"в описании обнаружен символ конца файла -- отсутствует символ конца строки"
+"в описании обнаружен символ конца файла — отсутствует символ конца строки"
 
 #: dselect/methparse.cc:190
 #, c-format
 msgid "unable to open option description file `%.250s'"
-msgstr "не удалось открыть файл описания метода %.250s"
+msgstr "не удалось открыть файл описания метода «%.250s»"
 
 #: dselect/methparse.cc:194
 #, c-format
 msgid "unable to stat option description file `%.250s'"
-msgstr "не удалось получить информацию о файле описания метода %.250s"
+msgstr "не удалось получить информацию о файле описания метода «%.250s»"
 
 #: dselect/methparse.cc:198
 #, c-format
 msgid "failed to read option description file `%.250s'"
-msgstr "ошибка чтения файла описания метода %.250s"
+msgstr "ошибка чтения файла описания метода «%.250s»"
 
 #: dselect/methparse.cc:201
 #, c-format
 msgid "error during read of option description file `%.250s'"
-msgstr "ошибка чтения файла описания метода доступа %.250s"
+msgstr "ошибка чтения файла описания метода доступа «%.250s»"
 
 #: dselect/methparse.cc:224
 #, c-format
 msgid "error during read of method options file `%.250s'"
-msgstr "ошибка чтения списка возможных методов доступа %.250s"
+msgstr "ошибка чтения списка возможных методов доступа «%.250s»"
 
 #: dselect/methparse.cc:247
 #, c-format
 msgid "unable to open current option file `%.250s'"
-msgstr "не удалось открыть файл текущего метода доступа %.250s"
+msgstr "не удалось открыть файл текущего метода доступа «%.250s»"
 
 #: dselect/methparse.cc:283
 #, c-format
 msgid "unable to write new option to `%.250s'"
-msgstr "не удалось записать новый файл метода доступа %.250s"
+msgstr "не удалось записать новый файл метода доступа «%.250s»"
 
 #: dselect/pkgdisplay.cc:36
 msgid "new package"
@@ -1457,15 +1442,15 @@ msgstr "Вычищен"
 
 #: dselect/pkgdisplay.cc:193
 msgid "dselect - recursive package listing"
-msgstr "dselect -- вложенный список пакетов"
+msgstr "dselect — вложенный список пакетов"
 
 #: dselect/pkgdisplay.cc:195
 msgid "dselect - inspection of package states"
-msgstr "dselect -- просмотр состояний пакетов"
+msgstr "dselect — просмотр состояний пакетов"
 
 #: dselect/pkgdisplay.cc:196
 msgid "dselect - main package listing"
-msgstr "dselect -- основной список пакетов"
+msgstr "dselect — основной список пакетов"
 
 #: dselect/pkgdisplay.cc:204
 msgid " (by section)"
@@ -1531,12 +1516,12 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 "Данная строка представляет много пакетов.  Если вы пометите её для "
-"установки, удаления и т.п., эта команда будет выполнена для всех пакетов, "
+"установки, удаления и т. п., эта команда будет выполнена для всех пакетов, "
 "соответствующих указанному критерию.\n"
 "\n"
 "Если вы перейдёте к строке, в которой представлен отдельный пакет, в этом "
 "окне вы увидите информацию об этом пакете.\n"
-"Используйте клавиши `o' и `O' для изменения порядка сортировки пакетов. Это "
+"Используйте клавиши «o» и «O» для изменения порядка сортировки пакетов. Это "
 "позволит отмечать пакеты, пользуясь широким набором критериев."
 
 #: dselect/pkginfo.cc:93
@@ -1556,10 +1541,8 @@ msgid "Available control file information"
 msgstr "Доступна информация из файла control"
 
 #: dselect/pkglist.cc:421
-#, fuzzy
-#| msgid "There are no packages."
 msgid "there are no packages"
-msgstr "Пакетов нет."
+msgstr "нет пакетов"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"

dselect/po/sk.po

@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-03 01:09+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 #: dselect/basecmds.cc:125
 msgid "Search for ? "

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: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
 "PO-Revision-Date: 2012-07-01 09:02+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"

dselect/po/tl.po

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

dselect/po/vi.po

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

dselect/po/zh_CN.po

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

dselect/po/zh_TW.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
-"PO-Revision-Date: 2006-02-17 08:58+0200\n"
-"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
+"POT-Creation-Date: 2012-07-21 02:18+0200\n"
+"PO-Revision-Date: 2012-07-07 17:58+0800\n"
+"Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -115,9 +115,8 @@ msgid "failed to create query window"
 msgstr "建立查詢視窗失敗"
 
 #: dselect/baselist.cc:247
-#, fuzzy
 msgid "Keybindings"
-msgstr "按鍵關聯設定"
+msgstr "快速鍵"
 
 #: dselect/baselist.cc:295
 #, c-format
@@ -228,10 +227,8 @@ msgid "Search for a package whose name contains a string"
 msgstr "搜尋名稱含有特定字串的套件"
 
 #: dselect/bindings.cc:162
-#, fuzzy
-#| msgid "Repeat last search."
 msgid "Repeat last search"
-msgstr "重復上次的搜尋。"
+msgstr "重復上次的搜尋"
 
 #: dselect/bindings.cc:163
 msgid "Swap sort order priority/section"
@@ -266,9 +263,8 @@ msgid "Revert to directly requested state for all packages"
 msgstr "把所有套件的狀態恢復到所要求的值"
 
 #: dselect/bindings.cc:171
-#, fuzzy
 msgid "Revert to currently installed state for all packages"
-msgstr "把所有套件的狀態恢復到所要求的值"
+msgstr "把所有套件的狀態恢復到目前安裝的值"
 
 #: dselect/bindings.cc:174
 msgid "Select currently-highlighted access method"
@@ -283,7 +279,6 @@ msgid "Keystrokes"
 msgstr "按鍵操作"
 
 #: dselect/helpmsgs.cc:29
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -315,7 +310,7 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "移動按鍵：下一個/前一個，頂端/底端，上移/下移，後移/前移：\n"
-"  n，下箭頭             p，上箭頭               移動高亮顯示所在的地方\n"
+"  j，下箭頭             k，上箭頭               移動高亮顯示所在的地方\n"
 "  N，Page-down，空格    P，Page-up，Backspace   讓列表滾動一頁\n"
 "  ^n                    ^p                      讓列表滾動一行\n"
 "  t，Home               e，End                  跳到列表的頂端/底端\n"
@@ -331,13 +326,13 @@ msgstr ""
 " - ，Delete  刪除                   :, G  取消保持：升級或者仍然不安裝\n"
 " _           刪除並清除設定\n"
 "                                             其它：\n"
-"退出，改動狀態(注意，都是大寫！)：            ?, F1     請求幫助\n"
-"  enter    確認並退出(復查相依問題)            i, I      切換或滾動相關訊息的"
-"顯示\n"
+"退出，覆寫狀態(注意，都是大寫！)：            ?, F1     請求幫助(Help)\n"
+" Enter    確認並退出(檢查相依性)            i, I      切換或滾動相關訊息的顯"
+"示\n"
 "   Q     確認並退出(忽略相依問題)             o, O      滾動排序的各個選項\n"
 " X, Esc  退出程序，把之前的改動作廢           v, V      修改狀態顯示的選項\n"
 "   R     把所有套件的狀態恢復到修改前       ^l        重畫螢幕\n"
-"   U     把所有套件的狀態改成建議值         /         搜尋 (用enter取消搜"
+"   U     把所有套件的狀態改成建議值         /         搜尋 (按Enter取消搜"
 "索)\n"
 "   D     把所有套件的狀態改成到所要求的值   \\        重復上次的搜尋\n"
 
@@ -507,7 +502,6 @@ msgid "Display, part 1: package listing and status chars"
 msgstr "顯示部位 1：套件列表及狀態簡寫"
 
 #: dselect/helpmsgs.cc:125
-#, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -540,19 +534,19 @@ msgid ""
 "description.\n"
 msgstr ""
 "螢幕的上半部分顯示的是套件的列表。對每個套件來說，\n"
-"都有四列代號表示該套件在系統中的狀態以及現在的標記。\n"
-"在簡略模式裡(可用“v”來切換到詳盡模式)它們都是單個字母，\n"
-"從左到右分別是：\n"
+"都有四列代號表示該套件在系統中的狀態以及現在的標記。在簡略模式裡(可用\n"
+"“v”來切換到詳盡模式)它們都是單個字母，從左到右分別是：\n"
 "\n"
 "錯誤旗標：空白，即沒有錯誤(但是套件可能有故障，見下)\n"
 "               “R”，  即在安裝過程遭遇了嚴重錯誤，需要重新安裝﹔\n"
 "安裝狀態：空白，即沒有安裝﹔\n"
 "               “*”，  即已安裝﹔\n"
-"               “-”，  即沒有安裝，但是殘留有其設定檔案﹔\n"
+"               “-”，  即沒有安裝，但是殘留其設定檔案﹔\n"
 "     處於這些狀態    { “U”，即已解壓縮但還未進行設定﹔\n"
-"          的套件  { “C”，即不完全設定(其間有錯誤發生)﹔\n"
-"     都是有故障的    { “I”，即部分安裝(其間有錯誤發生)。\n"
-"原有標記：列表顯示出之前的套件被要求設定的狀態﹔\n"
+"     的套件  { “C”，即不完全設定(其間有錯誤發生)﹔\n"
+"     都是有故障的    { “I”，即部分安裝(其間有錯誤發生)；\n"
+"     已安裝         { “W”,“t” ，等待觸發。等待中。\n"
+"    原有標記：列表顯示出之前的套件被要求設定的狀態﹔\n"
 "當前標記：現在套件被要求設定的狀態：\n"
 "  “*”：將其標記為安裝或升級﹔\n"
 "  “-”：將其標記為刪除，但是將保留它的設定檔案﹔\n"
@@ -658,7 +652,6 @@ msgid "Keystrokes for method selection"
 msgstr "選擇安裝方式的按鍵操作"
 
 #: dselect/helpmsgs.cc:196
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -683,7 +676,7 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 "移動按鍵：下一個/前一個，頂端/底端，上移/下移，後移/前移：\n"
-"  n，下箭頭             p，上箭頭               移動高亮所在的地方\n"
+"  j，下箭頭             k，上箭頭               移動高亮所在的地方\n"
 "  N，Page-down，空格    P，Page-up，Backspace   讓列表滾動一頁\n"
 "  ^n                    ^p                      讓列表滾動一行\n"
 "  t，Home               e，End                  跳到列表的頂端/底端\n"
@@ -798,23 +791,21 @@ msgid "menu"
 msgstr "選單"
 
 #: dselect/main.cc:158
-#, fuzzy, c-format
+#, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
-msgstr "Debian “%s” 套件操作前端程式"
+msgstr "Debian “%s” 套件操作前端程式版本%s。\n"
 
 #: dselect/main.cc:161
-#, 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 ""
-"這是自由軟體﹔要獲知復制該軟體的前提和條件，請參閱 GNU Public License \n"
+"這是自由軟體﹔請參閱 GNU Public License \n"
 "第二或更新的版本。該軟體【不】提供任何擔保。\n"
-"請通過執行 dpkg-deb --licence 來查看版權和許可証的細節。\n"
 
 #: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
-msgstr ""
+msgstr "<標準輸出>"
 
 #: dselect/main.cc:181
 #, c-format
@@ -822,6 +813,8 @@ msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
+"用法：%s [<選項> ...][<選項> ...]\n"
+"\n"
 
 #: dselect/main.cc:185
 #, c-format
@@ -834,6 +827,13 @@ msgid ""
 "                             Configure screen colours.\n"
 "\n"
 msgstr ""
+"選項：\n"
+"  --admindir <目錄名>     以 <目錄名> 取代 %s。\n"
+"  --expert                   開啟專家模式。\n"
+"  --debug <檔案> | -D<檔案>  開啟偵錯，將訊息導至 <檔案>。\n"
+"  --colour | --color screenpart:[foreground],[backgroud][:attr[+attr+...]]\n"
+"                             設定螢幕顏色。\n"
+"\n"
 
 #: dselect/main.cc:194
 #, c-format
@@ -842,12 +842,14 @@ msgid ""
 "  --version                  Show the version.\n"
 "\n"
 msgstr ""
+"  --help                     顯示求助訊息。\n"
+"  --version                  顯示版本號。\n"
+"\n"
 
 #: dselect/main.cc:198
-#, fuzzy, c-format
-#| msgid "Section"
+#, c-format
 msgid "Actions:\n"
-msgstr "所屬類別"
+msgstr "動作：\n"
 
 #: dselect/main.cc:203
 #, c-format
@@ -870,20 +872,17 @@ msgid "couldn't open debug file `%.255s'\n"
 msgstr "無法打開偵錯檔案“%.255s”\n"
 
 #: dselect/main.cc:251
-#, fuzzy, c-format
-#| msgid "Invalid %s `%s'\n"
+#, c-format
 msgid "invalid %s '%s'"
-msgstr "無效的 %s “%s”\n"
+msgstr "無效的 %s “%s”"
 
 #: dselect/main.cc:268
 msgid "screen part"
 msgstr "顯示哪一部分"
 
 #: dselect/main.cc:274
-#, fuzzy
-#| msgid "Null colour specification\n"
 msgid "null colour specification"
-msgstr "未指定顏色\n"
+msgstr "未指定顏色"
 
 #: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
@@ -902,13 +901,13 @@ msgid "Terminal does not appear to support highlighting.\n"
 msgstr "終端機不支持高亮顯示。\n"
 
 #: dselect/main.cc:331
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool %s.\n"
 msgstr ""
 "請正確設定您的 TERM 變量，用一個更合適的終端機類型，\n"
-"或者改用針對單一套件的套裝管理工具，即 "
+"或者改用針對單一套件的套裝管理工具 %s。\n"
 
 #: dselect/main.cc:334
 msgid "terminal lacks necessary features, giving up"
@@ -916,7 +915,7 @@ msgstr "由於終端機缺乏必要的特色，只得中止操作"
 
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
-msgstr ""
+msgstr "外部平台啟動但是多平台不支援"
 
 #: dselect/main.cc:422
 msgid ""
@@ -937,6 +936,8 @@ msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
+"Copyright (C) 1994-1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
 #: dselect/main.cc:433
 msgid ""
@@ -991,9 +992,8 @@ msgid "getch failed"
 msgstr "getch 失敗"
 
 #: dselect/methlist.cc:183
-#, fuzzy
 msgid "Explanation"
-msgstr "後面安裝方式的說明"
+msgstr "說明"
 
 #: dselect/methlist.cc:192
 msgid "No explanation available."
@@ -1024,9 +1024,8 @@ msgid "Press <enter> to continue.\n"
 msgstr "請按 <enter> 繼續。\n"
 
 #: dselect/method.cc:162
-#, fuzzy
 msgid "<standard error>"
-msgstr "寫標準錯誤輸出時出錯"
+msgstr "<寫標準輸出時出錯>"
 
 #: dselect/method.cc:165
 msgid "error reading acknowledgement of program failure message"
@@ -1203,15 +1202,15 @@ msgstr "已解壓縮(尚未設定)"
 
 #: dselect/pkgdisplay.cc:55
 msgid "half configured (config failed)"
-msgstr ""
+msgstr "half configured (config failed)"
 
 #: dselect/pkgdisplay.cc:56
 msgid "awaiting trigger processing"
-msgstr ""
+msgstr "等待觸發中"
 
 #: dselect/pkgdisplay.cc:57
 msgid "triggered"
-msgstr ""
+msgstr "觸發"
 
 #: dselect/pkgdisplay.cc:58
 msgid "installed"
@@ -1263,7 +1262,7 @@ msgstr "預相依於"
 
 #: dselect/pkgdisplay.cc:74
 msgid "breaks"
-msgstr ""
+msgstr "取消"
 
 #: dselect/pkgdisplay.cc:75
 msgid "conflicts with"
@@ -1469,30 +1468,24 @@ msgstr ""
 "標記了。"
 
 #: dselect/pkginfo.cc:93
-#, fuzzy
 msgid "Interrelationships"
-msgstr "套件的相互關系"
+msgstr "相互關系"
 
 #: dselect/pkginfo.cc:112
-#, fuzzy
 msgid "No description available."
 msgstr "無相關介紹。"
 
 #: dselect/pkginfo.cc:130
-#, fuzzy
 msgid "Installed control file information"
-msgstr "為下面套件安裝的控制訊息"
+msgstr "已安裝的控制檔案訊息"
 
 #: dselect/pkginfo.cc:146
-#, fuzzy
 msgid "Available control file information"
-msgstr "可用的控制訊息的版本"
+msgstr "可用的控制檔案訊息"
 
 #: dselect/pkglist.cc:421
-#, fuzzy
-#| msgid "Installed packages"
 msgid "there are no packages"
-msgstr "已經安裝的套件"
+msgstr "沒有多餘的套件"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"

lib/dpkg/depcon.c

@@ -51,11 +51,13 @@ versionsatisfied(struct pkgbin *it, struct deppossi *against)
  * - Conflicts/Replaces/Breaks are assumed to apply to packages of any arch.
  */
 bool
-archsatisfied(struct pkgbin *it, struct deppossi *against)
+deparchsatisfied(struct pkgbin *it, const struct dpkg_arch *it_arch,
+                 struct deppossi *against)
 {
 	const struct dpkg_arch *dep_arch, *pkg_arch;
 
-	if (it->multiarch == multiarch_foreign)
+	if (against->arch_is_implicit &&
+	    it->multiarch == multiarch_foreign)
 		return true;
 
 	dep_arch = against->arch;
@@ -66,7 +68,7 @@ archsatisfied(struct pkgbin *it, struct deppossi *against)
 	     against->up->type == dep_breaks))
 		return true;
 
-	pkg_arch = it->arch;
+	pkg_arch = it_arch;
 	if (dep_arch->type == arch_none || dep_arch->type == arch_all)
 		dep_arch = dpkg_arch_get(arch_native);
 	if (pkg_arch->type == arch_none || pkg_arch->type == arch_all)
@@ -74,3 +76,9 @@ archsatisfied(struct pkgbin *it, struct deppossi *against)
 
 	return (dep_arch == pkg_arch);
 }
+
+bool
+archsatisfied(struct pkgbin *it, struct deppossi *against)
+{
+	return deparchsatisfied(it, it->arch, against);
+}

lib/dpkg/dpkg-db.h

@@ -376,6 +376,8 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep);
 /*** from depcon.c ***/
 
 bool versionsatisfied(struct pkgbin *it, struct deppossi *against);
+bool deparchsatisfied(struct pkgbin *it, const struct dpkg_arch *arch,
+                      struct deppossi *against);
 bool archsatisfied(struct pkgbin *it, struct deppossi *against);
 
 /*** from nfmalloc.c ***/

lib/dpkg/libdpkg.map

@@ -274,6 +274,7 @@ LIBDPKG_PRIVATE {
 	pkg_db_iter_free;
 
 	# Dependency and Conflict functions
+	deparchsatisfied;
 	archsatisfied;
 	versionsatisfied;
 

lib/dpkg/parse.c

@@ -342,11 +342,13 @@ parse_find_set_slot(struct parsedb_state *ps,
     parse_count_pkg_instance(&count, pkg, &pkg->installed);
 
   if (count.single > 1)
-    parse_error(ps, _("multiple non-coinstallable package instances present"));
+    parse_error(ps, _("multiple non-coinstallable package instances present; "
+                      "most probably due to an upgrade from an unofficial dpkg"));
 
   if (count.single > 0 && count.multi > 0)
     parse_error(ps, _("mixed non-coinstallable and coinstallable package "
-                      "instances present"));
+                      "instances present; most probably due to an upgrade "
+                      "from an unofficial dpkg"));
 
   if (pkgset_installed_instances(set) != count.total)
     internerr("in-core pkgset '%s' with inconsistent number of instances",

lib/dpkg/pkg-format.c

@@ -208,6 +208,9 @@ pkg_format_parse(const char *fmt, struct dpkg_error *err)
 		}
 	}
 
+	if (!head)
+		dpkg_put_error(err, _("may not be empty string"));
+
 	return head;
 }
 

man/dpkg-gensymbols.1

@@ -27,12 +27,12 @@ dpkg\-gensymbols \- generate symbols files (shared library dependency informatio
 .SH DESCRIPTION
 .B dpkg\-gensymbols
 scans a temporary build tree (debian/tmp by default) looking for libraries
-and generate a \fIsymbols\fR file describing them. This file, if
+and generates a \fIsymbols\fR file describing them. This file, if
 non-empty, is then installed in the DEBIAN subdirectory of the build tree
 so that it ends up included in the control information of the package.
 .P
 When generating those files, it uses as input some symbols files
-provided by the maintainer. It looks for the following files (and use the
+provided by the maintainer. It looks for the following files (and uses the
 first that is found):
 .IP \(bu 4
 debian/\fIpackage\fR.symbols.\fIarch\fR

man/dpkg.1

@@ -287,11 +287,11 @@ version: \fBlt le eq ne ge gt\fP. These treat an empty version as later
 than any version: \fBlt\-nl le\-nl ge\-nl gt\-nl\fP. These are provided
 only for compatibility with control file syntax: \fB< << <= = >= >>
 >\fP.
-.TP
-.B \-\-command\-fd \fIn\fP
-Accept a series of commands on input file descriptor \fIn\fP. Note:
-additional options set on the command line, and through this file descriptor,
-are not reset for subsequent commands executed during the same run.
+.\" .TP
+.\" .B \-\-command\-fd \fIn\fP
+.\" Accept a series of commands on input file descriptor \fIn\fP. Note:
+.\" additional options set on the command line, and through this file descriptor,
+.\" are not reset for subsequent commands executed during the same run.
 .TP
 .BR \-? ", " \-\-help
 Display a brief help message.

man/po/de.po

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2012-06-30 04:20+0300\n"
-"PO-Revision-Date: 2012-06-30 18:49+0200\n"
+"POT-Creation-Date: 2012-09-29 02:32+0300\n"
+"PO-Revision-Date: 2012-10-14 20:30+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
@@ -149,13 +149,13 @@ msgid ""
 "limited to 10 ASCII decimal digits, allowing for up to approximately 9536.74 "
 "MiB member files."
 msgstr ""
-"Die Datei ist ein B<ar>-Archiv mit dem magischen Wert B<!E<lt>archE<gt>>. Nur "
-"das allgemeine B<ar>-Archivformat wird unterstützt, ohne Unterstützung von "
-"Dateinamenerweiterungen, aber mit Dateinamen, die einen optionalen "
+"Die Datei ist ein B<ar>-Archiv mit dem magischen Wert B<!E<lt>archE<gt>>. "
+"Nur das allgemeine B<ar>-Archivformat wird unterstützt, ohne Unterstützung "
+"von Dateinamenerweiterungen, aber mit Dateinamen, die einen optionalen "
 "abschließenden Schrägstrich enthalten dürfen, deren Länge damit auf 15 "
-"Zeichen (von den erlaubten 16) begrenzt ist. Dateigrößen sind auf 10 dezimale "
-"ASCII-Ziffern begrenzt, wodurch bis zu ungefähr 9536,74 MiB-Mitgliedsdateien "
-"erlaubt sind."
+"Zeichen (von den erlaubten 16) begrenzt ist. Dateigrößen sind auf 10 "
+"dezimale ASCII-Ziffern begrenzt, wodurch bis zu ungefähr 9536,74 MiB-"
+"Mitgliedsdateien erlaubt sind."
 
 #. type: Plain text
 #: deb.5:52
@@ -278,7 +278,7 @@ msgstr ""
 #: dpkg-scanpackages.1:113 dpkg-scansources.1:90 dpkg-shlibdeps.1:348
 #: dpkg-source.1:760 dpkg-split.1:234 dpkg-statoverride.8:102
 #: dpkg-trigger.1:83 dpkg-vendor.1:65 dselect.1:466 dselect.cfg.5:41
-#: update-alternatives.8:511
+#: update-alternatives.8:521
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -298,7 +298,6 @@ msgstr "deb-control"
 #: deb-control.5:22 deb-version.5:20 deb-old.5:20 deb-override.5:19
 #: deb-symbols.5:18 deb-triggers.5:19 dpkg-divert.8:21
 #: dpkg-mergechangelogs.1:18 dpkg-scansources.1:20 dpkg-trigger.1:18
-#: update-alternatives.8:25
 #, no-wrap
 msgid "2011-08-14"
 msgstr "2011-08-14"
@@ -1505,10 +1504,10 @@ msgid ""
 msgstr ""
 "Beachten Sie, dass diese Benutzer-definierten Felder den globalen Namensraum "
 "nutzen werden und somit in der Zukunft mit offiziell erkannten Feldern "
-"kollidieren könnten. Um solche möglichen Situationen zu vermeiden, können Sie "
-"den Feldern B<Private->, wie in B<XB-Private-Neues-Feld>, voranstellen. Als "
-"Seiteneffekt wird in diesem Fall B<dpkg-deb> sie nicht mit der Warnung eines "
-"unbekannten Feldes ausgeben."
+"kollidieren könnten. Um solche möglichen Situationen zu vermeiden, können "
+"Sie den Feldern B<Private->, wie in B<XB-Private-Neues-Feld>, voranstellen. "
+"Als Seiteneffekt wird in diesem Fall B<dpkg-deb> sie nicht mit der Warnung "
+"eines unbekannten Feldes ausgeben."
 
 #. type: Plain text
 #: deb-src-control.5:351
@@ -2461,7 +2460,7 @@ msgstr ""
 
 #. type: SH
 #: deb-shlibs.5:46 deb-symbols.5:59 dpkg.1:763 dpkg-architecture.1:221
-#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:476
+#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:486
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
@@ -2874,7 +2873,7 @@ msgstr "Liste von Substitutionsvariablen und -werten."
 #. type: SH
 #: deb-substvars.5:168 dpkg.1:832 dpkg-buildpackage.1:271 dpkg-deb.1:266
 #: dpkg-name.1:99 dpkg-source.1:757 dpkg-split.1:216 dselect.1:450
-#: update-alternatives.8:503
+#: update-alternatives.8:513
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
@@ -3977,8 +3976,13 @@ msgstr ""
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<Ver1 Op Ver2>"
 
+#.  .TP
+#.  .B \-\-command\-fd \fIn\fP
+#.  Accept a series of commands on input file descriptor \fIn\fP. Note:
+#.  additional options set on the command line, and through this file descriptor,
+#.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
-#: dpkg.1:290
+#: dpkg.1:295
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "success (zero result) if the specified condition is satisfied, and failure "
@@ -3999,24 +4003,6 @@ msgstr ""
 "folgenden sind nur aus Kompatibilität mit der Steuerdateisyntax "
 "bereitgestellt: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
-#. type: TP
-#: dpkg.1:290
-#, no-wrap
-msgid "B<--command-fd >I<n>"
-msgstr "B<--command-fd >I<n>"
-
-#. type: Plain text
-#: dpkg.1:295
-msgid ""
-"Accept a series of commands on input file descriptor I<n>. Note: additional "
-"options set on the command line, and through this file descriptor, are not "
-"reset for subsequent commands executed during the same run."
-msgstr ""
-"Akzeptiert eine Reihe von Befehlen an Eingabe-Dateideskriptor I<n>. Hinweis: "
-"Zusätzliche auf der Kommandozeile und durch diesen Dateideskriptor gesetzte "
-"Optionen werden nicht für nachfolgende Befehle, die im gleichen Lauf "
-"ausgeführt werden, zurückgesetzt."
-
 #. type: TP
 #: dpkg.1:295 dpkg-architecture.1:80 dpkg-buildpackage.1:243
 #: dpkg-checkbuilddeps.1:63 dpkg-distaddfile.1:50 dpkg-deb.1:192
@@ -6585,10 +6571,10 @@ msgid ""
 "B<dpkg-buildflags>: relevant environment variables, current vendor, state of "
 "all feature flags. Also print the resulting compiler flags with their origin."
 msgstr ""
-"Alle Informationen anzeigen, die zum Verständnis des Verhaltens von "
-"B<dpkg-buildflags> nützlich sein können: relevante Umgebungsvariablen, "
-"aktueller Lieferant, Zustand der Funktionsschalter. Auch die entstehenden "
-"Compiler-Schalter mit ihrem Ursprung werden ausgeben."
+"Alle Informationen anzeigen, die zum Verständnis des Verhaltens von B<dpkg-"
+"buildflags> nützlich sein können: relevante Umgebungsvariablen, aktueller "
+"Lieferant, Zustand der Funktionsschalter. Auch die entstehenden Compiler-"
+"Schalter mit ihrem Ursprung werden ausgeben."
 
 #. type: Plain text
 #: dpkg-buildflags.1:84
@@ -9587,7 +9573,7 @@ msgstr "B<dpkg-gensymbols> [I<Option> …]"
 #: dpkg-gensymbols.1:33
 msgid ""
 "B<dpkg-gensymbols> scans a temporary build tree (debian/tmp by default) "
-"looking for libraries and generate a I<symbols> file describing them. This "
+"looking for libraries and generates a I<symbols> file describing them. This "
 "file, if non-empty, is then installed in the DEBIAN subdirectory of the "
 "build tree so that it ends up included in the control information of the "
 "package."
@@ -9602,7 +9588,7 @@ msgstr ""
 #: dpkg-gensymbols.1:37
 msgid ""
 "When generating those files, it uses as input some symbols files provided by "
-"the maintainer. It looks for the following files (and use the first that is "
+"the maintainer. It looks for the following files (and uses the first that is "
 "found):"
 msgstr ""
 "Beim Erstellen dieser Dateien verwendet es als Eingabe einige vom Betreuer "
@@ -12681,7 +12667,7 @@ msgstr ""
 "Einsatz mit der Multicd-Zugriffsmethode von Dselect erstellen wollen."
 
 #. type: SH
-#: dpkg-scanpackages.1:106 update-alternatives.8:465
+#: dpkg-scanpackages.1:106 update-alternatives.8:475
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSE"
@@ -14936,9 +14922,9 @@ msgstr ""
 "Standardmäßig wird dpkg-source die Patches im B<--after-build>-Hook "
 "entfernen, falls es sie in B<--before-build> angewandt hat. Diese Optionen "
 "erlauben es Ihnen, den Patch-Anwendungs- oder -Entfernungs-Prozess "
-"zwangsweise zu aktivieren bzw. zu deaktivieren. Diese Optionen sind nur "
-"in B<debian/source/local-options> erlaubt, so dass alle erstellten "
-"Quellpakete standardmäßig das gleiche Verhalten zeigen."
+"zwangsweise zu aktivieren bzw. zu deaktivieren. Diese Optionen sind nur in "
+"B<debian/source/local-options> erlaubt, so dass alle erstellten Quellpakete "
+"standardmäßig das gleiche Verhalten zeigen."
 
 #. type: Plain text
 #: dpkg-source.1:583
@@ -18303,6 +18289,12 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
+#. type: TH
+#: update-alternatives.8:25
+#, no-wrap
+msgid "2012-07-31"
+msgstr "2012-07-31"
+
 #. type: Plain text
 #: update-alternatives.8:28
 msgid ""
@@ -19071,33 +19063,64 @@ msgstr ""
 #. type: TP
 #: update-alternatives.8:405
 #, no-wrap
+msgid "B<Name:>I< name>"
+msgstr "B<Name:>I< Name>"
+
+#. type: Plain text
+#: update-alternatives.8:408
+msgid "The alternative name in the alternative directory."
+msgstr "Der alternative Name im Alternativ-Verzeichnis."
+
+#. type: TP
+#: update-alternatives.8:408
+#, no-wrap
 msgid "B<Link:>I< link>"
 msgstr "B<Link:>I< Link>"
 
 #. type: Plain text
-#: update-alternatives.8:408
+#: update-alternatives.8:411
 msgid "The generic name of the alternative."
 msgstr "Der generische Name der Alternative."
 
 #. type: TP
-#: update-alternatives.8:408
+#: update-alternatives.8:411 update-alternatives.8:437
+#, no-wrap
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Slaves:>I< Liste-von-Slaves>"
+
+#. type: Plain text
+#: update-alternatives.8:417
+msgid ""
+"When this field is present, the B<next> lines hold all slave links "
+"associated to the master link of the alternative. There is one slave per "
+"line. Each line contains one space, the generic name of the slave "
+"alternative, another space, and the path to the slave link."
+msgstr ""
+"Wenn diese Feld vorhanden ist enthält die B<nächste> Zeile alle Slave-"
+"Links, die dem Masterlink dieser Alternativen zugeordnet sind. Pro "
+"Zeile wird ein Slave aufgeführt. Jede Zeile enthält ein Leerzeichen, den "
+"generischen Namen des Slaves, ein weiteres Leerzeichen und den Pfad zu dem "
+"Slave-Link."
+
+#. type: TP
+#: update-alternatives.8:417
 #, no-wrap
 msgid "B<Status:>I< status>"
 msgstr "B<Status:>I< Status>"
 
 #. type: Plain text
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "Der Status der Alternative (B<auto> oder B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 #, no-wrap
 msgid "B<Best:>I< best-choice>"
 msgstr "B<Best:>I< beste-Wahl>"
 
 #. type: Plain text
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -19106,13 +19129,13 @@ msgstr ""
 "keine Alternative verfügbar ist."
 
 #. type: TP
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 #, no-wrap
 msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Value:>I< derzeit-ausgewählte-Alternative>"
 
 #. type: Plain text
-#: update-alternatives.8:419
+#: update-alternatives.8:428
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -19121,41 +19144,35 @@ msgstr ""
 "magischen Wert B<none>, der verwandt wird, falls der Link nicht existiert."
 
 #. type: TP
-#: update-alternatives.8:420
+#: update-alternatives.8:429
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Die anderen Blöcke beschreiben die verfügbaren Alternativen in der abgefragten Linkgruppe:"
 
 #. type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:431
 #, no-wrap
 msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr "B<Alternative:>I< Pfad-dieser-Alternativen>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 msgid "Path to this block's alternative."
 msgstr "Pfad zum Block dieser Alternativen."
 
 #. type: TP
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 #, no-wrap
 msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:>I< Prioritätswert>"
 
 #. type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:437
 msgid "Value of the priority of this alternative."
 msgstr "Wert der Priorität dieser Alternativen."
 
-#. type: TP
-#: update-alternatives.8:428
-#, no-wrap
-msgid "B<Slaves:>I< list-of-slaves>"
-msgstr "B<Slaves:>I< Liste-von-Slaves>"
-
 #. type: Plain text
-#: update-alternatives.8:434
+#: update-alternatives.8:443
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -19169,29 +19186,43 @@ msgstr ""
 "Slave-Alternative."
 
 #. type: TP
-#: update-alternatives.8:435
+#: update-alternatives.8:444
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Beispiel>"
 
 #. type: Plain text
-#: update-alternatives.8:443
+#: update-alternatives.8:459
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 msgstr ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 
 #. type: Plain text
-#: update-alternatives.8:448
+#: update-alternatives.8:464
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -19205,41 +19236,29 @@ msgstr ""
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:473
 #, no-wrap
 msgid ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 msgstr ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:485
 msgid ""
 "With B<--verbose> B<update-alternatives> chatters incessantly about its "
 "activities on its standard output channel.  If problems occur, B<update-"
@@ -19255,7 +19274,7 @@ msgstr ""
 "bitte als Fehler."
 
 #. type: Plain text
-#: update-alternatives.8:481
+#: update-alternatives.8:491
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -19268,7 +19287,7 @@ msgstr ""
 "und die zugehörige Handbuchseite beinhaltet."
 
 #. type: Plain text
-#: update-alternatives.8:484
+#: update-alternatives.8:494
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the B<--display> action:"
@@ -19277,12 +19296,12 @@ msgstr ""
 "dazu gehörigen Einstellungen, benutzen Sie die Aktion B<--display>:"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:497
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:491
+#: update-alternatives.8:501
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -19291,12 +19310,12 @@ msgstr ""
 "den folgenden Befehl und wählen dann eine Zahl aus der Liste aus:"
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:504
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:498
+#: update-alternatives.8:508
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -19305,12 +19324,12 @@ msgstr ""
 "Sie folgendes als Root aus:"
 
 #. type: Plain text
-#: update-alternatives.8:501
+#: update-alternatives.8:511
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:515
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -19318,7 +19337,7 @@ msgstr ""
 "von Debian."
 
 #. type: Plain text
-#: update-alternatives.8:510
+#: update-alternatives.8:520
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -19329,12 +19348,70 @@ msgstr ""
 "in der Implementation oder in der Dokumentation; bitte melden Sie dies."
 
 #. type: Plain text
-#: update-alternatives.8:513
+#: update-alternatives.8:523
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+#~ msgid "B<--command-fd >I<n>"
+#~ msgstr "B<--command-fd >I<n>"
+
+#~ msgid ""
+#~ "Accept a series of commands on input file descriptor I<n>. Note: "
+#~ "additional options set on the command line, and through this file "
+#~ "descriptor, are not reset for subsequent commands executed during the "
+#~ "same run."
+#~ msgstr ""
+#~ "Akzeptiert eine Reihe von Befehlen an Eingabe-Dateideskriptor I<n>. "
+#~ "Hinweis: Zusätzliche auf der Kommandozeile und durch diesen "
+#~ "Dateideskriptor gesetzte Optionen werden nicht für nachfolgende Befehle, "
+#~ "die im gleichen Lauf ausgeführt werden, zurückgesetzt."
+
+#~ msgid ""
+#~ "$ update-alternatives --query editor\n"
+#~ "Link: editor\n"
+#~ "Status: auto\n"
+#~ "Best: /usr/bin/vim.gtk\n"
+#~ "Value: /usr/bin/vim.gtk\n"
+#~ msgstr ""
+#~ "$ update-alternatives --query editor\n"
+#~ "Link: editor\n"
+#~ "Status: auto\n"
+#~ "Best: /usr/bin/vim.gtk\n"
+#~ "Value: /usr/bin/vim.gtk\n"
+
+#~ msgid ""
+#~ "Alternative: /usr/bin/vim.gtk\n"
+#~ "Priority: 50\n"
+#~ "Slaves:\n"
+#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
+#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
+#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
+#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
+#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
+#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+#~ msgstr ""
+#~ "Alternative: /usr/bin/vim.gtk\n"
+#~ "Priority: 50\n"
+#~ "Slaves:\n"
+#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
+#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
+#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
+#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
+#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
+#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+
 #~ msgid ""
 #~ "The file is an B<ar> archive with a magic value of B<!E<lt>archE<gt>>.  "
 #~ "The file names might contain a trailing slash."

man/po/hu.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-06-30 04:20+0300\n"
-"PO-Revision-Date: 2010-03-07 22:17+0100\n"
+"POT-Creation-Date: 2012-09-29 02:32+0300\n"
+"PO-Revision-Date: 2012-09-29 02:54+0200\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
 "Language: \n"
@@ -226,7 +226,7 @@ msgstr ""
 #: dpkg-scanpackages.1:113 dpkg-scansources.1:90 dpkg-shlibdeps.1:348
 #: dpkg-source.1:760 dpkg-split.1:234 dpkg-statoverride.8:102
 #: dpkg-trigger.1:83 dpkg-vendor.1:65 dselect.1:466 dselect.cfg.5:41
-#: update-alternatives.8:511
+#: update-alternatives.8:521
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "LÁSD MÉG"
@@ -247,7 +247,6 @@ msgstr "deb-control"
 #: deb-control.5:22 deb-version.5:20 deb-old.5:20 deb-override.5:19
 #: deb-symbols.5:18 deb-triggers.5:19 dpkg-divert.8:21
 #: dpkg-mergechangelogs.1:18 dpkg-scansources.1:20 dpkg-trigger.1:18
-#: update-alternatives.8:25
 #, fuzzy, no-wrap
 msgid "2011-08-14"
 msgstr "2006-02-28"
@@ -2158,7 +2157,7 @@ msgstr ""
 
 #. type: SH
 #: deb-shlibs.5:46 deb-symbols.5:59 dpkg.1:763 dpkg-architecture.1:221
-#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:476
+#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:486
 #, fuzzy, no-wrap
 msgid "EXAMPLES"
 msgstr "PÉLDA"
@@ -2497,7 +2496,7 @@ msgstr ""
 #. type: SH
 #: deb-substvars.5:168 dpkg.1:832 dpkg-buildpackage.1:271 dpkg-deb.1:266
 #: dpkg-name.1:99 dpkg-source.1:757 dpkg-split.1:216 dselect.1:450
-#: update-alternatives.8:503
+#: update-alternatives.8:513
 #, no-wrap
 msgid "BUGS"
 msgstr "HIBÁK"
@@ -3401,8 +3400,13 @@ msgstr ""
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr ""
 
+#.  .TP
+#.  .B \-\-command\-fd \fIn\fP
+#.  Accept a series of commands on input file descriptor \fIn\fP. Note:
+#.  additional options set on the command line, and through this file descriptor,
+#.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
-#: dpkg.1:290
+#: dpkg.1:295
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "success (zero result) if the specified condition is satisfied, and failure "
@@ -3414,20 +3418,6 @@ msgid ""
 "E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
 
-#. type: TP
-#: dpkg.1:290
-#, fuzzy, no-wrap
-msgid "B<--command-fd >I<n>"
-msgstr "B<Section:> E<lt>szakaszE<gt>"
-
-#. type: Plain text
-#: dpkg.1:295
-msgid ""
-"Accept a series of commands on input file descriptor I<n>. Note: additional "
-"options set on the command line, and through this file descriptor, are not "
-"reset for subsequent commands executed during the same run."
-msgstr ""
-
 #. type: TP
 #: dpkg.1:295 dpkg-architecture.1:80 dpkg-buildpackage.1:243
 #: dpkg-checkbuilddeps.1:63 dpkg-distaddfile.1:50 dpkg-deb.1:192
@@ -8143,7 +8133,7 @@ msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 #: dpkg-gensymbols.1:33
 msgid ""
 "B<dpkg-gensymbols> scans a temporary build tree (debian/tmp by default) "
-"looking for libraries and generate a I<symbols> file describing them. This "
+"looking for libraries and generates a I<symbols> file describing them. This "
 "file, if non-empty, is then installed in the DEBIAN subdirectory of the "
 "build tree so that it ends up included in the control information of the "
 "package."
@@ -8153,7 +8143,7 @@ msgstr ""
 #: dpkg-gensymbols.1:37
 msgid ""
 "When generating those files, it uses as input some symbols files provided by "
-"the maintainer. It looks for the following files (and use the first that is "
+"the maintainer. It looks for the following files (and uses the first that is "
 "found):"
 msgstr ""
 
@@ -10452,7 +10442,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:106 update-alternatives.8:465
+#: dpkg-scanpackages.1:106 update-alternatives.8:475
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
@@ -14773,6 +14763,12 @@ msgstr ""
 msgid "update-alternatives"
 msgstr ""
 
+#. type: TH
+#: update-alternatives.8:25
+#, fuzzy, no-wrap
+msgid "2012-07-31"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: update-alternatives.8:28
 msgid ""
@@ -15358,87 +15354,107 @@ msgstr ""
 #. type: TP
 #: update-alternatives.8:405
 #, fuzzy, no-wrap
+msgid "B<Name:>I< name>"
+msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
+
+#. type: Plain text
+#: update-alternatives.8:408
+msgid "The alternative name in the alternative directory."
+msgstr ""
+
+#. type: TP
+#: update-alternatives.8:408
+#, fuzzy, no-wrap
 msgid "B<Link:>I< link>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:408
+#: update-alternatives.8:411
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:408
+#: update-alternatives.8:411 update-alternatives.8:437
+#, fuzzy, no-wrap
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
+
+#. type: Plain text
+#: update-alternatives.8:417
+msgid ""
+"When this field is present, the B<next> lines hold all slave links "
+"associated to the master link of the alternative. There is one slave per "
+"line. Each line contains one space, the generic name of the slave "
+"alternative, another space, and the path to the slave link."
+msgstr ""
+
+#. type: TP
+#: update-alternatives.8:417
 #, fuzzy, no-wrap
 msgid "B<Status:>I< status>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 #, fuzzy, no-wrap
 msgid "B<Best:>I< best-choice>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 #, fuzzy, no-wrap
 msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:419
+#: update-alternatives.8:428
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:420
+#: update-alternatives.8:429
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:431
 #, no-wrap
 msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 #, fuzzy, no-wrap
 msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>elsőbbségE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:437
 msgid "Value of the priority of this alternative."
 msgstr ""
 
-#. type: TP
-#: update-alternatives.8:428
-#, fuzzy, no-wrap
-msgid "B<Slaves:>I< list-of-slaves>"
-msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
-
 #. type: Plain text
-#: update-alternatives.8:434
+#: update-alternatives.8:443
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -15447,24 +15463,43 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:435
+#: update-alternatives.8:444
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:443
+#: update-alternatives.8:459
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 msgstr ""
+"$ update-alternatives --query editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
+"Status: auto\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 
 #. type: Plain text
-#: update-alternatives.8:448
+#: update-alternatives.8:464
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -15472,29 +15507,35 @@ msgid ""
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 msgstr ""
+"Alternative: /bin/ed\n"
+"Priority: -100\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:473
 #, no-wrap
 msgid ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 msgstr ""
+"Alternative: /usr/bin/vim.basic\n"
+"Priority: 50\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:485
 msgid ""
 "With B<--verbose> B<update-alternatives> chatters incessantly about its "
 "activities on its standard output channel.  If problems occur, B<update-"
@@ -15504,7 +15545,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:481
+#: update-alternatives.8:491
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -15513,49 +15554,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:484
+#: update-alternatives.8:494
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:497
 msgid "B<update-alternatives --display vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:491
+#: update-alternatives.8:501
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:504
 msgid "B<update-alternatives --config vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:498
+#: update-alternatives.8:508
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:501
+#: update-alternatives.8:511
 msgid "B<update-alternatives --auto vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:515
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:510
+#: update-alternatives.8:520
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -15563,10 +15604,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:513
+#: update-alternatives.8:523
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+#, fuzzy
+#~ msgid "B<--command-fd >I<n>"
+#~ msgstr "B<Section:> E<lt>szakaszE<gt>"
+
 #, fuzzy
 #~ msgid "2011-11-27"
 #~ msgstr "2006-02-28"

man/po/ja.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2012-06-30 04:20+0300\n"
-"PO-Revision-Date: 2010-03-07 22:17+0100\n"
+"POT-Creation-Date: 2012-09-29 02:32+0300\n"
+"PO-Revision-Date: 2012-09-29 02:55+0200\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "Language: \n"
@@ -265,7 +265,7 @@ msgstr ""
 #: dpkg-scanpackages.1:113 dpkg-scansources.1:90 dpkg-shlibdeps.1:348
 #: dpkg-source.1:760 dpkg-split.1:234 dpkg-statoverride.8:102
 #: dpkg-trigger.1:83 dpkg-vendor.1:65 dselect.1:466 dselect.cfg.5:41
-#: update-alternatives.8:511
+#: update-alternatives.8:521
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
@@ -285,7 +285,6 @@ msgstr "deb-control"
 #: deb-control.5:22 deb-version.5:20 deb-old.5:20 deb-override.5:19
 #: deb-symbols.5:18 deb-triggers.5:19 dpkg-divert.8:21
 #: dpkg-mergechangelogs.1:18 dpkg-scansources.1:20 dpkg-trigger.1:18
-#: update-alternatives.8:25
 #, no-wrap
 msgid "2011-08-14"
 msgstr "2011-08-14"
@@ -2405,7 +2404,7 @@ msgstr ""
 
 #. type: SH
 #: deb-shlibs.5:46 deb-symbols.5:59 dpkg.1:763 dpkg-architecture.1:221
-#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:476
+#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:486
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "例"
@@ -2807,7 +2806,7 @@ msgstr "変数およびその値のリスト。"
 #. type: SH
 #: deb-substvars.5:168 dpkg.1:832 dpkg-buildpackage.1:271 dpkg-deb.1:266
 #: dpkg-name.1:99 dpkg-source.1:757 dpkg-split.1:216 dselect.1:450
-#: update-alternatives.8:503
+#: update-alternatives.8:513
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
@@ -3901,8 +3900,13 @@ msgstr ""
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<ver1 op ver2>"
 
+#.  .TP
+#.  .B \-\-command\-fd \fIn\fP
+#.  Accept a series of commands on input file descriptor \fIn\fP. Note:
+#.  additional options set on the command line, and through this file descriptor,
+#.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
-#: dpkg.1:290
+#: dpkg.1:295
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "success (zero result) if the specified condition is satisfied, and failure "
@@ -3921,23 +3925,6 @@ msgstr ""
 "E<gt>= E<gt>E<gt> E<gt>> は、control ファイルの文法との互換性を維持するために"
 "のみ提供される。"
 
-#. type: TP
-#: dpkg.1:290
-#, no-wrap
-msgid "B<--command-fd >I<n>"
-msgstr "B<--command-fd >I<n>"
-
-#. type: Plain text
-#: dpkg.1:295
-msgid ""
-"Accept a series of commands on input file descriptor I<n>. Note: additional "
-"options set on the command line, and through this file descriptor, are not "
-"reset for subsequent commands executed during the same run."
-msgstr ""
-"ファイル記述子 I<n> から一連のコマンドを入力する。これ以外のオプションは、コ"
-"マンドラインとファイル記述子の両方で指定できる。これらは、後続のコマンド実行"
-"に際しても有効である。"
-
 #. type: TP
 #: dpkg.1:295 dpkg-architecture.1:80 dpkg-buildpackage.1:243
 #: dpkg-checkbuilddeps.1:63 dpkg-distaddfile.1:50 dpkg-deb.1:192
@@ -7318,7 +7305,7 @@ msgid ""
 "distributed. Passed to B<dpkg-genchanges>."
 msgstr ""
 "バイナリパッケージのみのビルドを指定する。ソースファイルはビルドされず、配布"
-"もされない。B<dpkg-genchanges> は省略される。"
+"もされない。オプションは B<dpkg-genchanges> に渡される。"
 
 #. type: TP
 #: dpkg-buildpackage.1:77 dpkg-checkbuilddeps.1:47
@@ -7333,7 +7320,7 @@ msgid ""
 "Passed to B<dpkg-genchanges>."
 msgstr ""
 "アーキテクチャ依存のパッケージについて、バイナリパッケージのみのビルドを指定"
-"する。B<dpkg-genchanges> は省略される。"
+"する。オプションは B<dpkg-genchanges> に渡される。"
 
 #. type: TP
 #: dpkg-buildpackage.1:81 dpkg-checkbuilddeps.1:42
@@ -7348,7 +7335,7 @@ msgid ""
 "Passed to B<dpkg-genchanges>."
 msgstr ""
 "アーキテクチャ非依存のパッケージについて、バイナリパッケージのみのビルドを指"
-"定する。B<dpkg-genchanges> は省略される。"
+"定する。オプションは B<dpkg-genchanges> に渡される。"
 
 #. type: TP
 #: dpkg-buildpackage.1:85 dpkg-genchanges.1:47
@@ -7362,8 +7349,8 @@ msgid ""
 "Specifies a source-only build, no binary packages need to be made.  Passed "
 "to B<dpkg-genchanges>."
 msgstr ""
-"ソースパッケージのみのビルドを指定する。バイナリパッケージは作成されない。"
-"B<dpkg-genchanges> は省略される。"
+"ソースパッケージのみのビルドを指定する。バイナリパッケージは作成されない。オ"
+"プションは B<dpkg-genchanges> に渡される。"
 
 #. type: TP
 #: dpkg-buildpackage.1:89
@@ -9494,7 +9481,7 @@ msgstr "B<dpkg-gensymbols> [I<option>...]"
 #: dpkg-gensymbols.1:33
 msgid ""
 "B<dpkg-gensymbols> scans a temporary build tree (debian/tmp by default) "
-"looking for libraries and generate a I<symbols> file describing them. This "
+"looking for libraries and generates a I<symbols> file describing them. This "
 "file, if non-empty, is then installed in the DEBIAN subdirectory of the "
 "build tree so that it ends up included in the control information of the "
 "package."
@@ -9508,7 +9495,7 @@ msgstr ""
 #: dpkg-gensymbols.1:37
 msgid ""
 "When generating those files, it uses as input some symbols files provided by "
-"the maintainer. It looks for the following files (and use the first that is "
+"the maintainer. It looks for the following files (and uses the first that is "
 "found):"
 msgstr ""
 "これらのファイルの生成の際には、入力情報として、メンテナによって提供されるシ"
@@ -12555,7 +12542,7 @@ msgstr ""
 "成する場合に必要となる。"
 
 #. type: SH
-#: dpkg-scanpackages.1:106 update-alternatives.8:465
+#: dpkg-scanpackages.1:106 update-alternatives.8:475
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "診断メッセージ"
@@ -17970,6 +17957,13 @@ msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
+#. type: TH
+#: update-alternatives.8:25
+#, fuzzy, no-wrap
+#| msgid "2011-11-10"
+msgid "2012-07-31"
+msgstr "2011-11-10"
+
 #. type: Plain text
 #: update-alternatives.8:28
 msgid ""
@@ -18716,34 +18710,73 @@ msgstr ""
 
 #. type: TP
 #: update-alternatives.8:405
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Name:>I< name>"
+msgstr "B<Date:>I< date>"
+
+#. type: Plain text
+#: update-alternatives.8:408
+#, fuzzy
+#| msgid "The name of a symbolic link in the alternatives directory."
+msgid "The alternative name in the alternative directory."
+msgstr "alternatives ディレクトリに存在するシンボリックリンク名"
+
+#. type: TP
+#: update-alternatives.8:408
 #, no-wrap
 msgid "B<Link:>I< link>"
 msgstr "B<Link:>I< link>"
 
 #. type: Plain text
-#: update-alternatives.8:408
+#: update-alternatives.8:411
 msgid "The generic name of the alternative."
 msgstr "選択肢の一般名"
 
 #. type: TP
-#: update-alternatives.8:408
+#: update-alternatives.8:411 update-alternatives.8:437
+#, no-wrap
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Slaves:>I< list-of-slaves>"
+
+#. type: Plain text
+#: update-alternatives.8:417
+#, fuzzy
+#| msgid ""
+#| "When this header is present, the B<next> lines hold all slave "
+#| "alternatives associated to the master link of the alternative. There is "
+#| "one slave per line. Each line contains one space, the generic name of the "
+#| "slave alternative, another space, and the path to the slave alternative."
+msgid ""
+"When this field is present, the B<next> lines hold all slave links "
+"associated to the master link of the alternative. There is one slave per "
+"line. Each line contains one space, the generic name of the slave "
+"alternative, another space, and the path to the slave link."
+msgstr ""
+"このヘッダが存在している場合、B<以降の> 行には、この選択肢の master リンクに"
+"対応するすべての slave の選択肢が記述される。これは、slave 毎に 1 行ずつ記述"
+"され、各行は、1 文字のスペースに続き、slave の選択肢の一般名、スペース、"
+"slave の選択肢のパスが記述される。"
+
+#. type: TP
+#: update-alternatives.8:417
 #, no-wrap
 msgid "B<Status:>I< status>"
 msgstr "B<Status:>I< status>"
 
 #. type: Plain text
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "選択肢の状況 (B<auto> もしくは B<manual>)"
 
 #. type: TP
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 #, no-wrap
 msgid "B<Best:>I< best-choice>"
 msgstr "B<Best:>I< best-choice>"
 
 #. type: Plain text
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -18752,13 +18785,13 @@ msgstr ""
 "在しない。"
 
 #. type: TP
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 #, no-wrap
 msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Value:>I< currently-selected-alternative>"
 
 #. type: Plain text
-#: update-alternatives.8:419
+#: update-alternatives.8:428
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -18767,41 +18800,35 @@ msgstr ""
 "値が設定される場合がある。"
 
 #. type: TP
-#: update-alternatives.8:420
+#: update-alternatives.8:429
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "これ以外のブロックは、クエリ対象のリンクグループにおいて利用可能な選択肢を表示する。"
 
 #. type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:431
 #, no-wrap
 msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr "B<Alternative:>I< path-of-this-alternative>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 msgid "Path to this block's alternative."
 msgstr "このブロックの選択肢のパス。"
 
 #. type: TP
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 #, no-wrap
 msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:>I< priority-value>"
 
 #. type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:437
 msgid "Value of the priority of this alternative."
 msgstr "この選択肢の priority の値。"
 
-#. type: TP
-#: update-alternatives.8:428
-#, no-wrap
-msgid "B<Slaves:>I< list-of-slaves>"
-msgstr "B<Slaves:>I< list-of-slaves>"
-
 #. type: Plain text
-#: update-alternatives.8:434
+#: update-alternatives.8:443
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -18814,29 +18841,43 @@ msgstr ""
 "slave の選択肢のパスが記述される。"
 
 #. type: TP
-#: update-alternatives.8:435
+#: update-alternatives.8:444
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<実行例>"
 
 #. type: Plain text
-#: update-alternatives.8:443
+#: update-alternatives.8:459
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 msgstr ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 
 #. type: Plain text
-#: update-alternatives.8:448
+#: update-alternatives.8:464
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -18850,41 +18891,29 @@ msgstr ""
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:473
 #, no-wrap
 msgid ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 msgstr ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:485
 msgid ""
 "With B<--verbose> B<update-alternatives> chatters incessantly about its "
 "activities on its standard output channel.  If problems occur, B<update-"
@@ -18898,7 +18927,7 @@ msgstr ""
 "ジは、読めばわかるはずである。もしわからなければ、バグとして報告して欲しい。"
 
 #. type: Plain text
-#: update-alternatives.8:481
+#: update-alternatives.8:491
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -18911,7 +18940,7 @@ msgstr ""
 "ンクと、関連する man ページのリンクが含まれる。"
 
 #. type: Plain text
-#: update-alternatives.8:484
+#: update-alternatives.8:494
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the B<--display> action:"
@@ -18920,12 +18949,12 @@ msgstr ""
 "ションを使用する:"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:497
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:491
+#: update-alternatives.8:501
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -18934,12 +18963,12 @@ msgstr ""
 "を選ぶ:"
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:504
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:498
+#: update-alternatives.8:508
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -18948,18 +18977,18 @@ msgstr ""
 "する:"
 
 #. type: Plain text
-#: update-alternatives.8:501
+#: update-alternatives.8:511
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:515
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr "バグを見つけた場合、 Debian バグ追跡システムを使って報告してほしい。"
 
 #. type: Plain text
-#: update-alternatives.8:510
+#: update-alternatives.8:520
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -18969,10 +18998,67 @@ msgstr ""
 "かドキュメントどちらかのバグである。報告をお願いしたい。"
 
 #. type: Plain text
-#: update-alternatives.8:513
+#: update-alternatives.8:523
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 
+#~ msgid "B<--command-fd >I<n>"
+#~ msgstr "B<--command-fd >I<n>"
+
+#~ msgid ""
+#~ "Accept a series of commands on input file descriptor I<n>. Note: "
+#~ "additional options set on the command line, and through this file "
+#~ "descriptor, are not reset for subsequent commands executed during the "
+#~ "same run."
+#~ msgstr ""
+#~ "ファイル記述子 I<n> から一連のコマンドを入力する。これ以外のオプションは、"
+#~ "コマンドラインとファイル記述子の両方で指定できる。これらは、後続のコマンド"
+#~ "実行に際しても有効である。"
+
+#~ msgid ""
+#~ "$ update-alternatives --query editor\n"
+#~ "Link: editor\n"
+#~ "Status: auto\n"
+#~ "Best: /usr/bin/vim.gtk\n"
+#~ "Value: /usr/bin/vim.gtk\n"
+#~ msgstr ""
+#~ "$ update-alternatives --query editor\n"
+#~ "Link: editor\n"
+#~ "Status: auto\n"
+#~ "Best: /usr/bin/vim.gtk\n"
+#~ "Value: /usr/bin/vim.gtk\n"
+
+#~ msgid ""
+#~ "Alternative: /usr/bin/vim.gtk\n"
+#~ "Priority: 50\n"
+#~ "Slaves:\n"
+#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
+#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
+#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
+#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
+#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
+#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+#~ msgstr ""
+#~ "Alternative: /usr/bin/vim.gtk\n"
+#~ "Priority: 50\n"
+#~ "Slaves:\n"
+#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
+#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
+#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
+#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
+#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
+#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+
 #~ msgid ""
 #~ "The file is an B<ar> archive with a magic value of B<!E<lt>archE<gt>>.  "
 #~ "The file names might contain a trailing slash."

man/po/pl.add

@@ -7,3 +7,5 @@ Bartosz Feński <fenio@debian.org>, 2004-2005
 Robert Luberda <robert@debian.org>, 2006-2008
 .br
 Wiktor Wandachowicz <siryes@gmail.com>, 2008
+.br
+Michał Kułach <michal.kulach@gmail.com>, 2012

man/po/pt_BR.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2012-06-30 04:20+0300\n"
-"PO-Revision-Date: 2010-03-07 22:18+0100\n"
+"POT-Creation-Date: 2012-09-29 02:32+0300\n"
+"PO-Revision-Date: 2012-09-29 02:55+0200\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "Language: pt\n"
@@ -224,7 +224,7 @@ msgstr ""
 #: dpkg-scanpackages.1:113 dpkg-scansources.1:90 dpkg-shlibdeps.1:348
 #: dpkg-source.1:760 dpkg-split.1:234 dpkg-statoverride.8:102
 #: dpkg-trigger.1:83 dpkg-vendor.1:65 dselect.1:466 dselect.cfg.5:41
-#: update-alternatives.8:511
+#: update-alternatives.8:521
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
@@ -244,7 +244,6 @@ msgstr "I<control>"
 #: deb-control.5:22 deb-version.5:20 deb-old.5:20 deb-override.5:19
 #: deb-symbols.5:18 deb-triggers.5:19 dpkg-divert.8:21
 #: dpkg-mergechangelogs.1:18 dpkg-scansources.1:20 dpkg-trigger.1:18
-#: update-alternatives.8:25
 #, fuzzy, no-wrap
 msgid "2011-08-14"
 msgstr "2006-04-09"
@@ -1925,7 +1924,7 @@ msgstr ""
 
 #. type: SH
 #: deb-shlibs.5:46 deb-symbols.5:59 dpkg.1:763 dpkg-architecture.1:221
-#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:476
+#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:486
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPLOS"
@@ -2265,7 +2264,7 @@ msgstr "Lista dos pacotes disponíveis."
 #. type: SH
 #: deb-substvars.5:168 dpkg.1:832 dpkg-buildpackage.1:271 dpkg-deb.1:266
 #: dpkg-name.1:99 dpkg-source.1:757 dpkg-split.1:216 dselect.1:450
-#: update-alternatives.8:503
+#: update-alternatives.8:513
 #, fuzzy, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
@@ -3284,8 +3283,13 @@ msgstr ""
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
+#.  .TP
+#.  .B \-\-command\-fd \fIn\fP
+#.  Accept a series of commands on input file descriptor \fIn\fP. Note:
+#.  additional options set on the command line, and through this file descriptor,
+#.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
-#: dpkg.1:290
+#: dpkg.1:295
 #, fuzzy
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
@@ -3307,25 +3311,6 @@ msgstr ""
 "manter compatibilidade com a sintaxe do arquivo de controle: B<E<lt> "
 "E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
-#. type: TP
-#: dpkg.1:290
-#, fuzzy, no-wrap
-msgid "B<--command-fd >I<n>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
-
-#. type: Plain text
-#: dpkg.1:295
-#, fuzzy
-msgid ""
-"Accept a series of commands on input file descriptor I<n>. Note: additional "
-"options set on the command line, and through this file descriptor, are not "
-"reset for subsequent commands executed during the same run."
-msgstr ""
-"Aceita uma série de comandos no descritor de arquivo de entrada "
-"B<E<lt>nE<gt>>.  Nota: opções adicionais configuradas na linha de comando, e "
-"através do descritor de arquivo, não são redefinidas para comandos "
-"subseqüentes usados durante a mesma execução."
-
 #. type: TP
 #: dpkg.1:295 dpkg-architecture.1:80 dpkg-buildpackage.1:243
 #: dpkg-checkbuilddeps.1:63 dpkg-distaddfile.1:50 dpkg-deb.1:192
@@ -8132,7 +8117,7 @@ msgstr "B<dpkg> [I<opções>] I<ação>"
 #: dpkg-gensymbols.1:33
 msgid ""
 "B<dpkg-gensymbols> scans a temporary build tree (debian/tmp by default) "
-"looking for libraries and generate a I<symbols> file describing them. This "
+"looking for libraries and generates a I<symbols> file describing them. This "
 "file, if non-empty, is then installed in the DEBIAN subdirectory of the "
 "build tree so that it ends up included in the control information of the "
 "package."
@@ -8142,7 +8127,7 @@ msgstr ""
 #: dpkg-gensymbols.1:37
 msgid ""
 "When generating those files, it uses as input some symbols files provided by "
-"the maintainer. It looks for the following files (and use the first that is "
+"the maintainer. It looks for the following files (and uses the first that is "
 "found):"
 msgstr ""
 
@@ -10450,7 +10435,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:106 update-alternatives.8:465
+#: dpkg-scanpackages.1:106 update-alternatives.8:475
 #, fuzzy, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNÓSTICOS"
@@ -14767,6 +14752,12 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives --auto vi"
 
+#. type: TH
+#: update-alternatives.8:25
+#, fuzzy, no-wrap
+msgid "2012-07-31"
+msgstr "2006-04-09"
+
 #. type: Plain text
 #: update-alternatives.8:28
 msgid ""
@@ -15515,87 +15506,107 @@ msgstr ""
 #. type: TP
 #: update-alternatives.8:405
 #, fuzzy, no-wrap
-msgid "B<Link:>I< link>"
+msgid "B<Name:>I< name>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: update-alternatives.8:408
-msgid "The generic name of the alternative."
+msgid "The alternative name in the alternative directory."
 msgstr ""
 
 #. type: TP
 #: update-alternatives.8:408
 #, fuzzy, no-wrap
-msgid "B<Status:>I< status>"
+msgid "B<Link:>I< link>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: update-alternatives.8:411
+msgid "The generic name of the alternative."
+msgstr ""
+
+#. type: TP
+#: update-alternatives.8:411 update-alternatives.8:437
+#, fuzzy, no-wrap
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: update-alternatives.8:417
+msgid ""
+"When this field is present, the B<next> lines hold all slave links "
+"associated to the master link of the alternative. There is one slave per "
+"line. Each line contains one space, the generic name of the slave "
+"alternative, another space, and the path to the slave link."
+msgstr ""
+
+#. type: TP
+#: update-alternatives.8:417
+#, fuzzy, no-wrap
+msgid "B<Status:>I< status>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: update-alternatives.8:420
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 #, fuzzy, no-wrap
 msgid "B<Best:>I< best-choice>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 #, no-wrap
 msgid "B<Value:>I< currently-selected-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:419
+#: update-alternatives.8:428
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:420
+#: update-alternatives.8:429
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:431
 #, no-wrap
 msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 #, fuzzy, no-wrap
 msgid "B<Priority:>I< priority-value>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:437
 msgid "Value of the priority of this alternative."
 msgstr ""
 
-#. type: TP
-#: update-alternatives.8:428
-#, fuzzy, no-wrap
-msgid "B<Slaves:>I< list-of-slaves>"
-msgstr "B<--log=>I<filename>"
-
 #. type: Plain text
-#: update-alternatives.8:434
+#: update-alternatives.8:443
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -15604,24 +15615,43 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:435
+#: update-alternatives.8:444
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:443
+#: update-alternatives.8:459
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 msgstr ""
+"$ update-alternatives --query editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
+"Status: auto\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 
 #. type: Plain text
-#: update-alternatives.8:448
+#: update-alternatives.8:464
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -15629,29 +15659,35 @@ msgid ""
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 msgstr ""
+"Alternative: /bin/ed\n"
+"Priority: -100\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:473
 #, no-wrap
 msgid ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 msgstr ""
+"Alternative: /usr/bin/vim.basic\n"
+"Priority: 50\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:485
 #, fuzzy
 msgid ""
 "With B<--verbose> B<update-alternatives> chatters incessantly about its "
@@ -15667,7 +15703,7 @@ msgstr ""
 "assim, por favor reporte isso com um bug."
 
 #. type: Plain text
-#: update-alternatives.8:481
+#: update-alternatives.8:491
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -15676,46 +15712,46 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:484
+#: update-alternatives.8:494
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:497
 #, fuzzy
 msgid "B<update-alternatives --display vi>"
 msgstr "update-alternatives --display vi"
 
 #. type: Plain text
-#: update-alternatives.8:491
+#: update-alternatives.8:501
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:504
 #, fuzzy
 msgid "B<update-alternatives --config vi>"
 msgstr "update-alternatives --config vi"
 
 #. type: Plain text
-#: update-alternatives.8:498
+#: update-alternatives.8:508
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:501
+#: update-alternatives.8:511
 #, fuzzy
 msgid "B<update-alternatives --auto vi>"
 msgstr "update-alternatives --auto vi"
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:515
 #, fuzzy
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
@@ -15725,7 +15761,7 @@ msgstr ""
 "mensagem diretamente para o autor."
 
 #. type: Plain text
-#: update-alternatives.8:510
+#: update-alternatives.8:520
 #, fuzzy
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
@@ -15737,11 +15773,27 @@ msgstr ""
 "na documentação; por favor reporte isso."
 
 #. type: Plain text
-#: update-alternatives.8:513
+#: update-alternatives.8:523
 #, fuzzy
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
 
+#, fuzzy
+#~ msgid "B<--command-fd >I<n>"
+#~ msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Accept a series of commands on input file descriptor I<n>. Note: "
+#~ "additional options set on the command line, and through this file "
+#~ "descriptor, are not reset for subsequent commands executed during the "
+#~ "same run."
+#~ msgstr ""
+#~ "Aceita uma série de comandos no descritor de arquivo de entrada "
+#~ "B<E<lt>nE<gt>>.  Nota: opções adicionais configuradas na linha de "
+#~ "comando, e através do descritor de arquivo, não são redefinidas para "
+#~ "comandos subseqüentes usados durante a mesma execução."
+
 #, fuzzy
 #~ msgid "2011-11-27"
 #~ msgstr "2006-04-09"

man/po/ru.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2012-06-30 04:20+0300\n"
-"PO-Revision-Date: 2010-03-07 22:18+0100\n"
+"POT-Creation-Date: 2012-09-29 02:32+0300\n"
+"PO-Revision-Date: 2012-09-29 02:56+0200\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\n"
@@ -226,7 +226,7 @@ msgstr ""
 #: dpkg-scanpackages.1:113 dpkg-scansources.1:90 dpkg-shlibdeps.1:348
 #: dpkg-source.1:760 dpkg-split.1:234 dpkg-statoverride.8:102
 #: dpkg-trigger.1:83 dpkg-vendor.1:65 dselect.1:466 dselect.cfg.5:41
-#: update-alternatives.8:511
+#: update-alternatives.8:521
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -251,7 +251,6 @@ msgstr "deb-control"
 #: deb-control.5:22 deb-version.5:20 deb-old.5:20 deb-override.5:19
 #: deb-symbols.5:18 deb-triggers.5:19 dpkg-divert.8:21
 #: dpkg-mergechangelogs.1:18 dpkg-scansources.1:20 dpkg-trigger.1:18
-#: update-alternatives.8:25
 #, fuzzy, no-wrap
 msgid "2011-08-14"
 msgstr "2006-02-28"
@@ -2178,7 +2177,7 @@ msgstr ""
 
 #. type: SH
 #: deb-shlibs.5:46 deb-symbols.5:59 dpkg.1:763 dpkg-architecture.1:221
-#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:476
+#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:486
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
@@ -2518,7 +2517,7 @@ msgstr "Список доступных пакетов."
 #. type: SH
 #: deb-substvars.5:168 dpkg.1:832 dpkg-buildpackage.1:271 dpkg-deb.1:266
 #: dpkg-name.1:99 dpkg-source.1:757 dpkg-split.1:216 dselect.1:450
-#: update-alternatives.8:503
+#: update-alternatives.8:513
 #, no-wrap
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
@@ -3535,8 +3534,13 @@ msgstr ""
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
+#.  .TP
+#.  .B \-\-command\-fd \fIn\fP
+#.  Accept a series of commands on input file descriptor \fIn\fP. Note:
+#.  additional options set on the command line, and through this file descriptor,
+#.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
-#: dpkg.1:290
+#: dpkg.1:295
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "success (zero result) if the specified condition is satisfied, and failure "
@@ -3557,25 +3561,6 @@ msgstr ""
 "Операторы B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>> используются "
 "только для совместимости с синтаксисом файла control."
 
-#. type: TP
-#: dpkg.1:290
-#, fuzzy, no-wrap
-msgid "B<--command-fd >I<n>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
-
-#. type: Plain text
-#: dpkg.1:295
-#, fuzzy
-msgid ""
-"Accept a series of commands on input file descriptor I<n>. Note: additional "
-"options set on the command line, and through this file descriptor, are not "
-"reset for subsequent commands executed during the same run."
-msgstr ""
-"Принимает серию команд из входного файлового дескриптора B<E<lt>nE<gt>>. "
-"Замечание: дополнительные параметры, заданные в командной строке, а также "
-"через этот дескриптор, не сбрасываются для последующих команд, выполняющихся "
-"далее в этом запуске."
-
 #. type: TP
 #: dpkg.1:295 dpkg-architecture.1:80 dpkg-buildpackage.1:243
 #: dpkg-checkbuilddeps.1:63 dpkg-distaddfile.1:50 dpkg-deb.1:192
@@ -8458,7 +8443,7 @@ msgstr "B<dpkg> [I<параметры>] I<действие>"
 #: dpkg-gensymbols.1:33
 msgid ""
 "B<dpkg-gensymbols> scans a temporary build tree (debian/tmp by default) "
-"looking for libraries and generate a I<symbols> file describing them. This "
+"looking for libraries and generates a I<symbols> file describing them. This "
 "file, if non-empty, is then installed in the DEBIAN subdirectory of the "
 "build tree so that it ends up included in the control information of the "
 "package."
@@ -8468,7 +8453,7 @@ msgstr ""
 #: dpkg-gensymbols.1:37
 msgid ""
 "When generating those files, it uses as input some symbols files provided by "
-"the maintainer. It looks for the following files (and use the first that is "
+"the maintainer. It looks for the following files (and uses the first that is "
 "found):"
 msgstr ""
 
@@ -10773,7 +10758,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:106 update-alternatives.8:465
+#: dpkg-scanpackages.1:106 update-alternatives.8:475
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
@@ -15183,6 +15168,12 @@ msgstr ""
 msgid "update-alternatives"
 msgstr ""
 
+#. type: TH
+#: update-alternatives.8:25
+#, fuzzy, no-wrap
+msgid "2012-07-31"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: update-alternatives.8:28
 msgid ""
@@ -15768,87 +15759,107 @@ msgstr ""
 #. type: TP
 #: update-alternatives.8:405
 #, fuzzy, no-wrap
+msgid "B<Name:>I< name>"
+msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
+
+#. type: Plain text
+#: update-alternatives.8:408
+msgid "The alternative name in the alternative directory."
+msgstr ""
+
+#. type: TP
+#: update-alternatives.8:408
+#, fuzzy, no-wrap
 msgid "B<Link:>I< link>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:408
+#: update-alternatives.8:411
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:408
+#: update-alternatives.8:411 update-alternatives.8:437
+#, fuzzy, no-wrap
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
+
+#. type: Plain text
+#: update-alternatives.8:417
+msgid ""
+"When this field is present, the B<next> lines hold all slave links "
+"associated to the master link of the alternative. There is one slave per "
+"line. Each line contains one space, the generic name of the slave "
+"alternative, another space, and the path to the slave link."
+msgstr ""
+
+#. type: TP
+#: update-alternatives.8:417
 #, fuzzy, no-wrap
 msgid "B<Status:>I< status>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 #, fuzzy, no-wrap
 msgid "B<Best:>I< best-choice>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 #, fuzzy, no-wrap
 msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:419
+#: update-alternatives.8:428
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:420
+#: update-alternatives.8:429
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:431
 #, no-wrap
 msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 #, fuzzy, no-wrap
 msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>приоритетE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:437
 msgid "Value of the priority of this alternative."
 msgstr ""
 
-#. type: TP
-#: update-alternatives.8:428
-#, fuzzy, no-wrap
-msgid "B<Slaves:>I< list-of-slaves>"
-msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
-
 #. type: Plain text
-#: update-alternatives.8:434
+#: update-alternatives.8:443
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -15857,24 +15868,43 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:435
+#: update-alternatives.8:444
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:443
+#: update-alternatives.8:459
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 msgstr ""
+"$ update-alternatives --query editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
+"Status: auto\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 
 #. type: Plain text
-#: update-alternatives.8:448
+#: update-alternatives.8:464
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -15882,29 +15912,35 @@ msgid ""
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 msgstr ""
+"Alternative: /bin/ed\n"
+"Priority: -100\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:473
 #, no-wrap
 msgid ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 msgstr ""
+"Alternative: /usr/bin/vim.basic\n"
+"Priority: 50\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:485
 msgid ""
 "With B<--verbose> B<update-alternatives> chatters incessantly about its "
 "activities on its standard output channel.  If problems occur, B<update-"
@@ -15914,7 +15950,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:481
+#: update-alternatives.8:491
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -15923,49 +15959,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:484
+#: update-alternatives.8:494
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:497
 msgid "B<update-alternatives --display vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:491
+#: update-alternatives.8:501
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:504
 msgid "B<update-alternatives --config vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:498
+#: update-alternatives.8:508
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:501
+#: update-alternatives.8:511
 msgid "B<update-alternatives --auto vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:515
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:510
+#: update-alternatives.8:520
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -15973,10 +16009,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:513
+#: update-alternatives.8:523
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+#, fuzzy
+#~ msgid "B<--command-fd >I<n>"
+#~ msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Accept a series of commands on input file descriptor I<n>. Note: "
+#~ "additional options set on the command line, and through this file "
+#~ "descriptor, are not reset for subsequent commands executed during the "
+#~ "same run."
+#~ msgstr ""
+#~ "Принимает серию команд из входного файлового дескриптора B<E<lt>nE<gt>>. "
+#~ "Замечание: дополнительные параметры, заданные в командной строке, а также "
+#~ "через этот дескриптор, не сбрасываются для последующих команд, "
+#~ "выполняющихся далее в этом запуске."
+
 #, fuzzy
 #~ msgid "2011-11-27"
 #~ msgstr "2006-02-28"

man/po/sv.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-30 04:20+0300\n"
-"PO-Revision-Date: 2012-07-01 22:15+0100\n"
+"POT-Creation-Date: 2012-09-29 02:32+0300\n"
+"PO-Revision-Date: 2012-10-15 00:13+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
@@ -270,7 +270,7 @@ msgstr ""
 #: dpkg-scanpackages.1:113 dpkg-scansources.1:90 dpkg-shlibdeps.1:348
 #: dpkg-source.1:760 dpkg-split.1:234 dpkg-statoverride.8:102
 #: dpkg-trigger.1:83 dpkg-vendor.1:65 dselect.1:466 dselect.cfg.5:41
-#: update-alternatives.8:511
+#: update-alternatives.8:521
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE ÄVEN"
@@ -290,7 +290,6 @@ msgstr "deb-control"
 #: deb-control.5:22 deb-version.5:20 deb-old.5:20 deb-override.5:19
 #: deb-symbols.5:18 deb-triggers.5:19 dpkg-divert.8:21
 #: dpkg-mergechangelogs.1:18 dpkg-scansources.1:20 dpkg-trigger.1:18
-#: update-alternatives.8:25
 #, no-wrap
 msgid "2011-08-14"
 msgstr "2011-08-14"
@@ -2407,7 +2406,7 @@ msgstr ""
 
 #. type: SH
 #: deb-shlibs.5:46 deb-symbols.5:59 dpkg.1:763 dpkg-architecture.1:221
-#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:476
+#: dpkg-divert.8:111 dpkg-name.1:78 update-alternatives.8:486
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
@@ -2812,7 +2811,7 @@ msgstr "Lista över substitueringsvariabler och -värden."
 #. type: SH
 #: deb-substvars.5:168 dpkg.1:832 dpkg-buildpackage.1:271 dpkg-deb.1:266
 #: dpkg-name.1:99 dpkg-source.1:757 dpkg-split.1:216 dselect.1:450
-#: update-alternatives.8:503
+#: update-alternatives.8:513
 #, no-wrap
 msgid "BUGS"
 msgstr "PROGRAMFEL"
@@ -3887,8 +3886,13 @@ msgstr ""
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<ver1 op ver2>"
 
+#.  .TP
+#.  .B \-\-command\-fd \fIn\fP
+#.  Accept a series of commands on input file descriptor \fIn\fP. Note:
+#.  additional options set on the command line, and through this file descriptor,
+#.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
-#: dpkg.1:290
+#: dpkg.1:295
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "success (zero result) if the specified condition is satisfied, and failure "
@@ -3908,23 +3912,6 @@ msgstr ""
 "le-nl ge-nl gt-nl>. Dessa tillhandahålls endast för kompatibilitet med "
 "styrfilssyntaxen: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
-#. type: TP
-#: dpkg.1:290
-#, no-wrap
-msgid "B<--command-fd >I<n>"
-msgstr "B<--command-fd >I<n>"
-
-#. type: Plain text
-#: dpkg.1:295
-msgid ""
-"Accept a series of commands on input file descriptor I<n>. Note: additional "
-"options set on the command line, and through this file descriptor, are not "
-"reset for subsequent commands executed during the same run."
-msgstr ""
-"Läser en följd av kommandon från indatafilhandtag I<n>. Observera: "
-"ytterligare flaggor som sätts på kommandoraden, och genom filhandtaget, "
-"återställs inte för kommandon som körs i en följd under samma körning."
-
 #. type: TP
 #: dpkg.1:295 dpkg-architecture.1:80 dpkg-buildpackage.1:243
 #: dpkg-checkbuilddeps.1:63 dpkg-distaddfile.1:50 dpkg-deb.1:192
@@ -9358,7 +9345,7 @@ msgstr "B<dpkg-gensymbols> [I<flagga>...]"
 #: dpkg-gensymbols.1:33
 msgid ""
 "B<dpkg-gensymbols> scans a temporary build tree (debian/tmp by default) "
-"looking for libraries and generate a I<symbols> file describing them. This "
+"looking for libraries and generates a I<symbols> file describing them. This "
 "file, if non-empty, is then installed in the DEBIAN subdirectory of the "
 "build tree so that it ends up included in the control information of the "
 "package."
@@ -9372,7 +9359,7 @@ msgstr ""
 #: dpkg-gensymbols.1:37
 msgid ""
 "When generating those files, it uses as input some symbols files provided by "
-"the maintainer. It looks for the following files (and use the first that is "
+"the maintainer. It looks for the following files (and uses the first that is "
 "found):"
 msgstr ""
 "När dessa filer skapas, används ett par symbolfiler från paketansvariga som "
@@ -12361,7 +12348,7 @@ msgstr ""
 "dselect:s multicd-åtkomstmetod."
 
 #. type: SH
-#: dpkg-scanpackages.1:106 update-alternatives.8:465
+#: dpkg-scanpackages.1:106 update-alternatives.8:475
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTIK"
@@ -17796,6 +17783,12 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
+#. type: TH
+#: update-alternatives.8:25
+#, no-wrap
+msgid "2012-07-31"
+msgstr "2012-07-31"
+
 #. type: Plain text
 #: update-alternatives.8:28
 msgid ""
@@ -18541,33 +18534,64 @@ msgstr ""
 #. type: TP
 #: update-alternatives.8:405
 #, no-wrap
+msgid "B<Name:>I< name>"
+msgstr "B<Namn:> I<namn>"
+
+#. type: Plain text
+#: update-alternatives.8:408
+msgid "The alternative name in the alternative directory."
+msgstr "Alternativets namn i den alternativa katalogen."
+
+#. type: TP
+#: update-alternatives.8:408
+#, no-wrap
 msgid "B<Link:>I< link>"
 msgstr "B<Link:>I< länk>"
 
 #. type: Plain text
-#: update-alternatives.8:408
+#: update-alternatives.8:411
 msgid "The generic name of the alternative."
 msgstr "Generiskt namn för alternativet."
 
 #. type: TP
-#: update-alternatives.8:408
+#: update-alternatives.8:411 update-alternatives.8:437
+#, no-wrap
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Slaves:>I< lista-över-slavar>"
+
+#. type: Plain text
+#: update-alternatives.8:417
+msgid ""
+"When this field is present, the B<next> lines hold all slave links "
+"associated to the master link of the alternative. There is one slave per "
+"line. Each line contains one space, the generic name of the slave "
+"alternative, another space, and the path to the slave link."
+msgstr ""
+"När detta fält är tillgängligt innehåller B<next>-raderna alla slavlänkar "
+"som kopplas till huvudlänken för alternativet. Varje rad beskriver en slav. "
+"Varje rad innehåller ett blanksteg, det generiska namnet på "
+"slavalternativet, ytterligare ett blanksteg, och sökvägen till "
+"slavalternativet."
+
+#. type: TP
+#: update-alternatives.8:417
 #, no-wrap
 msgid "B<Status:>I< status>"
 msgstr "B<Status:>I< status>"
 
 #. type: Plain text
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "Status för alternativet (B<auto> eller B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:411
+#: update-alternatives.8:420
 #, no-wrap
 msgid "B<Best:>I< best-choice>"
 msgstr "B<Best:>I< bästa-val>"
 
 #. type: Plain text
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -18576,13 +18600,13 @@ msgstr ""
 "alternativ är tillgängligt."
 
 #. type: TP
-#: update-alternatives.8:415
+#: update-alternatives.8:424
 #, no-wrap
 msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Value:>I< för-närvarande-valt-alternativ>"
 
 #. type: Plain text
-#: update-alternatives.8:419
+#: update-alternatives.8:428
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -18591,41 +18615,35 @@ msgstr ""
 "värdet B<none> (inget). Det används om det inte finns någon länk."
 
 #. type: TP
-#: update-alternatives.8:420
+#: update-alternatives.8:429
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Övriga block beskriver tillgängliga alternativ i den efterfrågade länkgruppen:"
 
 #. type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:431
 #, no-wrap
 msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr "B<Alternative:>I< sökväg-till-alternativet>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 msgid "Path to this block's alternative."
 msgstr "Sökväg till alternativet som beskrivs i blocket."
 
 #. type: TP
-#: update-alternatives.8:425
+#: update-alternatives.8:434
 #, no-wrap
 msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:>I< prioritetsvärde>"
 
 #. type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:437
 msgid "Value of the priority of this alternative."
 msgstr "Värdet för prioriteten på alternativet."
 
-#. type: TP
-#: update-alternatives.8:428
-#, no-wrap
-msgid "B<Slaves:>I< list-of-slaves>"
-msgstr "B<Slaves:>I< lista-över-slavar>"
-
 #. type: Plain text
-#: update-alternatives.8:434
+#: update-alternatives.8:443
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -18634,34 +18652,48 @@ msgid ""
 msgstr ""
 "När denna rubrik är tillgänglig innehåller B<next>-raderna alla "
 "slavalternativ som kopplas till huvudlänken för alternativet. Varje rad "
-"beskriver en slag. Varje rad innehåller ett blanksteg, det generiska namnet "
+"beskriver en slav. Varje rad innehåller ett blanksteg, det generiska namnet "
 "på slavalternativet, ytterligare ett blanksteg, och sökvägen till "
 "slavalternativet."
 
 #. type: TP
-#: update-alternatives.8:435
+#: update-alternatives.8:444
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Exempel>"
 
 #. type: Plain text
-#: update-alternatives.8:443
+#: update-alternatives.8:459
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 msgstr ""
 "$ update-alternatives --query editor\n"
-"Link: editor\n"
+"Name: editor\n"
+"Link: /usr/bin/editor\n"
+"Slaves:\n"
+" editor.1.gz /usr/share/man/man1/editor.1.gz\n"
+" editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/editor.1.gz\n"
+" editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz\n"
 "Status: auto\n"
-"Best: /usr/bin/vim.gtk\n"
-"Value: /usr/bin/vim.gtk\n"
+"Best: /usr/bin/vim.basic\n"
+"Value: /usr/bin/vim.basic\n"
 
 #. type: Plain text
-#: update-alternatives.8:448
+#: update-alternatives.8:464
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -18675,41 +18707,29 @@ msgstr ""
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:473
 #, no-wrap
 msgid ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 msgstr ""
-"Alternative: /usr/bin/vim.gtk\n"
+"Alternative: /usr/bin/vim.basic\n"
 "Priority: 50\n"
 "Slaves:\n"
 " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-" editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-" editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-" editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-" editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
 " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-" editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
 " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-" editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:485
 msgid ""
 "With B<--verbose> B<update-alternatives> chatters incessantly about its "
 "activities on its standard output channel.  If problems occur, B<update-"
@@ -18724,7 +18744,7 @@ msgstr ""
 "felrapport om du inte tycker att den är det."
 
 #. type: Plain text
-#: update-alternatives.8:481
+#: update-alternatives.8:491
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -18737,7 +18757,7 @@ msgstr ""
 "manualsida."
 
 #. type: Plain text
-#: update-alternatives.8:484
+#: update-alternatives.8:494
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the B<--display> action:"
@@ -18746,12 +18766,12 @@ msgstr ""
 "aktuella inställning, använd kommandot B<--display>:"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:497
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:491
+#: update-alternatives.8:501
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -18760,12 +18780,12 @@ msgstr ""
 "root och välj sedan ett tal från listan:"
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:504
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:498
+#: update-alternatives.8:508
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -18774,12 +18794,12 @@ msgstr ""
 "detta som root:"
 
 #. type: Plain text
-#: update-alternatives.8:501
+#: update-alternatives.8:511
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:515
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -18787,7 +18807,7 @@ msgstr ""
 "felrapporteringssystem."
 
 #. type: Plain text
-#: update-alternatives.8:510
+#: update-alternatives.8:520
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -18798,10 +18818,67 @@ msgstr ""
 "eller i dokumentationen; rapportera det."
 
 #. type: Plain text
-#: update-alternatives.8:513
+#: update-alternatives.8:523
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
 
+#~ msgid "B<--command-fd >I<n>"
+#~ msgstr "B<--command-fd >I<n>"
+
+#~ msgid ""
+#~ "Accept a series of commands on input file descriptor I<n>. Note: "
+#~ "additional options set on the command line, and through this file "
+#~ "descriptor, are not reset for subsequent commands executed during the "
+#~ "same run."
+#~ msgstr ""
+#~ "Läser en följd av kommandon från indatafilhandtag I<n>. Observera: "
+#~ "ytterligare flaggor som sätts på kommandoraden, och genom filhandtaget, "
+#~ "återställs inte för kommandon som körs i en följd under samma körning."
+
+#~ msgid ""
+#~ "$ update-alternatives --query editor\n"
+#~ "Link: editor\n"
+#~ "Status: auto\n"
+#~ "Best: /usr/bin/vim.gtk\n"
+#~ "Value: /usr/bin/vim.gtk\n"
+#~ msgstr ""
+#~ "$ update-alternatives --query editor\n"
+#~ "Link: editor\n"
+#~ "Status: auto\n"
+#~ "Best: /usr/bin/vim.gtk\n"
+#~ "Value: /usr/bin/vim.gtk\n"
+
+#~ msgid ""
+#~ "Alternative: /usr/bin/vim.gtk\n"
+#~ "Priority: 50\n"
+#~ "Slaves:\n"
+#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
+#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
+#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
+#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
+#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
+#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+#~ msgstr ""
+#~ "Alternative: /usr/bin/vim.gtk\n"
+#~ "Priority: 50\n"
+#~ "Slaves:\n"
+#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
+#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
+#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
+#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
+#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
+#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
+#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
+#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
+#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
+#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
+#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
+
 #~ msgid ""
 #~ "The file is an B<ar> archive with a magic value of B<!E<lt>archE<gt>>.  "
 #~ "The file names might contain a trailing slash."

man/update-alternatives.8

@@ -5,7 +5,7 @@
 .\" Copyright © 2000 Wichert Akkerman <wakkerma@debian.org>
 .\" Copyright © 2003 Adam Heath <doogie@debian.org>
 .\" Copyright © 2005 Scott James Remnant <scott@netsplit.com>
-.\" Copyright © 2006-2011 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2006-2012 Guillem Jover <guillem@debian.org>
 .\" Copyright © 2008 Pierre Habouzit <madcoder@debian.org>
 .\" Copyright © 2009-2011 Raphaël Hertzog <hertzog@debian.org>
 .\"
@@ -22,7 +22,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
-.TH update\-alternatives 8 "2011-08-14" "Debian Project" "dpkg utilities"
+.TH update\-alternatives 8 "2012-07-31" "Debian Project" "dpkg utilities"
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
 .
@@ -403,9 +403,18 @@ RFC822-like flat format. It's made of \fIn\fP + 1 blocks where \fIn\fP is
 the number of alternatives available in the queried link group. The first
 block contains the following fields:
 .TP
+.BI Name: " name"
+The alternative name in the alternative directory.
+.TP
 .BI Link: " link"
 The generic name of the alternative.
 .TP
+.BI Slaves: " list-of-slaves"
+When this field is present, the \fBnext\fR lines hold all slave links
+associated to the master link of the alternative. There is one slave per
+line. Each line contains one space, the generic name of the slave
+alternative, another space, and the path to the slave link.
+.TP
 .BI Status: " status"
 The status of the alternative (\fBauto\fR or \fBmanual\fR).
 .TP
@@ -436,30 +445,31 @@ alternative, another space, and the path to the slave alternative.
 .BR Example
 .nf
 $ update\-alternatives \-\-query editor
-Link: editor
+Name: editor
+Link: /usr/bin/editor
+Slaves:
+ editor.1.gz /usr/share/man/man1/editor.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/editor.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz
 Status: auto
-Best: /usr/bin/vim.gtk
-Value: /usr/bin/vim.gtk
+Best: /usr/bin/vim.basic
+Value: /usr/bin/vim.basic
 
 Alternative: /bin/ed
 Priority: \-100
 Slaves:
  editor.1.gz /usr/share/man/man1/ed.1.gz
 
-Alternative: /usr/bin/vim.gtk
+Alternative: /usr/bin/vim.basic
 Priority: 50
 Slaves:
  editor.1.gz /usr/share/man/man1/vim.1.gz
- editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
- editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz
- editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz
- editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz
- editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
- editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz
  editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
- editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
  editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
- editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
 .fi
 .
 .SH DIAGNOSTICS

scripts/Dpkg/BuildFlags.pm

@@ -345,7 +345,7 @@ true for).
 
 sub get_feature_areas {
     my ($self) = @_;
-    return keys $self->{'features'};
+    return keys %{$self->{'features'}};
 }
 
 =item $bf->get_features($area)

scripts/Dpkg/Source/Quilt.pm

@@ -29,6 +29,8 @@ use Dpkg::Vendor qw(get_current_vendor);
 use File::Spec;
 use File::Copy;
 use File::Find;
+use File::Path qw(make_path);
+use File::Basename;
 
 sub new {
     my ($this, $dir, %opts) = @_;
@@ -287,6 +289,7 @@ sub restore_quilt_backup_files {
             my $target = File::Spec->catfile($self->{'dir'}, $relpath_in_srcpkg);
             if (-s $_) {
                 unlink($target);
+                make_path(dirname($target));
                 unless (link($_, $target)) {
                     copy($_, $target) ||
                         syserr(_g("failed to copy %s to %s"), $_, $target);

scripts/Dpkg/Substvars.pm

@@ -195,8 +195,9 @@ sub set_version_substvars {
     # Handle old function signature taking only one argument.
     $binaryversion ||= $sourceversion;
 
-    # Fallback to manually compute the binary version if they are the same.
-    $sourceversion =~ s/\+b[0-9]+$// if $sourceversion eq $binaryversion;
+    # For backwards compatibility on binNMUs that do not use the Binary-Only
+    # field on the changelog, always fix up the source version.
+    $sourceversion =~ s/\+b[0-9]+$//;
 
     $self->{'vars'}{'binary:Version'} = $binaryversion;
     $self->{'vars'}{'source:Version'} = $sourceversion;

scripts/po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-09-29 02:33+0200\n"
 "PO-Revision-Date: 2010-10-24 18:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -456,7 +456,7 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:83 scripts/dpkg-gencontrol.pl:354
+#: scripts/dpkg-distaddfile.pl:83 scripts/dpkg-gencontrol.pl:358
 #: scripts/dpkg-mergechangelogs.pl:128 scripts/dpkg-mergechangelogs.pl:130
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
@@ -466,43 +466,43 @@ msgstr ""
 #: scripts/Dpkg/Source/Package/V2.pm:716
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:222
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:232 scripts/Dpkg/Source/Quilt.pm:56
-#: scripts/Dpkg/Source/Quilt.pm:65 scripts/Dpkg/Source/Quilt.pm:71
-#: scripts/Dpkg/Source/Quilt.pm:91
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:232 scripts/Dpkg/Source/Quilt.pm:58
+#: scripts/Dpkg/Source/Quilt.pm:67 scripts/Dpkg/Source/Quilt.pm:73
+#: scripts/Dpkg/Source/Quilt.pm:93
 #, perl-format
 msgid "cannot write %s"
 msgstr "no es pot escriure %s"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:362
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:92 scripts/dpkg-gencontrol.pl:369
+#: scripts/dpkg-distaddfile.pl:92 scripts/dpkg-gencontrol.pl:373
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:95 scripts/dpkg-gencontrol.pl:373
+#: scripts/dpkg-distaddfile.pl:95 scripts/dpkg-gencontrol.pl:377
 #, fuzzy
 msgid "read old files list file"
 msgstr "no es pot eliminar la llista de fitxers antiga"
 
-#: scripts/dpkg-distaddfile.pl:98 scripts/dpkg-gencontrol.pl:383
+#: scripts/dpkg-distaddfile.pl:98 scripts/dpkg-gencontrol.pl:387
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:99 scripts/dpkg-gencontrol.pl:384
+#: scripts/dpkg-distaddfile.pl:99 scripts/dpkg-gencontrol.pl:388
 #, fuzzy
 msgid "close new files list file"
 msgstr "no es pot tancar el fitxer d'activadors de fitxer nou «%.250s»"
 
-#: scripts/dpkg-distaddfile.pl:101 scripts/dpkg-gencontrol.pl:385
+#: scripts/dpkg-distaddfile.pl:101 scripts/dpkg-gencontrol.pl:389
 #, fuzzy
 msgid "install new files list file"
 msgstr ""
 "no es pot instaŀlar el fitxer d'activadors de fitxer nou com a «%.250s»"
 
-#: scripts/dpkg-distaddfile.pl:104 scripts/dpkg-gencontrol.pl:388
-#: scripts/dpkg-gencontrol.pl:405 scripts/dpkg-shlibdeps.pl:532
+#: scripts/dpkg-distaddfile.pl:104 scripts/dpkg-gencontrol.pl:392
+#: scripts/dpkg-gencontrol.pl:409 scripts/dpkg-shlibdeps.pl:532
 #: scripts/Dpkg/Interface/Storable.pm:91
 #: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
 #: scripts/Dpkg/Source/Package/V2.pm:594
@@ -654,8 +654,8 @@ msgstr ""
 msgid "missing information for critical output field %s"
 msgstr "manca informació per al camp d'eixida %s"
 
-#: scripts/dpkg-genchanges.pl:504 scripts/dpkg-gencontrol.pl:291
-#: scripts/dpkg-gencontrol.pl:294 scripts/Dpkg/Source/Package.pm:547
+#: scripts/dpkg-genchanges.pl:504 scripts/dpkg-gencontrol.pl:295
+#: scripts/dpkg-gencontrol.pl:298 scripts/Dpkg/Source/Package.pm:547
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -687,103 +687,103 @@ msgstr ""
 msgid "illegal package name '%s': %s"
 msgstr "El nom de paquet «%s» és il·legal"
 
-#: scripts/dpkg-gencontrol.pl:168
+#: scripts/dpkg-gencontrol.pl:172
 #, perl-format
 msgid "package %s not in control info"
 msgstr "el paquet %s no és a la informació de control"
 
-#: scripts/dpkg-gencontrol.pl:172 scripts/dpkg-gensymbols.pl:159
+#: scripts/dpkg-gencontrol.pl:176 scripts/dpkg-gensymbols.pl:159
 #, fuzzy
 #| msgid "package %s not in control info"
 msgid "no package stanza found in control info"
 msgstr "el paquet %s no és a la informació de control"
 
-#: scripts/dpkg-gencontrol.pl:174 scripts/dpkg-gensymbols.pl:161
+#: scripts/dpkg-gencontrol.pl:178 scripts/dpkg-gensymbols.pl:161
 #, perl-format
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:179
+#: scripts/dpkg-gencontrol.pl:183
 #, perl-format
 msgid "package %s: "
 msgstr "paquet %s: "
 
-#: scripts/dpkg-gencontrol.pl:204
+#: scripts/dpkg-gencontrol.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] "«%s» no és una cadena d'arquitectura vàlida."
 msgstr[1] "«%s» no són cadenes d'arquitectura vàlides"
 
-#: scripts/dpkg-gencontrol.pl:210
+#: scripts/dpkg-gencontrol.pl:214
 #, perl-format
 msgid ""
 "current host architecture '%s' does not appear in package's architecture "
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:265
+#: scripts/dpkg-gencontrol.pl:269
 #, perl-format
 msgid "%s field of package %s: "
 msgstr "camp %s del paquet %s: "
 
-#: scripts/dpkg-gencontrol.pl:269 scripts/dpkg-gencontrol.pl:277
+#: scripts/dpkg-gencontrol.pl:273 scripts/dpkg-gencontrol.pl:281
 #, perl-format
 msgid "error occurred while parsing %s field: %s"
 msgstr "s'ha produït un error en analitzar el camp %s: %s"
 
-#: scripts/dpkg-gencontrol.pl:282
+#: scripts/dpkg-gencontrol.pl:286
 #, perl-format
 msgid ""
 "the %s field contains an arch-specific dependency but the package is "
 "architecture all"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:306
+#: scripts/dpkg-gencontrol.pl:310
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr "paquet %s amb camp específic d'udeb %s"
 
-#: scripts/dpkg-gencontrol.pl:318 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:322 scripts/dpkg-scansources.pl:313
 #: scripts/dpkg-shlibdeps.pl:838 scripts/Dpkg/Changelog/Parse.pm:138
 #: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:181
 #, perl-format
 msgid "cannot fork for %s"
 msgstr "no es pot fer «fork» per a %s"
 
-#: scripts/dpkg-gencontrol.pl:321
+#: scripts/dpkg-gencontrol.pl:325
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "«chdir» per a du a «%s»"
 
-#: scripts/dpkg-gencontrol.pl:323 scripts/dpkg-shlibdeps.pl:845
+#: scripts/dpkg-gencontrol.pl:327 scripts/dpkg-shlibdeps.pl:845
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, fuzzy, perl-format
 #| msgid "unable to execute c++filt"
 msgid "unable to execute %s"
 msgstr "no es pot executar el c++filt"
 
-#: scripts/dpkg-gencontrol.pl:330
+#: scripts/dpkg-gencontrol.pl:334
 #, perl-format
 msgid "du in `%s'"
 msgstr "du en «%s»"
 
-#: scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-gencontrol.pl:336
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:371
+#: scripts/dpkg-gencontrol.pl:375
 #, fuzzy
 msgid "close old files list file"
 msgstr "no es pot eliminar la llista de fitxers antiga"
 
-#: scripts/dpkg-gencontrol.pl:396
+#: scripts/dpkg-gencontrol.pl:400
 #, fuzzy, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "no s'ha pogut obrir el nou fitxer de statoverride"
 
-#: scripts/dpkg-gencontrol.pl:407
+#: scripts/dpkg-gencontrol.pl:411
 #, fuzzy, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "fitxer de control binari %s"
@@ -1498,7 +1498,7 @@ msgstr ""
 #: scripts/Dpkg/Source/Package/V2.pm:280 scripts/Dpkg/Source/Package/V2.pm:548
 #: scripts/Dpkg/Source/Package/V2.pm:692
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:229
-#: scripts/Dpkg/Source/Quilt.pm:197 scripts/Dpkg/Source/Quilt.pm:256
+#: scripts/Dpkg/Source/Quilt.pm:199 scripts/Dpkg/Source/Quilt.pm:258
 #, perl-format
 msgid "cannot read %s"
 msgstr "no es pot llegir %s"
@@ -2348,7 +2348,7 @@ msgstr ""
 msgid "none of the filenames in ---/+++ are valid in diff '%s' (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:416 scripts/Dpkg/Source/Quilt.pm:270
+#: scripts/Dpkg/Source/Patch.pm:416 scripts/Dpkg/Source/Quilt.pm:272
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr ""
@@ -2565,7 +2565,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "no es pot canviar el nom de %s a %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:225
-#: scripts/Dpkg/Source/Quilt.pm:141
+#: scripts/Dpkg/Source/Quilt.pm:143
 #, perl-format
 msgid "applying %s"
 msgstr "s'està aplicant %s"
@@ -2674,7 +2674,7 @@ msgstr "no es pot canviar el nom de %s a %s"
 #: scripts/Dpkg/Source/Package/V2.pm:590
 #: scripts/Dpkg/Source/Package/V3/native.pm:102
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:249
-#: scripts/Dpkg/Source/Quilt.pm:294
+#: scripts/Dpkg/Source/Quilt.pm:297
 #, fuzzy, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "no es poden establir els permisos d'execució en «%.250s»"
@@ -2730,7 +2730,7 @@ msgstr ""
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:243 scripts/Dpkg/Source/Quilt.pm:171
+#: scripts/Dpkg/Source/Package/V2.pm:243 scripts/Dpkg/Source/Quilt.pm:173
 #, perl-format
 msgid "unapplying %s"
 msgstr "s'està desaplicant %s"
@@ -2819,7 +2819,7 @@ msgstr "no es pot suprimir %s"
 
 #: scripts/Dpkg/Source/Package/V2.pm:588
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Quilt.pm:292
+#: scripts/Dpkg/Source/Quilt.pm:295
 #, fuzzy, perl-format
 msgid "failed to copy %s to %s"
 msgstr "no es pot canviar el nom de %s a %s"
@@ -2982,38 +2982,38 @@ msgstr "no es pot crear l'enllaç simbòlic %s"
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:52
+#: scripts/Dpkg/Source/Quilt.pm:54
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "no es pot fer «mkdir %s»"
 
-#: scripts/Dpkg/Source/Quilt.pm:151
+#: scripts/Dpkg/Source/Quilt.pm:153
 msgid "fuzz is not allowed when applying patches"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:152
+#: scripts/Dpkg/Source/Quilt.pm:154
 #, perl-format
 msgid "if patch '%s' is correctly applied by quilt, use '%s' to update it"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:210
+#: scripts/Dpkg/Source/Quilt.pm:212
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:214
+#: scripts/Dpkg/Source/Quilt.pm:216
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:264
+#: scripts/Dpkg/Source/Quilt.pm:266
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s); dpkg-"
 "source might fail when applying patches"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:281
+#: scripts/Dpkg/Source/Quilt.pm:283
 #, perl-format
 msgid "restoring quilt backup files for %s"
 msgstr ""
@@ -3023,17 +3023,17 @@ msgstr ""
 msgid "bad line in substvars file %s at line %d"
 msgstr "s'ha produït un error en llegir «%s» en la línia %d"
 
-#: scripts/Dpkg/Substvars.pm:248
+#: scripts/Dpkg/Substvars.pm:249
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Substvars.pm:255
+#: scripts/Dpkg/Substvars.pm:256
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr "la variable de substitució ${%s} és desconeguda"
 
-#: scripts/Dpkg/Substvars.pm:279
+#: scripts/Dpkg/Substvars.pm:280
 #, perl-format
 msgid "unused substitution variable ${%s}"
 msgstr "la variable de substitució ${%s} no s'utilitza"

scripts/po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-09-29 02:33+0200\n"
 "PO-Revision-Date: 2012-06-30 17:28+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -556,7 +556,7 @@ msgstr "genau ein Dateiname, Bereich und eine Priorität wird benötigt"
 msgid "filename, section and priority may contain no whitespace"
 msgstr "Dateiname, Bereich und Priorität dürfen keine Leerzeichen enthalten"
 
-#: scripts/dpkg-distaddfile.pl:83 scripts/dpkg-gencontrol.pl:354
+#: scripts/dpkg-distaddfile.pl:83 scripts/dpkg-gencontrol.pl:358
 #: scripts/dpkg-mergechangelogs.pl:128 scripts/dpkg-mergechangelogs.pl:130
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
@@ -566,39 +566,39 @@ msgstr "Dateiname, Bereich und Priorität dürfen keine Leerzeichen enthalten"
 #: scripts/Dpkg/Source/Package/V2.pm:716
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:222
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:232 scripts/Dpkg/Source/Quilt.pm:56
-#: scripts/Dpkg/Source/Quilt.pm:65 scripts/Dpkg/Source/Quilt.pm:71
-#: scripts/Dpkg/Source/Quilt.pm:91
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:232 scripts/Dpkg/Source/Quilt.pm:58
+#: scripts/Dpkg/Source/Quilt.pm:67 scripts/Dpkg/Source/Quilt.pm:73
+#: scripts/Dpkg/Source/Quilt.pm:93
 #, perl-format
 msgid "cannot write %s"
 msgstr "%s kann nicht geschrieben werden"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:362
 msgid "open new files list file"
 msgstr "neue Dateienliste-Datei öffnen"
 
-#: scripts/dpkg-distaddfile.pl:92 scripts/dpkg-gencontrol.pl:369
+#: scripts/dpkg-distaddfile.pl:92 scripts/dpkg-gencontrol.pl:373
 msgid "copy old entry to new files list file"
 msgstr "alten Eintrag in neue Dateienlist-Datei kopieren"
 
-#: scripts/dpkg-distaddfile.pl:95 scripts/dpkg-gencontrol.pl:373
+#: scripts/dpkg-distaddfile.pl:95 scripts/dpkg-gencontrol.pl:377
 msgid "read old files list file"
 msgstr "alte Dateienliste-Datei lesen"
 
-#: scripts/dpkg-distaddfile.pl:98 scripts/dpkg-gencontrol.pl:383
+#: scripts/dpkg-distaddfile.pl:98 scripts/dpkg-gencontrol.pl:387
 msgid "write new entry to new files list file"
 msgstr "neuen Eintrag in neue Dateienliste-Datei schreiben"
 
-#: scripts/dpkg-distaddfile.pl:99 scripts/dpkg-gencontrol.pl:384
+#: scripts/dpkg-distaddfile.pl:99 scripts/dpkg-gencontrol.pl:388
 msgid "close new files list file"
 msgstr "neue Dateienliste-Datei schließen"
 
-#: scripts/dpkg-distaddfile.pl:101 scripts/dpkg-gencontrol.pl:385
+#: scripts/dpkg-distaddfile.pl:101 scripts/dpkg-gencontrol.pl:389
 msgid "install new files list file"
 msgstr "neue Dateienliste-Datei installieren"
 
-#: scripts/dpkg-distaddfile.pl:104 scripts/dpkg-gencontrol.pl:388
-#: scripts/dpkg-gencontrol.pl:405 scripts/dpkg-shlibdeps.pl:532
+#: scripts/dpkg-distaddfile.pl:104 scripts/dpkg-gencontrol.pl:392
+#: scripts/dpkg-gencontrol.pl:409 scripts/dpkg-shlibdeps.pl:532
 #: scripts/Dpkg/Interface/Storable.pm:91
 #: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
 #: scripts/Dpkg/Source/Package/V2.pm:594
@@ -778,8 +778,8 @@ msgstr "ursprüngliche Quell-Nachricht schreiben"
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
-#: scripts/dpkg-genchanges.pl:504 scripts/dpkg-gencontrol.pl:291
-#: scripts/dpkg-gencontrol.pl:294 scripts/Dpkg/Source/Package.pm:547
+#: scripts/dpkg-genchanges.pl:504 scripts/dpkg-gencontrol.pl:295
+#: scripts/dpkg-gencontrol.pl:298 scripts/Dpkg/Source/Package.pm:547
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "fehlende Informationen für Ausgabefeld %s"
@@ -832,33 +832,33 @@ msgstr ""
 msgid "illegal package name '%s': %s"
 msgstr "Ungültiger Paketname »%s«: %s"
 
-#: scripts/dpkg-gencontrol.pl:168
+#: scripts/dpkg-gencontrol.pl:172
 #, perl-format
 msgid "package %s not in control info"
 msgstr "Paket %s nicht in Steuer-Info"
 
-#: scripts/dpkg-gencontrol.pl:172 scripts/dpkg-gensymbols.pl:159
+#: scripts/dpkg-gencontrol.pl:176 scripts/dpkg-gensymbols.pl:159
 msgid "no package stanza found in control info"
 msgstr "kein package-Eintrag in Steuer-Info gefunden"
 
-#: scripts/dpkg-gencontrol.pl:174 scripts/dpkg-gensymbols.pl:161
+#: scripts/dpkg-gencontrol.pl:178 scripts/dpkg-gensymbols.pl:161
 #, perl-format
 msgid "must specify package since control info has many (%s)"
 msgstr "Paket muss angegeben werden, da Steuer-Info viele (%s) enthält"
 
-#: scripts/dpkg-gencontrol.pl:179
+#: scripts/dpkg-gencontrol.pl:183
 #, perl-format
 msgid "package %s: "
 msgstr "Paket %s: "
 
-#: scripts/dpkg-gencontrol.pl:204
+#: scripts/dpkg-gencontrol.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] "»%s« ist keine gültige Architektur-Zeichenkette."
 msgstr[1] "»%s« sind keine gültigen Architektur-Zeichenketten."
 
-#: scripts/dpkg-gencontrol.pl:210
+#: scripts/dpkg-gencontrol.pl:214
 #, perl-format
 msgid ""
 "current host architecture '%s' does not appear in package's architecture "
@@ -867,17 +867,17 @@ msgstr ""
 "aktuelle Host-Architektur »%s« erscheint nicht in der Architekturliste (%s) "
 "des Pakets"
 
-#: scripts/dpkg-gencontrol.pl:265
+#: scripts/dpkg-gencontrol.pl:269
 #, perl-format
 msgid "%s field of package %s: "
 msgstr "Feld %s von Paket %s: "
 
-#: scripts/dpkg-gencontrol.pl:269 scripts/dpkg-gencontrol.pl:277
+#: scripts/dpkg-gencontrol.pl:273 scripts/dpkg-gencontrol.pl:281
 #, perl-format
 msgid "error occurred while parsing %s field: %s"
 msgstr "Fehler beim Parsen von %s Feld: %s"
 
-#: scripts/dpkg-gencontrol.pl:282
+#: scripts/dpkg-gencontrol.pl:286
 #, perl-format
 msgid ""
 "the %s field contains an arch-specific dependency but the package is "
@@ -886,49 +886,49 @@ msgstr ""
 "das Feld %s enthält eine architekturspezifische Abhängigkeit, aber das Paket "
 "ist »architecture all«"
 
-#: scripts/dpkg-gencontrol.pl:306
+#: scripts/dpkg-gencontrol.pl:310
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr "%s Paket mit udeb-spezifischem Feld %s"
 
-#: scripts/dpkg-gencontrol.pl:318 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:322 scripts/dpkg-scansources.pl:313
 #: scripts/dpkg-shlibdeps.pl:838 scripts/Dpkg/Changelog/Parse.pm:138
 #: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:181
 #, perl-format
 msgid "cannot fork for %s"
 msgstr "fork kann für %s nicht ausgeführt werden"
 
-#: scripts/dpkg-gencontrol.pl:321
+#: scripts/dpkg-gencontrol.pl:325
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "chdir nach »%s« für du"
 
-#: scripts/dpkg-gencontrol.pl:323 scripts/dpkg-shlibdeps.pl:845
+#: scripts/dpkg-gencontrol.pl:327 scripts/dpkg-shlibdeps.pl:845
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, perl-format
 msgid "unable to execute %s"
 msgstr "%s konnte nicht ausgeführt werden"
 
-#: scripts/dpkg-gencontrol.pl:330
+#: scripts/dpkg-gencontrol.pl:334
 #, perl-format
 msgid "du in `%s'"
 msgstr "du in »%s«"
 
-#: scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-gencontrol.pl:336
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du lieferte unerwartete Ausgabe »%s«"
 
-#: scripts/dpkg-gencontrol.pl:371
+#: scripts/dpkg-gencontrol.pl:375
 msgid "close old files list file"
 msgstr "schließen der alten Dateienliste-Datei"
 
-#: scripts/dpkg-gencontrol.pl:396
+#: scripts/dpkg-gencontrol.pl:400
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "neue Ausgabe-Steuerdatei »%s« kann nicht geöffnet werden"
 
-#: scripts/dpkg-gencontrol.pl:407
+#: scripts/dpkg-gencontrol.pl:411
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "Ausgabe-Steurdatei »%s« kann nicht installiert werden"
@@ -1789,7 +1789,7 @@ msgstr "Quellen für eine rein-binäre Veröffentlichung werden gebaut"
 #: scripts/Dpkg/Source/Package/V2.pm:280 scripts/Dpkg/Source/Package/V2.pm:548
 #: scripts/Dpkg/Source/Package/V2.pm:692
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:229
-#: scripts/Dpkg/Source/Quilt.pm:197 scripts/Dpkg/Source/Quilt.pm:256
+#: scripts/Dpkg/Source/Quilt.pm:199 scripts/Dpkg/Source/Quilt.pm:258
 #, perl-format
 msgid "cannot read %s"
 msgstr "%s kann nicht gelesen werden"
@@ -2714,7 +2714,7 @@ msgstr "Zeile nach --- ist im Diff »%s« (Zeile %d) nicht wie erwartet"
 msgid "none of the filenames in ---/+++ are valid in diff '%s' (line %d)"
 msgstr "keine der Dateinamen in ---/+++ ist im Diff »%s« (Zeile %d) gültig"
 
-#: scripts/Dpkg/Source/Patch.pm:416 scripts/Dpkg/Source/Quilt.pm:270
+#: scripts/Dpkg/Source/Patch.pm:416 scripts/Dpkg/Source/Quilt.pm:272
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr "%s enthält einen unsicheren Pfad: %s"
@@ -2931,7 +2931,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "Fehler beim Umbenennen des gesicherten %s in %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:225
-#: scripts/Dpkg/Source/Quilt.pm:141
+#: scripts/Dpkg/Source/Quilt.pm:143
 #, perl-format
 msgid "applying %s"
 msgstr "%s wird angewandt"
@@ -3054,7 +3054,7 @@ msgstr "»%s« (neu angelegt) konnte nicht in »%s« umbenannt werden"
 #: scripts/Dpkg/Source/Package/V2.pm:590
 #: scripts/Dpkg/Source/Package/V3/native.pm:102
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:249
-#: scripts/Dpkg/Source/Quilt.pm:294
+#: scripts/Dpkg/Source/Quilt.pm:297
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "Berechtigung von »%s« kann nicht geändert werden"
@@ -3116,7 +3116,7 @@ msgstr "fehlende orig.tar- oder debian.tar-Datei in v2.0-Quellpaket"
 msgid "required removal of `%s' installed by original tarball"
 msgstr "erforderliche Entfernung von »%s«, installiert durch Original-Tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:243 scripts/Dpkg/Source/Quilt.pm:171
+#: scripts/Dpkg/Source/Package/V2.pm:243 scripts/Dpkg/Source/Quilt.pm:173
 #, perl-format
 msgid "unapplying %s"
 msgstr "Patch %s wird entfernt"
@@ -3209,7 +3209,7 @@ msgstr "%s kann nicht entfernt werden"
 
 #: scripts/Dpkg/Source/Package/V2.pm:588
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Quilt.pm:292
+#: scripts/Dpkg/Source/Quilt.pm:295
 #, perl-format
 msgid "failed to copy %s to %s"
 msgstr "Fehler beim Kopieren von %s nach %s"
@@ -3378,33 +3378,33 @@ msgstr "Symlink %s kann nicht angelegt werden"
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "nicht unterstützte Version der Quilt-Metadaten: %s"
 
-#: scripts/Dpkg/Source/Quilt.pm:52
+#: scripts/Dpkg/Source/Quilt.pm:54
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "Verzeichnis %s kann nicht angelegt werden"
 
-#: scripts/Dpkg/Source/Quilt.pm:151
+#: scripts/Dpkg/Source/Quilt.pm:153
 msgid "fuzz is not allowed when applying patches"
 msgstr "beim Anwenden von Patches ist keine Unschärfe erlaubt"
 
-#: scripts/Dpkg/Source/Quilt.pm:152
+#: scripts/Dpkg/Source/Quilt.pm:154
 #, perl-format
 msgid "if patch '%s' is correctly applied by quilt, use '%s' to update it"
 msgstr ""
 "falls Patch »%s« von Quilt korrekt angewandt wurde, verwenden Sie »%s« zum "
 "Aktualisieren"
 
-#: scripts/Dpkg/Source/Quilt.pm:210
+#: scripts/Dpkg/Source/Quilt.pm:212
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr "%s sollte ein Verzeichnis sein oder nicht existieren"
 
-#: scripts/Dpkg/Source/Quilt.pm:214
+#: scripts/Dpkg/Source/Quilt.pm:216
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr "%s sollte eine Datei sein oder nicht existieren"
 
-#: scripts/Dpkg/Source/Quilt.pm:264
+#: scripts/Dpkg/Source/Quilt.pm:266
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s); dpkg-"
@@ -3413,7 +3413,7 @@ msgstr ""
 "Die Seriendatei (%s) enthält nicht unterstützte Optionen (»%s«, Zeile %s), "
 "dpkg-source könnte beim Anwenden der Patches scheitern."
 
-#: scripts/Dpkg/Source/Quilt.pm:281
+#: scripts/Dpkg/Source/Quilt.pm:283
 #, perl-format
 msgid "restoring quilt backup files for %s"
 msgstr "Quilt-Sicherungskopiedatei für %s wird wiederhergestellt"
@@ -3423,17 +3423,17 @@ msgstr "Quilt-Sicherungskopiedatei für %s wird wiederhergestellt"
 msgid "bad line in substvars file %s at line %d"
 msgstr "ungültige Zeile in der substvars-Datei %s in Zeile %d"
 
-#: scripts/Dpkg/Substvars.pm:248
+#: scripts/Dpkg/Substvars.pm:249
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr "zu viele - rekursive? - Substitutionen in »%s«"
 
-#: scripts/Dpkg/Substvars.pm:255
+#: scripts/Dpkg/Substvars.pm:256
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr "unbekannte Substitutionsvariable ${%s}"
 
-#: scripts/Dpkg/Substvars.pm:279
+#: scripts/Dpkg/Substvars.pm:280
 #, perl-format
 msgid "unused substitution variable ${%s}"
 msgstr "unbenutzte Substitutionsvariable ${%s}"

scripts/po/dpkg-dev.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.6-1-g3aa48\n"
+"Project-Id-Version: dpkg 1.16.9\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-30 22:21+0200\n"
+"POT-Creation-Date: 2012-09-29 02:33+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"
@@ -430,7 +430,7 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:83 scripts/dpkg-gencontrol.pl:354
+#: scripts/dpkg-distaddfile.pl:83 scripts/dpkg-gencontrol.pl:358
 #: scripts/dpkg-mergechangelogs.pl:128 scripts/dpkg-mergechangelogs.pl:130
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
@@ -440,39 +440,39 @@ msgstr ""
 #: scripts/Dpkg/Source/Package/V2.pm:716
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:222
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:232 scripts/Dpkg/Source/Quilt.pm:56
-#: scripts/Dpkg/Source/Quilt.pm:65 scripts/Dpkg/Source/Quilt.pm:71
-#: scripts/Dpkg/Source/Quilt.pm:91
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:232 scripts/Dpkg/Source/Quilt.pm:58
+#: scripts/Dpkg/Source/Quilt.pm:67 scripts/Dpkg/Source/Quilt.pm:73
+#: scripts/Dpkg/Source/Quilt.pm:93
 #, perl-format
 msgid "cannot write %s"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:362
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:92 scripts/dpkg-gencontrol.pl:369
+#: scripts/dpkg-distaddfile.pl:92 scripts/dpkg-gencontrol.pl:373
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:95 scripts/dpkg-gencontrol.pl:373
+#: scripts/dpkg-distaddfile.pl:95 scripts/dpkg-gencontrol.pl:377
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:98 scripts/dpkg-gencontrol.pl:383
+#: scripts/dpkg-distaddfile.pl:98 scripts/dpkg-gencontrol.pl:387
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:99 scripts/dpkg-gencontrol.pl:384
+#: scripts/dpkg-distaddfile.pl:99 scripts/dpkg-gencontrol.pl:388
 msgid "close new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:101 scripts/dpkg-gencontrol.pl:385
+#: scripts/dpkg-distaddfile.pl:101 scripts/dpkg-gencontrol.pl:389
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:104 scripts/dpkg-gencontrol.pl:388
-#: scripts/dpkg-gencontrol.pl:405 scripts/dpkg-shlibdeps.pl:532
+#: scripts/dpkg-distaddfile.pl:104 scripts/dpkg-gencontrol.pl:392
+#: scripts/dpkg-gencontrol.pl:409 scripts/dpkg-shlibdeps.pl:532
 #: scripts/Dpkg/Interface/Storable.pm:91
 #: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
 #: scripts/Dpkg/Source/Package/V2.pm:594
@@ -616,8 +616,8 @@ msgstr ""
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:504 scripts/dpkg-gencontrol.pl:291
-#: scripts/dpkg-gencontrol.pl:294 scripts/Dpkg/Source/Package.pm:547
+#: scripts/dpkg-genchanges.pl:504 scripts/dpkg-gencontrol.pl:295
+#: scripts/dpkg-gencontrol.pl:298 scripts/Dpkg/Source/Package.pm:547
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -648,99 +648,99 @@ msgstr ""
 msgid "illegal package name '%s': %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:168
+#: scripts/dpkg-gencontrol.pl:172
 #, perl-format
 msgid "package %s not in control info"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:172 scripts/dpkg-gensymbols.pl:159
+#: scripts/dpkg-gencontrol.pl:176 scripts/dpkg-gensymbols.pl:159
 msgid "no package stanza found in control info"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:174 scripts/dpkg-gensymbols.pl:161
+#: scripts/dpkg-gencontrol.pl:178 scripts/dpkg-gensymbols.pl:161
 #, perl-format
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:179
+#: scripts/dpkg-gencontrol.pl:183
 #, perl-format
 msgid "package %s: "
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:204
+#: scripts/dpkg-gencontrol.pl:208
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/dpkg-gencontrol.pl:210
+#: scripts/dpkg-gencontrol.pl:214
 #, perl-format
 msgid ""
 "current host architecture '%s' does not appear in package's architecture "
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:265
+#: scripts/dpkg-gencontrol.pl:269
 #, perl-format
 msgid "%s field of package %s: "
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:269 scripts/dpkg-gencontrol.pl:277
+#: scripts/dpkg-gencontrol.pl:273 scripts/dpkg-gencontrol.pl:281
 #, perl-format
 msgid "error occurred while parsing %s field: %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:282
+#: scripts/dpkg-gencontrol.pl:286
 #, perl-format
 msgid ""
 "the %s field contains an arch-specific dependency but the package is "
 "architecture all"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:306
+#: scripts/dpkg-gencontrol.pl:310
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:318 scripts/dpkg-scansources.pl:313
+#: scripts/dpkg-gencontrol.pl:322 scripts/dpkg-scansources.pl:313
 #: scripts/dpkg-shlibdeps.pl:838 scripts/Dpkg/Changelog/Parse.pm:138
 #: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:181
 #, perl-format
 msgid "cannot fork for %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:321
+#: scripts/dpkg-gencontrol.pl:325
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:323 scripts/dpkg-shlibdeps.pl:845
+#: scripts/dpkg-gencontrol.pl:327 scripts/dpkg-shlibdeps.pl:845
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, perl-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:330
+#: scripts/dpkg-gencontrol.pl:334
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:332
+#: scripts/dpkg-gencontrol.pl:336
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:371
+#: scripts/dpkg-gencontrol.pl:375
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:396
+#: scripts/dpkg-gencontrol.pl:400
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:407
+#: scripts/dpkg-gencontrol.pl:411
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
@@ -1426,7 +1426,7 @@ msgstr ""
 #: scripts/Dpkg/Source/Package/V2.pm:280 scripts/Dpkg/Source/Package/V2.pm:548
 #: scripts/Dpkg/Source/Package/V2.pm:692
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:229
-#: scripts/Dpkg/Source/Quilt.pm:197 scripts/Dpkg/Source/Quilt.pm:256
+#: scripts/Dpkg/Source/Quilt.pm:199 scripts/Dpkg/Source/Quilt.pm:258
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
@@ -2261,7 +2261,7 @@ msgstr ""
 msgid "none of the filenames in ---/+++ are valid in diff '%s' (line %d)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:416 scripts/Dpkg/Source/Quilt.pm:270
+#: scripts/Dpkg/Source/Patch.pm:416 scripts/Dpkg/Source/Quilt.pm:272
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr ""
@@ -2475,7 +2475,7 @@ msgid "failed to rename saved %s to %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:225
-#: scripts/Dpkg/Source/Quilt.pm:141
+#: scripts/Dpkg/Source/Quilt.pm:143
 #, perl-format
 msgid "applying %s"
 msgstr ""
@@ -2584,7 +2584,7 @@ msgstr ""
 #: scripts/Dpkg/Source/Package/V2.pm:590
 #: scripts/Dpkg/Source/Package/V3/native.pm:102
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:249
-#: scripts/Dpkg/Source/Quilt.pm:294
+#: scripts/Dpkg/Source/Quilt.pm:297
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
@@ -2640,7 +2640,7 @@ msgstr ""
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:243 scripts/Dpkg/Source/Quilt.pm:171
+#: scripts/Dpkg/Source/Package/V2.pm:243 scripts/Dpkg/Source/Quilt.pm:173
 #, perl-format
 msgid "unapplying %s"
 msgstr ""
@@ -2725,7 +2725,7 @@ msgstr ""
 
 #: scripts/Dpkg/Source/Package/V2.pm:588
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Quilt.pm:292
+#: scripts/Dpkg/Source/Quilt.pm:295
 #, perl-format
 msgid "failed to copy %s to %s"
 msgstr ""
@@ -2886,38 +2886,38 @@ msgstr ""
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:52
+#: scripts/Dpkg/Source/Quilt.pm:54
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:151
+#: scripts/Dpkg/Source/Quilt.pm:153
 msgid "fuzz is not allowed when applying patches"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:152
+#: scripts/Dpkg/Source/Quilt.pm:154
 #, perl-format
 msgid "if patch '%s' is correctly applied by quilt, use '%s' to update it"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:210
+#: scripts/Dpkg/Source/Quilt.pm:212
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:214
+#: scripts/Dpkg/Source/Quilt.pm:216
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:264
+#: scripts/Dpkg/Source/Quilt.pm:266
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s); dpkg-"
 "source might fail when applying patches"
 msgstr ""
 
-#: scripts/Dpkg/Source/Quilt.pm:281
+#: scripts/Dpkg/Source/Quilt.pm:283
 #, perl-format
 msgid "restoring quilt backup files for %s"
 msgstr ""
@@ -2927,17 +2927,17 @@ msgstr ""
 msgid "bad line in substvars file %s at line %d"
 msgstr ""
 
-#: scripts/Dpkg/Substvars.pm:248
+#: scripts/Dpkg/Substvars.pm:249
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Substvars.pm:255
+#: scripts/Dpkg/Substvars.pm:256
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr ""
 
-#: scripts/Dpkg/Substvars.pm:279
+#: scripts/Dpkg/Substvars.pm:280
 #, perl-format
 msgid "unused substitution variable ${%s}"
 msgstr ""