The following commit has been merged in the master branch:
commit f7205f491c1f68a36f63d650eb780436f1fc7fe7
Author: Helge Kreutzmann <deb...@helgefjell.de>
Date:   Sun Jun 12 14:25:50 2011 +0200

    Update German translation of manual pages
    
    Update to 2029t1f0u.

diff --git a/man/po/de.po b/man/po/de.po
index e0d3193..220a8d1 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-06-07 09:25+0000\n"
-"PO-Revision-Date: 2011-06-07 11:41+0200\n"
+"POT-Creation-Date: 2011-06-12 12:02+0000\n"
+"PO-Revision-Date: 2011-06-12 14:18+0200\n"
 "Last-Translator: Helge Kreutzmann <deb...@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-ger...@lists.debian.org>\n"
 "Language: \n"
@@ -263,7 +263,7 @@ msgstr ""
 #: dpkg.1:768 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:252
 #: dpkg-deb.1:247 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
 #: dpkg-query.1:220 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:218
+#: dpkg-shlibdeps.1:326 dpkg-source.1:697 dpkg-split.1:218
 #: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
 #: update-alternatives.8:509
 #, no-wrap
@@ -1167,8 +1167,9 @@ msgid ""
 msgstr ""
 "Eine durch Komma separierte Liste von Funktionalitätsnamen, die vom "
 "Quellpaket für den Paketbau unterstützt werden. Derzeit ist die einzige "
-"unterstützte Funktionalität B<build-arch>. Dies erlaubt es Dpkg-buildpackage, 
"
-"die Ziele I<build-arch> oder I<build-indep> anstelle von I<build> aufzurufen."
+"unterstützte Funktionalität B<build-arch>. Dies erlaubt es Dpkg-"
+"buildpackage, die Ziele I<build-arch> oder I<build-indep> anstelle von "
+"I<build> aufzurufen."
 
 #. type: TP
 #: deb-src-control.5:115
@@ -1964,7 +1965,7 @@ msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 #: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:259 dpkg-distaddfile.1:47
 #: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
+#: dpkg-shlibdeps.1:331 dpkg-source.1:702 dselect.1:458
 #: start-stop-daemon.8:324 update-alternatives.8:495
 #, no-wrap
 msgid "AUTHORS"
@@ -1987,7 +1988,7 @@ msgstr "Copyright \\(co 2007 Frank Lichtenheld"
 #: dpkg-deb.1:257 dpkg-divert.8:139 dpkg-genchanges.1:154
 #: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
 #: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:219 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:228
