fix three typos in sources & manpages

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 60f8c28830eb0a8cbe0786e5bc6c054f2e06798d..ed49ac28ca9c57b76ad659f3b49b70937b3c8117 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -72,7 +72,7 @@ namespace EDSP                                                                /*{{{*/
         *  it doesn't make sense from an APT resolver point of view like versions
         *  with a negative pin to enable the solver to propose even that as a
         *  solution or at least to be able to give a hint what can be done to
-        *  statisfy a request.
+        *  satisfy a request.
         *
         *  \param Cache is the known package universe
         *  \param output is written to this "file"

diff --git a/debian/changelog b/debian/changelog
index 8c31be6d753a9c6c5a47c4101450359dc4fa51c6..1ab3c10175e491f27d5969065545e2d6d2c23a16 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1024,7 +1024,7 @@ apt (1.1~exp13) experimental; urgency=medium
   * Fix select timeout to be 50msec instead of 0.5msec (Closes: #799857)
 
   [ David Kalnischkies ]
-  * M-A: allowed pkgs of unconfigured archs do not statisfy :any
+  * M-A: allowed pkgs of unconfigured archs do not satisfy :any
   * implement dpkgs vision of interpreting pkg:<arch> dependencies
   * add Source-Version field for EDSP
   * fix insecure use of /tmp in EDSP solver 'dump' (Closes: 795600)
@@ -3306,7 +3306,7 @@ apt (0.9.7.3) unstable; urgency=low
     - handle :all and :native correctly as architectures again
       in the commandline parsing (regression in 0.9.7)
   * apt-pkg/packagemanager.cc:
-    - do not segfault if nothing can be configured to statisfy
+    - do not segfault if nothing can be configured to satisfy
       a pre-depends (e.g. in a pre-depends loop) (Closes: #681958)
   * apt-pkg/contrib/mmap.cc:
     - trigger the usage of the fallback code for kfreebsd also in the
@@ -4063,7 +4063,7 @@ apt (0.8.16~exp7) experimental; urgency=low
     - load the dpkg base arguments only one time and reuse them later
   * cmdline/apt-get.cc:
     - follow Provides in the evaluation of saving candidates, too, for
-      statisfying garbage package dependencies (Closes: #640590)
+      satisfying garbage package dependencies (Closes: #640590)
   * apt-pkg/algorithms.cc:
     - if a package is garbage, don't try to save it with FixByInstall
   * apt-pkg/deb/debsrcrecords.cc:
@@ -4294,7 +4294,7 @@ apt (0.8.15.9) unstable; urgency=low
     - load the dpkg base arguments only one time and reuse them later
   * cmdline/apt-get.cc:
     - follow Provides in the evaluation of saving candidates, too, for
-      statisfying garbage package dependencies (Closes: #640590)
+      satisfying garbage package dependencies (Closes: #640590)
   * apt-pkg/algorithms.cc:
     - if a package is garbage, don't try to save it with FixByInstall
   * apt-pkg/init.cc:
@@ -5225,7 +5225,7 @@ apt (0.8.9) unstable; urgency=low
       consider it as a candidate for FixByInstall
   * apt-pkg/depcache.cc:
     - don't install previously not installed providers in a try
-      to statisfy a "Breaks: provides" dependency by upgrade
+      to satisfy a "Breaks: provides" dependency by upgrade
   * cmdline/acqprogress.cc:
     - don't ask the user for media change if quiet >= 2, stdout is not
       a tty and assume-yes, force-yes or trivial-only option is set to

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 6f8b0dfbf154fb793db661d038895191d991a389..a56c7ba629dca0897fc68d2670a8963d15c97ecb 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -575,7 +575,7 @@
      terminal window when packages are installed, upgraded or
      removed. For a machine parsable version of this data see
      README.progress-reporting in the apt doc directory.
-     Configuration Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem>
+     Configuration Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</literal>.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>--with-source</option> <option>&synopsis-param-filename;</option></term>

diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 5503082825c886f5f77d7dfb84931213af7c657c..f1f63dae18dc31f4eff3c1e20956a1b681b6b226 100644 (file)
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -85,7 +85,7 @@
    </para>
 
    <para>
-   A repository which previously was authentication but would loose this state in
+   A repository which previously was authenticated but would loose this state in
    an <command>update</command> operation raises an error in all APT clients
    irrespective of the option to allow or forbid usage of insecure repositories.
    The error can be overcome by additionally setting

diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index c3951b4b29ca8717d3f691cff5c8af827c36a6e9..a383070b5a2b9491010ccaa4a064515a34953790 100644 (file)
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -55,7 +55,7 @@
      <listitem><para><option>upgrade</option> is used to install available
           upgrades of all packages currently installed on the system from the
           sources configured via &sources-list;. New packages will be
-          installed if required to statisfy dependencies, but existing
+          installed if required to satisfy dependencies, but existing
           packages will never be removed. If an upgrade for a package requires
           the remove of an installed package the upgrade for this package
           isn't performed.

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 79188af80c6494f5a1c639da006f4011b665bc05..63c4e71e18f1a46dc9867232cf4623eb28e7677b 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -559,7 +559,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1410,7 +1410,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and "
+"Items: <literal>Dpkg::Progress</literal> and "
 "<literal>Dpkg::Progress-Fancy</literal>."
 msgstr ""
 
@@ -2242,7 +2242,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/de.po b/doc/po/de.po
index 36befc7d7b2eecb968a5bf6cb6757a11005efd87..0a93cb8896dda4330111d13222c63f95853d0a3a 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -689,11 +689,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-# FIXME s/statisfy/satisfy/
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1969,14 +1968,13 @@ msgstr ""
 "und was daraus folgt, finden Sie unter &apt-secure;. Konfigurationselement: "
 "<literal>Acquire::AllowInsecureRepositories</literal>."
 
-# FIXME s/Item/Items/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
@@ -3170,9 +3168,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-# FIXME s/authentication/authenticated/
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/es.po b/doc/po/es.po
index 5dbf60d7cca5427ef99858401a7a82b15c3a43cf..1ae2551287b2bf18371df93ee05c6b5352f4a92e 100644 (file)
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -764,7 +764,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -2051,7 +2051,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
@@ -3194,7 +3194,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/fr.po b/doc/po/fr.po
index d6c9386d480ef4b2e6006528053794b0538d17ee..45fadc315499acf642b6fce048622582e87084c7 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -682,7 +682,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1967,7 +1967,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "Cette commande montre les informations de progression conviviales dans la "
@@ -3120,7 +3120,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/it.po b/doc/po/it.po
index 1eae4595880ca862385e5c5d5961a04c4fac2189..1420d048e08057474ffa376ae122c5925cda4d51 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -740,7 +740,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -2029,7 +2029,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "Mostra informazioni sul progresso facili da leggere nella finestra del "
@@ -3177,7 +3177,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/ja.po b/doc/po/ja.po
index dd9310453a774a06f6e7014da44404f19667fb69..c8aa30d09180ad178066e49a305d2920b2ffdbc0 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -737,7 +737,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1942,7 +1942,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "パッケージのインストール、アップグレード、削除時にユーザにとってわかりやすい"
@@ -3074,7 +3074,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/nl.po b/doc/po/nl.po
index 656b4de93a08ff942ba342d1b6a5eb6ba39103a4..3c0574f128216b01b9f0d47a4801b331c4b90aca 100644 (file)
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -744,7 +744,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -2041,7 +2041,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "Bij het installeren, opwaarderen of verwijderen van pakketten "
@@ -3245,7 +3245,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/pl.po b/doc/po/pl.po
index e6ac6beb656d446f90b3b442b5f4602900a50388..45ae4501894e95616a11287fc7e225c0c7232e72 100644 (file)
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -722,7 +722,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -2049,7 +2049,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
@@ -3233,7 +3233,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 4cc3d951bd925ae77009017ee84c72eb9e505408..30e03d7284d9077577d739444b60ae3ff8659599 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -731,7 +731,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1990,7 +1990,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 "Mostra informação de progresso compreensível para o utilizador na janela de "
@@ -3131,7 +3131,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ffb962e6639069d45fdc772f8b05adc6c73efb20..9011c17d29834a578f2c8d419ec422888fe3f32d 100644 (file)
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -543,7 +543,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1388,7 +1388,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
 
@@ -2217,7 +2217,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "