summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Leick <c.leick@vollbio.de>2018-10-30 22:32:34 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2018-10-30 22:43:35 +0100
commitb6b159cc5eedca24d2ca0e27e230865ad2b4ad0f (patch)
tree5fc74d4464ead28047349f4cd385148179ab01f8
parent16f7be06850aa6ff196cf9d70e493ccbfae99a1b (diff)
Fix typos encountered while updating de translation
-rw-r--r--apt-pkg/orderlist.cc2
-rw-r--r--debian/changelog2
-rw-r--r--doc/apt-transport-https.1.xml2
-rw-r--r--doc/apt.8.xml2
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/po/apt-doc.pot8
-rw-r--r--doc/po/de.po11
-rw-r--r--doc/po/es.po8
-rw-r--r--doc/po/fr.po8
-rw-r--r--doc/po/it.po8
-rw-r--r--doc/po/ja.po8
-rw-r--r--doc/po/nl.po8
-rw-r--r--doc/po/pl.po8
-rw-r--r--doc/po/pt.po8
-rw-r--r--doc/po/pt_BR.po8
-rw-r--r--doc/sources.list.5.xml2
16 files changed, 46 insertions, 49 deletions
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index a826f2853..20631bfc1 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -889,7 +889,7 @@ bool pkgOrderList::DepConfigure(DepIterator D)
/*}}}*/
// OrderList::DepRemove - Removal ordering /*{{{*/
// ---------------------------------------------------------------------
-/* Checks all given dependencies if they are broken by the remove of a
+/* Checks all given dependencies if they are broken by the removal of a
package and if so fix it by visiting another provider or or-group
member to ensure that the dependee keeps working which is especially
important for Immediate packages like e.g. those depending on an
diff --git a/debian/changelog b/debian/changelog
index 741abcbd5..bc4691c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5878,7 +5878,7 @@ apt (0.8.11) unstable; urgency=low
- if --print-uris is used don't setup downloader as we don't need
progress, lock nor the directories it would create otherwise
- show dependencies of essential packages which are going to remove
- only if they cause the remove of this essential (Closes: #601961)
+ only if they cause the removal of this essential (Closes: #601961)
- keep not installed garbage packages uninstalled instead of showing
in the autoremove section and installing those (Closes: #604222)
- change pkg/release behavior to use the new SetCandidateRelease
diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml
index e00dd7c62..64d473cac 100644
--- a/doc/apt-transport-https.1.xml
+++ b/doc/apt-transport-https.1.xml
@@ -38,7 +38,7 @@ a user but used by APT tools based on user configuration.</para>
which, as indicated by the appended S, is wrapped in an encrypted layer known as
Transport Layer Security (TLS) to provide end-to-end encryption.
A sufficiently capable attacker can still observe the communication partners
-and deeper analyse of the encrypted communication might still reveal important details.
+and deeper analysis of the encrypted communication might still reveal important details.
An overview over available alternative transport methods is given in &sources-list;.</para>
</refsect1>
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index a383070b5..626419ec3 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -57,7 +57,7 @@
sources configured via &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
+ the removal of an installed package the upgrade for this package
isn't performed.
</para></listitem>
</varlistentry>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 55bc9d20d..64a26bc4a 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -722,7 +722,7 @@ APT::Compressor::rev {
<para>
The <literal>Ignore-Files-Silently</literal> list can be used to specify
which files APT should silently ignore while parsing the files in the
- fragment directories. Per default a file which end with <literal>.disabled</literal>,
+ fragment directories. Per default a file which ends with <literal>.disabled</literal>,
<literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-z]+</literal>
is silently ignored. As seen in the last default value these patterns can use regular
expression syntax.
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index de566708a..4fabffeb0 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -565,7 +565,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
@@ -3753,7 +3753,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with "
+"fragment directories. Per default a file which ends with "
"<literal>.disabled</literal>, <literal>~</literal>, <literal>.bak</literal> "
"or <literal>.dpkg-[a-z]+</literal> is silently ignored. As seen in the last "
"default value these patterns can use regular expression syntax."
@@ -5736,7 +5736,7 @@ msgid ""
"is that the communication between apt and server (or proxy) is "
"encrypted. Note that the encryption does not prevent an attacker from "
"knowing which server (or proxy) apt is communicating with and deeper "
-"analyses can potentially still reveal which data was downloaded. If this is "
+"analysis can potentially still reveal which data was downloaded. If this is "
"a concern the Tor-based schemes mentioned further below might be a suitable "
"alternative."
msgstr ""
@@ -7276,7 +7276,7 @@ msgid ""
"&apt-transport-http;), which, as indicated by the appended S, is wrapped in "
"an encrypted layer known as Transport Layer Security (TLS) to provide "
"end-to-end encryption. A sufficiently capable attacker can still observe "
-"the communication partners and deeper analyse of the encrypted communication "
+"the communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 6cff838c6..0eda97c6d 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -692,7 +692,6 @@ msgstr ""
"Daten, zum Beispiel, um Paket-Upgrades durchzuführen oder um darin zu suchen "
"und um Einzelheiten über alle zur Installation verfügbaren Pakete anzuzeigen."
-# FIXME s/remove/removal/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
@@ -700,7 +699,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
"<literal>upgrade</literal> wird verwendet, um verfügbare Upgrades für alle "
@@ -5411,13 +5410,12 @@ msgstr ""
"etwas nur relativen Pfaden voranstellen möchten, setzen Sie stattdessen "
"<literal>Dir</literal>."
-# FIXME s/which end/which ends/
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -8286,7 +8284,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -10425,7 +10423,6 @@ msgstr ""
"einen Benutzer aufgerufen wird, jedoch von APT-Werkzeugen basierend auf der "
"Konfiguration des Benutzers."
-# FIXME s/analyse/analysis/
#. type: Content of: <refentry><refsect1><para>
#: apt-transport-https.1.xml
msgid ""
@@ -10433,7 +10430,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/es.po b/doc/po/es.po
index ba7fd28af..137b2f717 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -768,7 +768,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
@@ -5379,7 +5379,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -8048,7 +8048,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -10105,7 +10105,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index b1eb022b0..9992785bd 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -696,7 +696,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
"La commande <literal>upgrade</literal> permet d'installer les mises à jour "
@@ -5407,7 +5407,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -8219,7 +8219,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -10348,7 +10348,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/it.po b/doc/po/it.po
index 4c36d1a68..5d537f1e2 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -746,7 +746,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
"<option>upgrade</option> viene usato per installare gli aggiornamenti "
@@ -5394,7 +5394,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -8198,7 +8198,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -10262,7 +10262,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6721ba080..d3d903e33 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -743,7 +743,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
"<option>upgrade</option> は、&sources-list; で設定された取得元からシステムに"
@@ -5181,7 +5181,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -7859,7 +7859,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -9875,7 +9875,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 4fd9adb5c..55c29785f 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -750,7 +750,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
"<literal>upgrade</literal> wordt gebruikt om voor alle pakketten die "
@@ -5518,7 +5518,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -8412,7 +8412,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -10573,7 +10573,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 8361a2dbf..ff41c0259 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -728,7 +728,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
@@ -4984,7 +4984,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -7495,7 +7495,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -9262,7 +9262,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 394f06b66..2f350a3c9 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -735,7 +735,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
@@ -5301,7 +5301,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -7974,7 +7974,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -10041,7 +10041,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 0c37b896b..f84c4fe0f 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -548,7 +548,7 @@ msgid ""
"packages currently installed on the system from the sources configured via "
"&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 "
+"a package requires the removal of an installed package the upgrade for this "
"package isn't performed."
msgstr ""
@@ -3686,7 +3686,7 @@ msgstr ""
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
+"fragment directories. Per default a file which ends with <literal>.disabled</"
"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
@@ -6030,7 +6030,7 @@ msgid ""
"similar in use and available options to the http scheme. The main difference "
"is that the communication between apt and server (or proxy) is encrypted. "
"Note that the encryption does not prevent an attacker from knowing which "
-"server (or proxy) apt is communicating with and deeper analyses can "
+"server (or proxy) apt is communicating with and deeper analysis can "
"potentially still reveal which data was downloaded. If this is a concern the "
"Tor-based schemes mentioned further below might be a suitable alternative."
msgstr ""
@@ -7582,7 +7582,7 @@ msgid ""
"http;), which, as indicated by the appended S, is wrapped in an encrypted "
"layer known as Transport Layer Security (TLS) to provide end-to-end "
"encryption. A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communication "
+"communication partners and deeper analysis of the encrypted communication "
"might still reveal important details. An overview over available "
"alternative transport methods is given in &sources-list;."
msgstr ""
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index eaea13ae5..302154999 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -409,7 +409,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
difference is that the communication between apt and server (or proxy) is
encrypted. Note that the encryption does not prevent an attacker from
knowing which server (or proxy) apt is communicating with and deeper
- analyses can potentially still reveal which data was downloaded. If this is
+ analysis can potentially still reveal which data was downloaded. If this is
a concern the Tor-based schemes mentioned further below might be a suitable
alternative.</para></listitem>
</varlistentry>