diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-11 09:36:10 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-11 09:36:10 +0100 |
commit | 38eeaec814307aa0b6dc39ee9119235c13333acf (patch) | |
tree | 95876cfdc6bc410349804a7892ed26999a85cfb0 /doc | |
parent | 08fe18cccff68fbaf35bd3251f37cee524c073f6 (diff) | |
parent | 3b169b6d1d2111765f57e2f5e6279e99ae523cde (diff) |
Merge tag '1.8.0_rc3'
apt Debian release 1.8.0~rc3
Diffstat (limited to 'doc')
-rw-r--r-- | doc/apt-get.8.xml | 4 | ||||
-rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
-rw-r--r-- | doc/design.dbk | 2 | ||||
-rw-r--r-- | doc/dpkg-tech.dbk | 4 | ||||
-rw-r--r-- | doc/guide.dbk | 2 | ||||
-rw-r--r-- | doc/json-hooks-protocol.md | 2 | ||||
-rw-r--r-- | doc/libapt-pkg2_to_3.txt | 6 | ||||
-rw-r--r-- | doc/po/apt-doc.pot | 10 | ||||
-rw-r--r-- | doc/po/de.po | 6 | ||||
-rw-r--r-- | doc/po/es.po | 8 | ||||
-rw-r--r-- | doc/po/fr.po | 6 | ||||
-rw-r--r-- | doc/po/it.po | 8 | ||||
-rw-r--r-- | doc/po/ja.po | 6 | ||||
-rw-r--r-- | doc/po/nl.po | 56 | ||||
-rw-r--r-- | doc/po/pl.po | 6 | ||||
-rw-r--r-- | doc/po/pt.po | 6 | ||||
-rw-r--r-- | doc/po/pt_BR.po | 6 |
17 files changed, 65 insertions, 75 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 81f580c31..b757c3d30 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -356,7 +356,7 @@ <term><option>--assume-yes</option></term> <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run non-interactively. If an undesirable situation, such as changing a held - package, trying to install a unauthenticated package or removing an essential package + package, trying to install an unauthenticated package or removing an essential package occurs then <literal>apt-get</literal> will abort. Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem> </varlistentry> @@ -413,7 +413,7 @@ <varlistentry><term><option>--with-new-pkgs</option></term> <listitem><para>Allow installing new packages when used in conjunction with <literal>upgrade</literal>. This is useful if - the update of a installed package requires new dependencies to be + the update of an installed package requires new dependencies to be installed. Instead of holding the package back <literal>upgrade</literal> will upgrade the package and install the new dependencies. Note that <literal>upgrade</literal> with this option will never remove packages, diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index defd6a272..55c463e1d 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -268,7 +268,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.8.0~rc2"> +<!ENTITY apt-product-version "1.8.0~rc3"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "stretch"> diff --git a/doc/design.dbk b/doc/design.dbk index 157e75c1a..fabc915e5 100644 --- a/doc/design.dbk +++ b/doc/design.dbk @@ -262,7 +262,7 @@ dependencies) <para> Build a list of events. Simple topological sorting gives order of packages in dependency order. At certain points in this ordering, -predependencies/immediate configure directives cause an break in normal +predependencies/immediate configure directives cause a break in normal ordering. We need to insert the uninstall/purge directive in the stream (default: as early as possible). </para> diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk index d2d5061ab..62c587976 100644 --- a/doc/dpkg-tech.dbk +++ b/doc/dpkg-tech.dbk @@ -271,7 +271,7 @@ successful. <term>half-installed</term> <listitem> <para> -An attempt was made to remove the packagem but there was a failure in the +An attempt was made to remove the package but there was a failure in the prerm script. </para> </listitem> @@ -803,7 +803,7 @@ These files are created internally by dpkg's "checkpoint" function, and are cleaned up when dpkg exits cleanly. </para> <para> -Juding by the use of the updates directory I would call it a Journal. Inorder +Judging by the use of the updates directory I would call it a Journal. Inorder to efficiently ensure the complete integrity of the status file dpkg will "checkpoint" or journal all of it's activities in the updates directory. By merging the contents of the updates directory (in order!!) against the original diff --git a/doc/guide.dbk b/doc/guide.dbk index dbc4f5431..ab4b0c6d0 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -231,7 +231,7 @@ use packages on your CD-ROM before downloading from the Internet. </screen> <para> The <emphasis>Sources</emphasis> setup starts by asking for the base of the -Debian archive, defaulting to a HTTP mirror. Next it asks for the distribution +Debian archive, defaulting to an HTTP mirror. Next it asks for the distribution to get. </para> <screen> diff --git a/doc/json-hooks-protocol.md b/doc/json-hooks-protocol.md index f516c1afe..ddf0fa0e3 100644 --- a/doc/json-hooks-protocol.md +++ b/doc/json-hooks-protocol.md @@ -105,7 +105,7 @@ install. Each package has the following attributes: - *id*: An unsigned integer - *version*: The version as a string - *architecture*: Architecture of the version - - *pin*: The pin priority + - *pin*: The pin priority (optional) #### Example diff --git a/doc/libapt-pkg2_to_3.txt b/doc/libapt-pkg2_to_3.txt index 2806f4081..6beaafbf8 100644 --- a/doc/libapt-pkg2_to_3.txt +++ b/doc/libapt-pkg2_to_3.txt @@ -1,5 +1,5 @@ libapt-pkg v2 to v3 incorporates several source-incompatible changes -that people need to be aware of.. Many of this changes are done so that +that people need to be aware of.. Many of these changes are done so that most old source will continue to function, but perhaps at reduced functionality. @@ -34,12 +34,12 @@ functionality. by the Cache or _system structures. * Initialization is now two stage (define APT_COMPATIBILITY..) The first stage, pkgInitConfig is called before commandline parsing, and - pkgInitSystem is called after. This gives the user the oppertunity to + pkgInitSystem is called after. This gives the user the opportunity to override default settings from the config files before startup has been finalized. * pkgSourceList has been gutted. All the junk that was in there before is cleaned up and put in the pkgIndexFile class. There is very little API - corrispondence here.. + correspondence here.. * pkgMakeStatusCacheMem is gone, pkgMakeStatusCache does the same thing if you set the AllowMem flag. Also, you can get a copy of the map used to store the cache to advoid having to remap it in the calling code. A bunch diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 51fb547ef..2b26b0010 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.8.0~rc1\n" +"Project-Id-Version: apt-doc 1.8.0~rc3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2019-02-04 15:34+0100\n" +"POT-Creation-Date: 2019-02-11 09:34+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" @@ -1162,7 +1162,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1229,7 +1229,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -8003,7 +8003,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index e751ade26..ff685f29e 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1593,7 +1593,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1692,7 +1692,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -11523,7 +11523,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "Das Einrichten der <emphasis>Quellen</emphasis> beginnt durch das Erfragen " diff --git a/doc/po/es.po b/doc/po/es.po index b4c07e3c4..44ed108d4 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -1634,7 +1634,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1752,7 +1752,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -9991,7 +9991,7 @@ msgid "" "from polluting its cache with (big) .deb files." msgstr "" "Se proporcionan tres opciones de configuración para el control de la caché " -"con proxy cachés conformes a HTTP/1.1. <literal>No-Cache</literal> indica al " +"con proxy cachés conformes an HTTP/1.1. <literal>No-Cache</literal> indica al " "proxy que nunca utilice la respuesta cacheada. <literal>Max-Age</literal> " "define la máxima antigüedad permitida (en segundos) de un fichero de índice " "en la caché de un proxy. <literal>No-Store</literal> define que el proxy no " @@ -11008,7 +11008,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "La configuración de las <emphasis>fuentes</emphasis> comienza preguntando la " diff --git a/doc/po/fr.po b/doc/po/fr.po index 05d896374..d34e33b03 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -1594,7 +1594,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1693,7 +1693,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -11480,7 +11480,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "La configuration des <emphasis>Sources</emphasis> débute par l'indication de " diff --git a/doc/po/it.po b/doc/po/it.po index a849966c7..79a265475 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -1634,7 +1634,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1732,7 +1732,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -10135,7 +10135,7 @@ msgid "" "from polluting its cache with (big) .deb files." msgstr "" "Sono fornite tre impostazioni per il controllo della cache in proxy con " -"cache conformi a HTTP/1.1. <literal>No-Cache</literal> indica al proxy di " +"cache conformi an HTTP/1.1. <literal>No-Cache</literal> indica al proxy di " "non usare la sua risposta in cache in nessuna circostanza. <literal>Max-Age</" "literal> imposta l'età massima consentita (in secondi) di un file indice " "nella cache del proxy. <literal>No-Store</literal> specifica che il proxy " @@ -11188,7 +11188,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "La configurazione delle <emphasis>fonti</emphasis> inizia chiedendo la base " diff --git a/doc/po/ja.po b/doc/po/ja.po index 11ac98253..b83f9d99c 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -1584,7 +1584,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1677,7 +1677,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -10782,7 +10782,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "<emphasis>ソース</emphasis>の準備は基礎となる Debian アーカイブの質問から始ま" diff --git a/doc/po/nl.po b/doc/po/nl.po index 0f5462d19..affac023b 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -1,13 +1,13 @@ # Translation of apt-doc to Dutch # This file is distributed under the same license as the apt-doc package. -# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015, 2016, 2017, 2018. +# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.8.0~alpha2\n" +"Project-Id-Version: apt-doc 1.8.0~beta1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2019-02-04 15:34+0100\n" -"PO-Revision-Date: 2018-11-19 20:54+0100\n" +"POT-Creation-Date: 2019-02-10 14:34+0100\n" +"PO-Revision-Date: 2019-01-30 12:49+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" "Language: nl\n" @@ -1664,7 +1664,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1765,7 +1765,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -3170,11 +3170,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml -#, fuzzy -#| msgid "" -#| "<literal>auto</literal> is used to mark a package as being automatically " -#| "installed, which will cause the package to be removed when no more " -#| "manually installed packages depend on this package." msgid "" "<literal>minimize-manual</literal> is used to mark (transitive) dependencies " "of metapackages as automatically installed. This can be used after an " @@ -3182,10 +3177,11 @@ msgid "" "packages; or continuously on systems managed by system configuration " "metapackages." msgstr "" -"<literal>auto</literal> wordt gebruikt om een pakket als automatisch " -"geïnstalleerd te markeren. Dit zal tot gevolg hebben dat dit pakket " -"verwijderd wordt als er geen handmatig geïnstalleerde pakketten meer zijn " -"die dat pakket nodig hebben." +"<literal>minimize-manual</literal> wordt gebruikt om (transitief) vereisten " +"van metapakketten als automatisch geïnstalleerd te markeren. Dit kan na een " +"installatie gebruikt worden om bijvoorbeeld het aantal handmatig " +"geïnstalleerde pakketten te verminderen, of permanent op systemen die " +"beheerd worden met systeemconfiguratiemetapakketten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml @@ -5669,6 +5665,10 @@ msgid "" "used when running dpkg. It may be set to any valid value of that environment " "variable; or the empty string, in which case the variable is not changed." msgstr "" +"Dit is een tekenreeks die de omgevingsvariabele <envar>PATH</envar> " +"definieert wanneer dpkg uitgevoerd wordt. Deze kan op elke geldige waarde " +"van die omgevingsvariabele ingesteld worden, of op een lege tekenreeks en in " +"dat geval wordt de variabele niet veranderd." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -10049,19 +10049,15 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_auth.conf.5.xml -#, fuzzy -#| msgid "" -#| "The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be " -#| "used to store login information in a netrc-like format with restrictive " -#| "file permissions." msgid "" "The APT auth.conf file <filename>/etc/apt/auth.conf</filename>, and .conf " "files inside <filename>/etc/apt/auth.conf.d</filename> can be used to store " "login information in a netrc-like format with restrictive file permissions." msgstr "" -"Het bestand auth.conf van APT, <filename>/etc/apt/auth.conf</filename>, met " -"restrictieve bestandspermissies, kan gebruikt worden om er login-informatie " -"in op te slaan in een netrc-achtige indeling." +"Het bestand auth.conf van APT, <filename>/etc/apt/auth.conf</filename>, en ." +"conf-bestanden in de map <filename>/etc/apt/auth.conf.d</filename> kunnen " +"gebruikt worden om er login-informatie in op te slaan in een netrc-achtige " +"indeling met restrictieve bestandspermissies." #. type: Content of: <refentry><refsect1><title> #: apt_auth.conf.5.xml @@ -10272,23 +10268,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt_auth.conf.5.xml -#, fuzzy -#| msgid "<filename>/etc/apt/auth.conf</filename>" msgid "<filename>/etc/apt/auth.conf.d/*.conf</filename>" -msgstr "<filename>/etc/apt/auth.conf</filename>" +msgstr "<filename>/etc/apt/auth.conf.d/*.conf</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt_auth.conf.5.xml -#, fuzzy -#| msgid "" -#| "Login information for APT sources and proxies in a netrc-like format. " -#| "Configuration Item: <literal>Dir::Etc::netrc</literal>." msgid "" "Login information for APT sources and proxies in a netrc-like format. " "Configuration Item: <literal>Dir::Etc::netrcparts</literal>." msgstr "" -"Inloginformatie voor APT-bronnen en -proxy's in a netrc-achtige indeling. " -"Configuratie-item: <literal>Dir::Etc::netrc</literal>." +"Inloginformatie voor APT-bronnen en -proxy's in een netrc-achtige indeling. " +"Configuratie-item: <literal>Dir::Etc::netrcparts</literal>." #. type: Content of: <refentry><refsect1><para> #: apt_auth.conf.5.xml @@ -11673,7 +11663,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "Het instellen van de <emphasis>Sources</emphasis> (pakketbronnen) begint met " diff --git a/doc/po/pl.po b/doc/po/pl.po index e885d11ee..3b9fe65cb 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1620,7 +1620,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1745,7 +1745,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -10169,7 +10169,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "Ustawianie źródeł zaczyna się od pytania o bazową lokalizację Debiana. " diff --git a/doc/po/pt.po b/doc/po/pt.po index a580af081..33dbd7890 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -1600,7 +1600,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1702,7 +1702,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -10948,7 +10948,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" "A configuração de <emphasis>Sources</emphasis> começa por perguntar pela " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index f02fe2969..92fbfc4f6 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -1143,7 +1143,7 @@ msgstr "" msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " -"package, trying to install a unauthenticated package or removing an " +"package, trying to install an unauthenticated package or removing an " "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" @@ -1210,7 +1210,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"<literal>upgrade</literal>. This is useful if the update of a installed " +"<literal>upgrade</literal>. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back <literal>upgrade</literal> will upgrade the package and install " "the new dependencies. Note that <literal>upgrade</literal> with this option " @@ -8334,7 +8334,7 @@ msgstr "" #: guide.dbk msgid "" "The <emphasis>Sources</emphasis> setup starts by asking for the base of the " -"Debian archive, defaulting to a HTTP mirror. Next it asks for the " +"Debian archive, defaulting to an HTTP mirror. Next it asks for the " "distribution to get." msgstr "" |