merge the german translations from lp:~mvo/apt/debian-sid

* remerge the de-manpage in as it has some Ümläüte problems
* fixing the buildprocess for de by adding some boilerplate addendums
* correcting some syntaxbreaking typos and rebuild all manpage langs

1 files changed, 45 insertions, 46 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 4f52ceda1..79f901e97 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-10-19 21:56+0300\n"
+"POT-Creation-Date: 2009-10-29 14:19+0100\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"
@@ -284,7 +284,7 @@ msgstr ""
 msgid ""
 "<!ENTITY dpkg \"<citerefentry>\n"
 "    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
+"    <manvolnum>1</manvolnum>\n"
 "  </citerefentry>\"\n"
 ">\n"
 msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
 msgid ""
 "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
 "    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
+"    <manvolnum>1</manvolnum>\n"
 "  </citerefentry>\"\n"
 ">\n"
 msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
 msgid ""
 "<!ENTITY dpkg-scansources \"<citerefentry>\n"
 "    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
+"    <manvolnum>1</manvolnum>\n"
 "  </citerefentry>\"\n"
 ">\n"
 msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
 msgid ""
 "<!ENTITY dselect \"<citerefentry>\n"
 "    <refentrytitle><command>dselect</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
+"    <manvolnum>1</manvolnum>\n"
 "  </citerefentry>\"\n"
 ">\n"
 msgstr ""
@@ -983,7 +983,7 @@ msgstr ""
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
-"packages may be in evidence if a full distribution is not accessed, or if a "
+"packages may be an evidence if a full distribution is not accessed, or if a "
 "package (real or virtual) has been dropped from the distribution. Usually "
 "they are referenced from Conflicts or Breaks statements."
 msgstr ""
@@ -1809,7 +1809,7 @@ msgstr ""
 #: apt-extracttemplates.1.xml:62
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
-"config scripts Configuration Item: "
+"config scripts.  Configuration Item: "
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 
@@ -2027,8 +2027,8 @@ msgstr ""
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
-"directories are prepended to certain relative paths defined in later "
-"sections to produce a complete an absolute path."
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2977,7 +2977,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:266
 msgid ""
-"If the <option>--compile</option> options is specified then the package will "
+"If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 "<option>--download-only</option> is specified then the source package will "
 "not be unpacked."
@@ -3195,8 +3195,8 @@ msgstr ""
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages with and empty set of square brackets meaning "
-"breaks that are of no consequence (rare)."
+"indicate broken packages and empty set of square brackets meaning breaks "
+"that are of no consequence (rare)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3938,7 +3938,7 @@ msgid ""
 "different steps. <command>apt-secure</command> is the last step in this "
 "chain, trusting an archive does not mean that the packages that you trust it "
 "do not contain malicious code but means that you trust the archive "
-"maintainer. Its the archive maintainer responsibility to ensure that the "
+"maintainer. It's the archive maintainer responsibility to ensure that the "
 "archive integrity is correct."
 msgstr ""
 
@@ -3969,8 +3969,8 @@ msgid ""
 "maintainer signature is stripped off, an MD5 sum of the package is computed "
 "and put in the Packages file. The MD5 sum of all of the packages files are "
 "then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year and distributed through the "
-"FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year) and distributed through "
+"the FTP server. This key is also on the Debian keyring."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4058,7 +4058,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:160
 msgid ""
-"<literal>Create a toplevel Release file</literal>.  if it does not exist "
+"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
 "release</command> (provided in apt-utils)."
 msgstr ""
@@ -4066,14 +4066,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:165
 msgid ""
-"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs "
+"-o Release.gpg Release</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:168
 msgid ""
-"<literal>Publish the key fingerprint</literal>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
 "archive."
 msgstr ""
@@ -4211,9 +4211,9 @@ msgstr ""
 #: apt.conf.5.xml:50
 msgid ""
 "The configuration file is organized in a tree with options organized into "
-"functional groups. option specification is given with a double colon "
+"functional groups. Option specification is given with a double colon "
 "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. options do not inherit from "
+"within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
 
@@ -4224,13 +4224,13 @@ msgid ""
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between "
 "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.  "
-"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal> "
-"The trailing semicolon and the quotes are required. The value must be on one "
-"line, and there is no kind of string concatenation. It must not include "
-"inside quotes.  The behavior of the backslash \"\\\" and escaped characters "
-"inside a value is undefined and it should not be used. An option name may "
-"include alphanumerical characters and the \"/-:._+\" characters. A new scope "
-"can be opened with curly braces, like:"
+"Each line is of the form <literal>APT::Get::Assume-Yes "
+"\"true\";</literal>. The trailing semicolon and the quotes are required. The "
+"value must be on one line, and there is no kind of string concatenation. It "
+"must not include inside quotes.  The behavior of the backslash \"\\\" and "
+"escaped characters inside a value is undefined and it should not be used. An "
+"option name may include alphanumerical characters and the \"/-:._+\" "
+"characters. A new scope can be opened with curly braces, like:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -4611,7 +4611,7 @@ msgstr ""
 #: apt.conf.5.xml:267
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2)  "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
 "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
 "indicating how many outstanding requests APT should send. A value of zero "
 "MUST be specified if the remote host does not properly linger on TCP "
@@ -5123,10 +5123,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:539
 msgid ""
-"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers then this flag is present unless it is "
-"explicit called to do so in an extra call.  Note that this option exists "
+"short: dpkg will not run the triggers when this flag is present unless it is "
+"explicitly called to do so in an extra call.  Note that this option exists "
 "(undocumented) also in older apt versions with a slightly different meaning: "
 "Previously these option only append --no-triggers to the configure calls to "
 "dpkg - now apt will add these flag also to the unpack and remove calls."
@@ -5147,9 +5147,9 @@ msgid ""
 "to be configured before another package can be unpacked (Pre-Depends) and "
 "let the rest configure by dpkg with a call generated by the next "
 "option. \"<literal>no</literal>\" on the other hand will not configure "
-"anything and totally relay on dpkg for configuration (which will at the "
+"anything and totally rely on dpkg for configuration (which will at the "
 "moment fail if a Pre-Depends is encountered).  Setting this option to "
-"another than the all value will implicit activate also the next option per "
+"another than the all value will implicitly activate also the next option per "
 "default as otherwise the system could end in an unconfigured status which "
 "could be unbootable!"
 msgstr ""
@@ -5167,8 +5167,8 @@ msgid ""
 "triggers. This option is activated automatic per default if the previous "
 "option is not set to <literal>all</literal>, but deactivating could be "
 "useful if you want to run APT multiple times in a row - e.g. in an "
-"installer. In this sceneries you could deactivate this option in all but the "
-"last run."
+"installer. In these sceneries you could deactivate this option in all but "
+"the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -6552,7 +6552,7 @@ msgid ""
 "The package resource list is used to locate archives of the package "
 "distribution system in use on the system. At this time, this manual page "
 "documents only the packaging system used by the Debian GNU/Linux system.  "
-"This control file is located in <filename>/etc/apt/sources.list</filename>"
+"This control file is <filename>/etc/apt/sources.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6562,7 +6562,7 @@ msgid ""
 "variety of source media. The file lists one source per line, with the most "
 "preferred source listed first. The format of each line is: <literal>type uri "
 "args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
 "Identifier (URI), which is a superset of the more specific and well-known "
 "Universal Resource Locator, or URL. The rest of the line can be marked as a "
 "comment by using a #."
@@ -6598,7 +6598,7 @@ msgid ""
 "<literal>stable</literal> <literal>unstable</literal> or "
 "<literal>testing</literal> while component is one of <literal>main</literal> "
 "<literal>contrib</literal> <literal>non-free</literal> or "
-"<literal>non-us</literal> The <literal>deb-src</literal> type describes a "
+"<literal>non-us</literal>. The <literal>deb-src</literal> type describes a "
 "debian distribution's source code in the same form as the "
 "<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
 "to fetch source indexes."
@@ -6608,7 +6608,7 @@ msgstr ""
 #: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types are:"
+"<literal>deb</literal> and <literal>deb-src</literal> types is:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6624,8 +6624,8 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when only a particular sub-section of the "
-"archive denoted by the URI is of interest.  If "
+"a slash (/). This is useful for when the case only a particular sub-section "
+"of the archive denoted by the URI is of interest.  If "
 "<literal>distribution</literal> does not specify an exact path, at least one "
 "<literal>component</literal> must be present."
 msgstr ""
@@ -6713,7 +6713,7 @@ msgid ""
 "variable <envar>http_proxy</envar> is set with the format "
 "http://server:port/, the proxy server specified in <envar>http_proxy</envar> "
 "will be used. Users of authenticated HTTP/1.1 proxies may use a string of "
-"the format http://user:pass@server:port/ Note that this is an insecure "
+"the format http://user:pass@server:port/.  Note that this is an insecure "
 "method of authentication."
 msgstr ""
 
@@ -6854,9 +6854,8 @@ msgstr ""
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in "
-"<filename>sources.list</filename>.  a single FTP session will be used for "
-"both resource lines."
+"well as the one in the previous example in <filename>sources.list</filename> "
+"a single FTP session will be used for both resource lines."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>