Merge branch 'cherry-pick-german' into sid

The German translation was updated on master, before it was announced that
they should be committed to the sid branch. To avoid further breakage when
merging the files, the changes from master has been cherry-picked over to
sid via a topic branch.

man/po/de.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
 "POT-Creation-Date: 2010-08-21 20:15+0300\n"
-"PO-Revision-Date: 2010-07-26 18:44+0200\n"
+"PO-Revision-Date: 2010-07-29 19:28+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
@@ -282,10 +282,9 @@ msgstr "deb-control"
 
 #. type: TH
 #: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, fuzzy, no-wrap
-#| msgid "2010-01-28"
+#, no-wrap
 msgid "2010-07-29"
-msgstr "2010-01-28"
+msgstr "2010-07-29"
 
 #. type: Plain text
 #: deb-control.5:6
@@ -771,13 +770,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.5:205
-#, fuzzy
-#| msgid ""
-#| "The syntax of B<Conflicts>, B<Replaces> and B<Provides> is a list of "
-#| "package names, separated by commas (and optional whitespace).  In the "
-#| "B<Conflicts> field, the comma should be read as `OR'. An optional version "
-#| "can also be given with the same syntax as above for the B<Conflicts> and "
-#| "B<Replaces> fields."
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -785,10 +777,10 @@ msgid ""
 "optional version can also be given with the same syntax as above for the "
 "B<Breaks>, B<Conflicts> and B<Replaces> fields."
 msgstr ""
-"Die Syntax von B<Conflicts>, B<Replaces> und B<Provides> ist eine Liste von "
+"Die Syntax von B<Breaks>, B<Conflicts>, B<Replaces> und B<Provides> ist eine Liste von "
 "Paketnamen, getrennt durch Kommata (und optionalen Leerzeichen). Im "
-"B<Conflicts>-Feld sollte das Komma als »ODER« gelesen werden. Eine optionale "
-"Version kann auch mit der gleichen Syntax wie oben für die B<Conflicts>- und "
+"B<Breaks>- und B<Conflicts>-Feld sollte das Komma als »ODER« gelesen werden. Eine optionale "
+"Version kann auch mit der gleichen Syntax wie oben für die B<Breaks>-, B<Conflicts>- und "
 "B<Replaces>-Felder angegeben werden."
 
 #. type: SH
@@ -5722,14 +5714,6 @@ msgstr "B<--export=>I<Format>"
 
 #. type: Plain text
 #: dpkg-buildflags.1:48
-#, fuzzy
-#| msgid ""
-#| "Print to standard output shell (if I<format> is B<sh>) or make (if "
-#| "I<format> is B<make>) commands that can be used to export all the "
-#| "compilation flags in the environment. If the I<format> value is not "
-#| "given, B<sh> is assumed. Only compilations flags starting with an upper "
-#| "case character are included, others are assumed to not be suitable for "
-#| "the environment."
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
@@ -6209,7 +6193,7 @@ msgstr ""
 #: dpkg-buildpackage.1:67
 #, no-wrap
 msgid "B<-F>"
-msgstr ""
+msgstr "B<-F>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:71
@@ -6217,6 +6201,9 @@ msgid ""
 "Specifies a normal full build, binary and source packages will be built.  "
 "This is the same as the default case when no build option is specified."
 msgstr ""
+"Spezifiziert einen normalen kompletten Bau, Binär- und Quellpakete werden "
+"gebaut. Dies ist identisch zum Standardfall, wenn keine Bauoption "
+"spezifiziert wird."
 
 #. type: Plain text
 #: dpkg-buildpackage.1:73

scripts/po/de.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: dpkg-scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2010-08-21 20:15+0200\n"
-"PO-Revision-Date: 2010-07-26 18:13+0200\n"
+"PO-Revision-Date: 2010-07-29 18:49+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -209,61 +209,7 @@ msgstr ""
 "Copyright (C) 2007 Frank Lichtenheld."
 
 #: scripts/dpkg-buildpackage.pl:52
-#, fuzzy, perl-format
-#| msgid ""
-#| "\n"
-#| "Usage: %s [<options> ...]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -r<gain-root-command>\n"
-#| "                 command to gain root privileges (default is fakeroot).\n"
-#| "  -R<rules>      rules file to execute (default is debian/rules).\n"
-#| "  -p<sign-command>\n"
-#| "  -d             do not check build dependencies and conflicts.\n"
-#| "  -D             check build dependencies and conflicts.\n"
-#| "  -T<target>     call debian/rules <target> with the proper environment\n"
-#| "  --as-root      ensure -T calls the target with root rights\n"
-#| "  -j[<number>]   specify jobs to run simultaneously } passed to debian/"
-#| "rules\n"
-#| "  -k<keyid>      the key to use for signing.\n"
-#| "  -sgpg          the sign-command is called like GPG.\n"
-#| "  -spgp          the sign-command is called like PGP.\n"
-#| "  -us            unsigned source.\n"
-#| "  -uc            unsigned changes.\n"
-#| "  -a<arch>       Debian architecture we build for (implies -d).\n"
-#| "  -b             binary-only, do not build source.   } also passed to\n"
-#| "  -B             binary-only, no arch-indep files.   } dpkg-genchanges\n"
-#| "  -A             binary-only, only arch-indep files. }\n"
-#| "  -S             source only, no binary files.     }\n"
-#| "  -t<system>     set GNU system type.           } passed to dpkg-"
-#| "architecture\n"
-#| "  -v<version>    changes since version <version>.      }\n"
-#| "  -m<maint>      maintainer for package is <maint>.    }\n"
-#| "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
-#| "  -C<descfile>   changes are described in <descfile>.  } to dpkg-"
-#| "genchanges\n"
-#| "  -si (default)  src includes orig if new upstream.    }\n"
-#| "  -sa            uploaded src always includes orig.    }\n"
-#| "  -sd            uploaded src is diff and .dsc only.   }\n"
-#| "  -sn            force Debian native source format.      }\n"
-#| "  -s[sAkurKUR]   see dpkg-source for explanation.        } only passed\n"
-#| "  -z<level>      compression level of source             } to dpkg-"
-#| "source\n"
-#| "  -Z<compressor> compression to use for source           }\n"
-#| "  -nc            do not clean source tree (implies -b).\n"
-#| "  -tc            clean source tree when finished.\n"
-#| "  -ap            add pause before starting signature process.\n"
-#| "  -i[<regex>]    ignore diffs of files matching regex.    } only passed\n"
-#| "  -I[<pattern>]  filter out files when building tarballs. } to dpkg-"
-#| "source\n"
-#| "  --source-option=<opt>\n"
-#| "\t\t pass option <opt> to dpkg-source\n"
-#| "  --changes-option=<opt>\n"
-#| "\t\t pass option <opt> to dpkg-genchanges\n"
-#| "  --admindir=<directory>\n"
-#| "                 change the administrative directory.\n"
-#| "  -h, --help     show this help message.\n"
-#| "      --version  show the version.\n"
+#, perl-format
 msgid ""
 "\n"
 "Usage: %s [<options> ...]\n"
@@ -343,6 +289,7 @@ msgstr ""
 "  -B             nur binär, keine arch-indep-Dateien. } dpkg-genchanges\n"
 "  -A             nur binär, nur arch-indep-Dateien.   }\n"
 "  -S             nur Quellen, keine Binärdateien.     }\n"
+"  -F             normaler kompletter Bau (Binärdateien und Quellen).\n"
 "  -t<System>     GNU-Systemtyp setzen.                } weitergegeben an \n"
 "                                                        dpkg-architecture\n"
 "  -v<Version>    Änderungen seit Version <Version>.   }\n"