+#: dpkg-query.1:219 dpkg-shlibdeps.1:341 dpkg-source.1:710 dpkg-split.1:228
 #: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:502
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -2758,14 +2759,14 @@ msgstr "Liste von Substitutionsvariablen und -werten."
 
 #. type: SH
 #: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:247 dpkg-deb.1:226
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:200 dselect.1:436
+#: dpkg-name.1:85 dpkg-source.1:694 dpkg-split.1:200 dselect.1:436
 #: update-alternatives.8:487
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:697
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2795,7 +2796,7 @@ msgstr "AUTOR"
 #. type: Plain text
 #: deb-substvars.5:163 dpkg-buildpackage.1:261 dpkg-distaddfile.1:49
 #: dpkg-deb.1:255 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:704
 #: dpkg-split.1:226
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright \\(co 1995-1996 Ian Jackson"
@@ -2803,7 +2804,7 @@ msgstr "Copyright \\(co 1995-1996 Ian Jackson"
 #. type: Plain text
 #: deb-substvars.5:165 dpkg-buildpackage.1:263 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:335 dpkg-source.1:706 dpkg-statoverride.8:90
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright \\(co 2000 Wichert Akkerman"
 
@@ -7442,7 +7443,7 @@ msgstr ""
 "B<fakeroot>(1), B<gpg>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:267 dpkg-source.1:712
+#: dpkg-buildpackage.1:267 dpkg-source.1:708
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2010 Rapha\\[:e]l Hertzog"
 
@@ -13440,7 +13441,7 @@ msgstr ""
 "wird das Paket als I<nativ> bezeichnet)."
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:560 dpkg-source.1:599
 msgid "B<Extracting>"
 msgstr "B<Extrahieren>"
 
@@ -13467,7 +13468,7 @@ msgstr ""
 "aber keine Dateien entfernen (leere Dateien bleiben zurück)."
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:571 dpkg-source.1:604
 msgid "B<Building>"
 msgstr "B<Bauen>"
 
@@ -13658,7 +13659,7 @@ msgstr ""
 "die Voreinstellung."
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:342 dpkg-source.1:519
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr "B<--abort-on-upstream-changes>"
@@ -13725,7 +13726,7 @@ msgstr ""
 "eine angeben, wird nur die letzte verwendet."
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:372 dpkg-source.1:529
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--skip-debianization>"
@@ -13948,47 +13949,38 @@ msgstr ""
 "automatischen Patches ignoriert."
 
 #. type: Plain text
-#: dpkg-source.1:474
-msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
-msgstr ""
-"Hinweis: B<dpkg-source> erwartet, dass alle Patches aus der Series-Datei auf "
-"dem Quellbaum angewandt wurden, wenn Sie das Quellpaket erstellen. Dies ist "
-"z.B. nicht der Fall, wenn der Quellbaum durch Entpacken eines Quellpakets im "
-"Format: 1.0 erhalten wurde. Um das Problem zu entschärfen, wird B<dpkg-"
-"source> die Patches selbst anwenden, falls es glaubt, dass sie noch nicht "
-"angewandt wurden. Um diese Situation zu erkennen, verwendet es die folgende "
-"Heuristik: Es findet die Liste der vermutlich noch nicht angewandten Patches "
+#: dpkg-source.1:469
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+"Hinweis: B<dpkg-source> B<--before-build> (und B<-b>) stellen sicher, dass "
+"alle in der Series-Datei aufgeführten Patches angewendet sind, so dss ein "
+"Paketbau immer mit allen angewandten Patches durchgeführt wird. Dies erfolgt, 
"
+"indem nicht angewandte Patches ermittelt werden "
 "(sie sind in der Datei B<series>, aber nicht in der Datei B<.pc/applied-"
 "patches> aufgeführt) und wenn der erste Patch in dem Satz ohne Fehler "
 "angewandt werden kann, werden sie alle angewandt. Die Option B<--no-"
-"preparation> kann zum Abschalten dieses Verhaltens verwandt werden. Dieser "
-"Ablauf passiert normalerweise als Teil des Befehls B<--prepare-build>."
+"preparation> kann zum Abschalten dieses Verhaltens verwandt werden."
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:471 dpkg-source.1:541 dpkg-source.1:580
 msgid "B<Build options>"
 msgstr "B<Bau-Optionen>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:471
 #, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--allow-version-of-quilt-db=>I<Version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:479
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -14003,13 +13995,13 @@ msgstr ""
 "ist. Die Version der Quilt-Metadaten wird in B<.pc/.version> gespeichert."
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:479
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--include-removal>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:483
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
@@ -14018,24 +14010,24 @@ msgstr ""
 "generierten Patch hinzu."
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:483
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr "B<--include-timestamp>"
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:486
 msgid "Include timestamp in the automatically generated patch."
 msgstr "Füge Zeitstempel zu dem automatisch generierten Patch hinzu."
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:486
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--include-binaries>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:491
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -14047,13 +14039,13 @@ msgstr ""
 "benötigt."
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:491
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--no-preparation>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:495
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
@@ -14062,41 +14054,43 @@ msgstr ""
 "Patches vorzubreiten."
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:495
 #, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<--single-debian-patch>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:506
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 "Verwende B<debian/patches/debian-changes> statt B<debian/patches/debian-"
 "changes->I<Version> als Namen für den während des Baus automatisch "
 "generierten Patch. Diese Option ist insbesondere nützlich, wenn das Paket in "
 "einem VCS betreut wird und ein Patch-Satz nicht zuverlässig erstellt werden "
 "kann. Stattdessen sollte der aktuelle Diff zu den Quellen der "
-"Originalautoren in einem einzelnen Patch gespeichert werden. Beim Verwenden "
-"dieser Option wird empfohlen, eine Datei debian/source/patch-header zu "
-"erstellen, in der erklärt wird, wie die Debian-Änderungen am besten "
+"Originalautoren in einem einzelnen Patch gespeichert werden. Diese Option "
+"sollte in B<debian/source/local-options> eingestellt werden und würde dann "
+"von einer Datei B<debian/source/local-patch-header> begleitet, "
+"in der erklärt wird, wie die Debian-Änderungen am besten "
 "begutachtet werden können, beispielsweise im eingesetzten VCS."
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:506
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr "B<--create-empty-orig>"
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:512
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -14109,31 +14103,28 @@ msgstr ""
 "Originalautoren ist und es keine »Haupt«-Software gibt."
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:512
 #, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--unapply-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:519
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
-"Entfernt die Patches im Hook B<--after-build>. Dies ist hauptsächlich "
-"nützlich, wenn Sie Ihr Paket direkt in einem VCS bauen, das die Quellen der "
-"Originalautoren ohne Patches enthält und in dem Sie den Baum ohne Patches "
-"behalten wollen, selbst nachdem ein Paket gebaut wurde. Diese Option kommt "
-"normalerweise in B<debian/source/local-options> (sie ist in B<debian/source/"
-"options> nicht erlaubt, so dass die erstellten Quellpakete standardmäßig das "
-"gleiche Verhalten zeigen)."
+"Entfernt die Patches im Hook B<--after-build>. Normalerweise benötigen Sie "
+"diese Option nicht, da Dpkg-source alle Patches automatisch entfernen wird, "
+"wenn es sie während B<--before-build> angewandt hatte. Diese Option ist 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:532
+#: dpkg-source.1:526
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -14147,36 +14138,36 @@ msgstr ""
 "erlaubt, kann aber in B<debian/source/local-options> verwandt werden."
 
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:529
 msgid "B<Extract options>"
 msgstr "B<Extrahierungs-Optionen>"
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:532
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 "Überspringt das Entpacken des Debian-Tarballs auf die Quellen der "
 "Originalautoren."
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:532
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:535
 msgid "Do not apply patches at the end of the extraction."
 msgstr "Wende am Ende der Extrahierung keine Patches an."
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:536
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr "Format: 3.0 (custom)"
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:539
 msgid ""
 "This format is particular. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
@@ -14185,7 +14176,7 @@ msgstr ""
 "zur Erstellung eines Quellpakets mit beliebigen Dateien verwandt werden."
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:545
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
 "source package. They must exist and are preferrably in the current "
@@ -14197,13 +14188,13 @@ msgstr ""
 "muss angegeben werden."
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:545
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--target-format=>I<Wert>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:550
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -14214,18 +14205,18 @@ msgstr ""
 "I<Format>-Feld enthalten."
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:551
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr "Format: 3.0 (git)"
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:553
 msgid "This format is experimental."
 msgstr "Dieses Format ist experimentell."
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:558
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -14237,7 +14228,7 @@ msgstr ""
 "aufführt."
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:564
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -14248,7 +14239,7 @@ msgstr ""
 "Git-Depots installiert."
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:569
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
@@ -14261,7 +14252,7 @@ msgstr ""
 "Alle anderen Zweige sind unter »remotes/origin/« verfügbar."
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:574 dpkg-source.1:607
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -14271,7 +14262,7 @@ msgstr ""
 "(»uncommitted«) Änderungen vorliegen."
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:578
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
@@ -14281,13 +14272,13 @@ msgstr ""
 "einbezogen."
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:580
 #, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--git-ref=>I<Referenz>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:590
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -14308,13 +14299,13 @@ msgstr ""
 "ref=^private."
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:590
 #, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--git-depth=>I<Zahl>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:594
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
@@ -14323,13 +14314,13 @@ msgstr ""
 "Anzahl an Revisionen abgeschnitten wird."
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:594
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr "Format: 3.0 (bzr)"
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:597
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
@@ -14338,7 +14329,7 @@ msgstr ""
 "das Bzr-Depot enthält."
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:602
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
@@ -14346,7 +14337,7 @@ msgstr ""
 "auszuchecken."
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:611
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -14359,21 +14350,21 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:611
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr "WARNUNGEN UND FEHLER"
 
 # type: SS
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:612
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr "kein Quellformat in debian/source/format angegeben"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:618
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -14389,7 +14380,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:624
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -14406,14 +14397,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:624
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr "der Diff verändert die folgenden Dateien der Originalautoren"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:631
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -14431,14 +14422,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:631
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr "kann Änderungen an I<Datei> nicht darstellen"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:637
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -14455,14 +14446,14 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:637
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr "neu angelegte leere Datei I<Datei> wird im Diff nicht dargestellt 
werden"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:640
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
@@ -14473,21 +14464,21 @@ msgstr ""
 
 # type: SS
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:640
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr "ausführbarer Modus I<Rechte> von I<Datei> wird nicht im Diff 
dargestellt werden"
 
 # type: SS
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:641
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr "besonderer Modus I<Rechte> von I<Datei> wird nicht im Diff dargestellt 
werden"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:645
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
@@ -14497,19 +14488,19 @@ msgstr ""
 "an diese Tatsache."
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:645
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr "DATEIFORMATE"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:646
 #, no-wrap
 msgid "debian/source/format"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:650
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -14520,13 +14511,13 @@ msgstr ""
 "Leerzeichen am Zeilenanfang oder -ende sind nicht erlaubt."
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:650
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "debian/source/include-binaries"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:654
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -14539,14 +14530,14 @@ msgstr ""
 "werden übersprungen. Leere Zeilen werden ignoriert."
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:654
 #, no-wrap
 msgid "debian/source/options"
 msgstr "debian/source/options"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:660
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -14560,7 +14551,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:666
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -14575,7 +14566,7 @@ msgstr ""
 "ist ein Beispiel für so eine Datei:"
 
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:672
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -14593,7 +14584,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:675
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
@@ -14602,14 +14593,14 @@ msgstr ""
 "sollten stattdessen B<debian/source/format> verwenden."
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:675
 #, no-wrap
 msgid "debian/source/local-options"
 msgstr "debian/source/local-options"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:680
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -14622,29 +14613,37 @@ msgstr ""
 "bestimmtes VCS, in dem das Paket gewartet wird, gebunden sind."
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:680
+#, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "debian/source/local-patch-header"
+
+#. type: SS
+#: dpkg-source.1:681
 #, no-wrap
 msgid "debian/source/patch-header"
 msgstr "debian/source/patch-header"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:685
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 "Formloser Text, der an den Anfang des in den Formaten »2.0« und »3.0 "
-"(quilt)« generierten automatischen Patches gestellt wird."
+"(quilt)« generierten automatischen Patches gestellt wird. "
+"B<local-patch-header> wird dem erstellen Quellpaket nicht hinzugefügt, "
+"B<patch-header> dagegen schon."
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:685
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:694
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -14666,7 +14665,7 @@ msgstr ""
 "bis zum Zeilenende geht) können optionale Quilt-Befehle folgen."
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:701
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
@@ -18532,6 +18531,34 @@ msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+#~ msgid ""
+#~ "Note: B<dpkg-source> expects the source tree to have all patches listed "
+#~ "in the series file applied when you generate the source package.  This is "
+#~ "not the case when the source tree has been obtained by unpacking a source "
+#~ "package using the Format: 1.0 for instance. To mitigate the problem, "
+#~ "B<dpkg-source> will apply the patches by itself if it believes that they "
+#~ "have not yet been applied. To detect this situation, it uses the "
+#~ "following heuristic: it finds the list of supposedly unapplied patches "
+#~ "(they are listed in the B<series> file but not in B<.pc/applied-"
+#~ "patches>), and if the first patch in that set can be applied without "
+#~ "errors, it will apply them all.  The option B<--no-preparation> can be "
+#~ "used to disable this behaviour. This operation is usually done as part of "
+#~ "the B<--prepare-build> command."
+#~ msgstr ""
+#~ "Hinweis: B<dpkg-source> erwartet, dass alle Patches aus der Series-Datei "
+#~ "auf dem Quellbaum angewandt wurden, wenn Sie das Quellpaket erstellen. "
+#~ "Dies ist z.B. nicht der Fall, wenn der Quellbaum durch Entpacken eines "
+#~ "Quellpakets im Format: 1.0 erhalten wurde. Um das Problem zu entschärfen, "
+#~ "wird B<dpkg-source> die Patches selbst anwenden, falls es glaubt, dass "
+#~ "sie noch nicht angewandt wurden. Um diese Situation zu erkennen, "
+#~ "verwendet es die folgende Heuristik: Es findet die Liste der vermutlich "
+#~ "noch nicht angewandten Patches (sie sind in der Datei B<series>, aber "
+#~ "nicht in der Datei B<.pc/applied-patches> aufgeführt) und wenn der erste "
+#~ "Patch in dem Satz ohne Fehler angewandt werden kann, werden sie alle "
+#~ "angewandt. Die Option B<--no-preparation> kann zum Abschalten dieses "
+#~ "Verhaltens verwandt werden. Dieser Ablauf passiert normalerweise als Teil "
+#~ "des Befehls B<--prepare-build>."
+
 #~ msgid "2010-11-22"
 #~ msgstr "2010-11-22"
 
@@ -18773,32 +18800,6 @@ msgstr ""
 #~ "auf einen Wert gesetzt, der für Cross-Kompilierung geeignet ist (»/usr/"
 #~ "I<gnu-system-type>/lib/pkgconfig/:/usr/share/pkgconfig«)."
 
-#~ msgid ""
-#~ "Note: B<dpkg-source> expects the source tree to have all patches listed "
-#~ "in the series file applied when you generate the source package.  This is "
-#~ "not the case when the source tree has been obtained by unpacking a source "
-#~ "package using the Format: 1.0 for instance. To mitigate the problem, "
-#~ "B<dpkg-source> will apply the patches by itself if it believes that they "
-#~ "have not yet been applied. To detect this situation, it uses the "
-#~ "following heuristic: it finds the list of supposedly unapplied patches "
-#~ "(they are listed in the B<series> file but not in B<.pc/applied-"
-#~ "patches>), and if the first patch in that set can be applied without "
-#~ "errors, it will apply them all.  The option B<--no-preparation> can be "
-#~ "used to disable this behaviour."
-#~ msgstr ""
-#~ "Hinweis: B<dpkg-source> erwartet, dass alle Patches aus der Series-Datei "
-#~ "auf dem Quellbaum angewandt wurden, wenn Sie das Quellpaket erstellen. "
-#~ "Dies ist z.B. nicht der Fall, wenn der Quellbaum durch Entpacken eines "
-#~ "Quellpakets im Format: 1.0 erhalten wurde. Um das Problem zu entschärfen, "
-#~ "wird B<dpkg-source> die Patches selbst anwenden, falls es glaubt, dass "
-#~ "sie noch nicht angewandt wurden. Um diese Situation zu erkennen, "
-#~ "verwendet es die folgende Heuristik: Es findet die Liste der vermutlich "
-#~ "noch nicht angewandten Patches (sie sind in der Datei B<series>, aber "
-#~ "nicht in der Datei B<.pc/applied-patches> aufgeführt) und wenn der erste "
-#~ "Patch in dem Satz ohne Fehler angewandt werden kann, werden sie alle "
-#~ "angewandt. Die Option B<--no-preparation> kann zum Abschalten dieses "
-#~ "Verhaltens verwandt werden."
-
 #~ msgid "[I<tag:>] I<library> I<version> I<dependencies>"
 #~ msgstr "[I<Markierung:>] I<Bibliothek> I<Version> I<Abhängigkeiten>"
 

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to