From 2c30cf43f1c4ab96f3eca849d7eb4923ffed40b1 Mon Sep 17 00:00:00 2001 From: Chris Leick Date: Wed, 9 Nov 2016 17:42:40 +0100 Subject: [PATCH] fix three typos in sources & manpages --- apt-pkg/edsp.h | 2 +- debian/changelog | 10 +++++----- doc/apt-get.8.xml | 2 +- doc/apt-secure.8.xml | 2 +- doc/apt.8.xml | 2 +- doc/po/apt-doc.pot | 6 +++--- doc/po/de.po | 9 +++------ doc/po/es.po | 6 +++--- doc/po/fr.po | 6 +++--- doc/po/it.po | 6 +++--- doc/po/ja.po | 6 +++--- doc/po/nl.po | 6 +++--- doc/po/pl.po | 6 +++--- doc/po/pt.po | 6 +++--- doc/po/pt_BR.po | 6 +++--- 15 files changed, 39 insertions(+), 42 deletions(-) diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index 60f8c2883..ed49ac28c 100644 --- 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 8c31be6d7..1ab3c1017 100644 --- 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: 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 6f8b0dfbf..a56c7ba62 100644 --- 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: Dpkg::Progress and Dpkg::Progress-Fancy. + Configuration Items: Dpkg::Progress and Dpkg::Progress-Fancy. diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 550308282..f1f63dae1 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -85,7 +85,7 @@ - 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 update 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 c3951b4b2..a383070b5 100644 --- a/doc/apt.8.xml +++ b/doc/apt.8.xml @@ -55,7 +55,7 @@ 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 79188af80..63c4e71e1 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -559,7 +559,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and " +"Items: Dpkg::Progress and " "Dpkg::Progress-Fancy." msgstr "" @@ -2242,7 +2242,7 @@ msgstr "" #. type: Content of: #: 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 update 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 36befc7d7..0a93cb889 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -689,11 +689,10 @@ msgstr "" #. type: Content of: #: apt.8.xml -# FIXME s/statisfy/satisfy/ msgid "" " 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: " "Acquire::AllowInsecureRepositories." -# FIXME s/Item/Items/ #. type: Content of: #: 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn " @@ -3170,9 +3168,8 @@ msgstr "" #. type: Content of: #: 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 update 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 5dbf60d7c..1ae255128 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -764,7 +764,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" @@ -3194,7 +3194,7 @@ msgstr "" #. type: Content of: #: 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 update 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 d6c9386d4..45fadc315 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -682,7 +682,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" "Cette commande montre les informations de progression conviviales dans la " @@ -3120,7 +3120,7 @@ msgstr "" #. type: Content of: #: 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 update 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 1eae45958..1420d048e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -740,7 +740,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" "Mostra informazioni sul progresso facili da leggere nella finestra del " @@ -3177,7 +3177,7 @@ msgstr "" #. type: Content of: #: 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 update 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 dd9310453..c8aa30d09 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -737,7 +737,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" "パッケージのインストール、アップグレード、削除時にユーザにとってわかりやすい" @@ -3074,7 +3074,7 @@ msgstr "" #. type: Content of: #: 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 update 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 656b4de93..3c0574f12 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -744,7 +744,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" "Bij het installeren, opwaarderen of verwijderen van pakketten " @@ -3245,7 +3245,7 @@ msgstr "" #. type: Content of: #: 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 update 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 e6ac6beb6..45ae45018 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -722,7 +722,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" @@ -3233,7 +3233,7 @@ msgstr "" #. type: Content of: #: 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 update 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 4cc3d951b..30e03d728 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -731,7 +731,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" "Mostra informação de progresso compreensível para o utilizador na janela de " @@ -3131,7 +3131,7 @@ msgstr "" #. type: Content of: #: 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 update 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 ffb962e66..9011c17d2 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -543,7 +543,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and Dpkg::Progress-FancyDpkg::Progress and Dpkg::Progress-Fancy." msgstr "" @@ -2217,7 +2217,7 @@ msgstr "" #. type: Content of: #: 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 update 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 " -- 2.45.2