* doc/apt-key.8.xml, doc/apt-mark.8.xml,

  doc/apt_preferences.5.xml:
  - review and fix spelling issues

1 files changed, 79 insertions, 54 deletions

diff --git a/doc/po/de.po b/doc/po/de.po
index 4a7cd414b..6aaa83a35 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-04 16:28+0300\n"
+"POT-Creation-Date: 2012-06-06 14:56+0300\n"
 "PO-Revision-Date: 2012-05-21 23:18+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -3220,7 +3220,7 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
 "Ignore-Files-Silently</literal> configuration list - in this case it will be "
 "silently ignored."
 msgstr ""
@@ -5230,15 +5230,25 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "Several versions of a package may be available for installation when the "
+#| "&sources-list; file contains references to more than one distribution "
+#| "(for example, <literal>stable</literal> and <literal>testing</literal>).  "
+#| "APT assigns a priority to each version that is available.  Subject to "
+#| "dependency constraints, <command>apt-get</command> selects the version "
+#| "with the highest priority for installation.  The APT preferences file "
+#| "overrides the priorities that APT assigns to package versions by default, "
+#| "thus giving the user control over which one is selected for installation."
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
 "example, <literal>stable</literal> and <literal>testing</literal>).  APT "
 "assigns a priority to each version that is available.  Subject to dependency "
 "constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation.  The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation.  The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
 msgstr ""
 "Es könnten mehrere Versionen eines Pakets zur Installation verfügbar sein, "
 "wenn die Datei &sources-list; Bezüge zu mehr als einer Distribution enthält "
@@ -5252,12 +5262,19 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "Several instances of the same version of a package may be available when "
+#| "the &sources-list; file contains references to more than one source.  In "
+#| "this case <command>apt-get</command> downloads the instance listed "
+#| "earliest in the &sources-list; file.  The APT preferences file does not "
+#| "affect the choice of instance, only the choice of version."
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
 "case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file.  The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file.  The APT preferences do not affect the choice of "
+"instance, only the choice of version."
 msgstr ""
 "Es könnten mehrere Instanzen der gleichen Version eines Paketes verfügbar "
 "sein, wenn die Datei &sources-list; Bezüge zu mehr als einer Distribution "
@@ -5271,13 +5288,13 @@ msgstr ""
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages.  Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs.  Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases.  You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages.  Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs.  Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases.  You have been warned."
 msgstr ""
 "Eigenschaften sind in der Hand eines Systemadministrator ein große Stärke, "
 "können aber auch sein größter Albtraum werden, wenn sie unvorsichtig benutzt "
@@ -5298,7 +5315,7 @@ msgid ""
 "following naming convention: The files have either no or \"<literal>pref</"
 "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
+"that it has ignored a file, unless that file matches a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
 "case it will be silently ignored."
 msgstr ""
@@ -5377,7 +5394,7 @@ msgstr "Priorität 1"
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
 "<literal>experimental</literal> archive."
 msgstr ""
 "zu den Versionen, die von Archiven kommen, die in deren <filename>Release</"
@@ -5395,7 +5412,7 @@ msgstr "Priorität 100"
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
 "backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
 "zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu "
@@ -5571,10 +5588,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
+#, fuzzy
+#| msgid ""
+#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
+#| "specified packages and specified version or version range.  For example, "
+#| "the following record assigns a high priority to all versions of the "
+#| "<filename>perl</filename> package whose version number begins with "
+#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-"specified packages and specified version or version range.  For example, the "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range.  For example, "
+"the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
 "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgstr ""
@@ -5727,42 +5751,42 @@ msgstr ""
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
 msgstr ""
 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
 "gehören, deren Archivname »<literal>stable</literal>« und deren Release-"
-"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
+"Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr "Reguläre Ausdrücke und glob()-Syntax"
+msgid "Regular expressions and &glob; syntax"
+msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:264
 msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a &glob;"
+"-like expression) or contains the word kde (as a POSIX extended regular "
 "expression surrounded by slashes)."
 msgstr ""
-"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
+"APT unterstützt außerdem Pinning mittels &glob;-Ausdrücken und regulären "
 "Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
 "beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
-"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
+"denen der Name mit »gnome« beginnt (wie ein &glob;-artiger Ausdruck) oder "
 "das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
 "von Schrägstrichen umschlossen wird)."
 
@@ -5783,7 +5807,7 @@ msgstr ""
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
 msgstr ""
 "Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
 "wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen "
@@ -5794,11 +5818,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 "Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5807,9 +5831,9 @@ msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
 "of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
 "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
-"Package field is not considered a glob() expression in itself."
+"Package field is not considered a &glob; expression in itself."
 msgstr ""
 "Falls ein regulärer Ausdruck in einem <literal>Package</literal>-Feld "
 "vorkommt, ist das Verhalten dasselbe, als wenn der reguläre Ausdruck durch "
@@ -5817,7 +5841,7 @@ msgstr ""
 "nicht entschieden, wie sich dies in Zukunft ändern wird, daher sollten Sie "
 "immer zuerst Platzhalter-Pins auflisten, so dass es später spezielle Pins "
 "außer Kraft setzen können. Das Muster »<literal>*</literal>« in einem "
-"»Package«-Feld wird selbst nicht als ein glob()-Ausdruck angesehen."
+"»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:307
@@ -6149,29 +6173,30 @@ msgstr "Pin: release n=&testing-codename;\n"
 #: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
-"belong to Debian release version 3.0.  Note that there is normally no "
-"version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet.  Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;.  Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet.  Specifying this in the APT preferences file would require one "
+"of the following lines."
 msgstr ""
 "benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur "
-"Debian-Release-Version 3.0 gehören. Beachten Sie, dass es normalerweise "
-"keine Versionsnummer für <literal>testing</literal>- und <literal>unstable</"
-"literal>-Distributionen gibt, weil sie noch nicht veröffentlicht wurden. "
-"Diese in der APT-Einstellungsdatei anzugeben würde eine der folgenden Zeilen "
-"benötigen:"
+"Debian-Release-Version &stable-version; gehören. Beachten Sie, dass es "
+"normalerweise keine Versionsnummer für <literal>testing</literal>- und "
+"<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht "
+"veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde "
+"eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
 msgstr ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:480
@@ -6635,8 +6660,8 @@ msgid ""
 "the regular <filename>sources.list</filename> file.  File names need to end "
 "with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
 "configuration list - in this case it will be silently ignored."
 msgstr ""
 "Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine "