diff -pruN 1.8.0~rc2/apt-pkg/contrib/strutl.cc 1.8.0~rc3/apt-pkg/contrib/strutl.cc --- 1.8.0~rc2/apt-pkg/contrib/strutl.cc 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/apt-pkg/contrib/strutl.cc 2019-02-11 08:33:46.000000000 +0000 @@ -989,7 +989,7 @@ static time_t timegm(struct tm *t) } #endif /*}}}*/ -// RFC1123StrToTime - Converts a HTTP1.1 full date strings into a time_t /*{{{*/ +// RFC1123StrToTime - Converts an HTTP1.1 full date strings into a time_t /*{{{*/ // --------------------------------------------------------------------- /* tries to parses a full date as specified in RFC7231 §7.1.1.1 with one exception: HTTP/1.1 valid dates need to have GMT as timezone. diff -pruN 1.8.0~rc2/CMakeLists.txt 1.8.0~rc3/CMakeLists.txt --- 1.8.0~rc2/CMakeLists.txt 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/CMakeLists.txt 2019-02-11 08:33:46.000000000 +0000 @@ -188,7 +188,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC3 # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "1.8.0~rc2") +set(PACKAGE_VERSION "1.8.0~rc3") if (NOT DEFINED DPKG_DATADIR) execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;" diff -pruN 1.8.0~rc2/debian/apt.install 1.8.0~rc3/debian/apt.install --- 1.8.0~rc2/debian/apt.install 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/debian/apt.install 2019-02-11 08:33:46.000000000 +0000 @@ -27,6 +27,8 @@ usr/share/man/*/*/apt-mark.* usr/share/man/*/*/apt-secure.* usr/share/man/*/*/apt.* usr/share/man/*/*/apt_preferences.* +usr/share/man/*/*/apt_auth.* +usr/share/man/*/*/apt-transport-*.* usr/share/man/*/*/sources.list.* usr/share/man/*/apt-cache.* usr/share/man/*/apt-cdrom.* diff -pruN 1.8.0~rc2/debian/changelog 1.8.0~rc3/debian/changelog --- 1.8.0~rc2/debian/changelog 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/debian/changelog 2019-02-11 08:33:46.000000000 +0000 @@ -1,6 +1,27 @@ +apt (1.8.0~rc3) unstable; urgency=medium + + [ Julian Andres Klode ] + * aptmethod.h: Do not have gcc warning about ignoring write() result + * Fix issues in previous two debian/changelog entries + * json-hooks-protocol: The "pin" field is optional + * debian/gbp.conf: Set debian-branch to 1.8.y + * Install translated apt_auth and apt-transport-* manpages + + [ Алексей Шилин ] + * Russian program translation update. + Thanks to Vladimir Zhbanov (Closes: #921830) + + [ Jakub Wilk ] + * Fix various typos in the documentation + + [ Frans Spiesschaert ] + * Dutch program translation update (Closes: #921934) + * Dutch manpages translation update (Closes: #921941) + + -- Julian Andres Klode Mon, 11 Feb 2019 09:33:46 +0100 + apt (1.8.0~rc2) unstable; urgency=medium - * Bump SONAMEs in preparation for ABI breaks * Correctly handle feature detection for sse4.2 and crc32 -- Julian Andres Klode Mon, 04 Feb 2019 18:15:07 +0100 @@ -38,7 +59,7 @@ apt (1.8.0~rc1) unstable; urgency=medium [ Baptiste Jammet ] * French program translation update (Closes: #921008) - -- Julian Andres Klode Mon, 04 Feb 2019 15:32:27 +0100 + -- Julian Andres Klode Mon, 04 Feb 2019 15:32:27 +0100 apt (1.8.0~beta1) unstable; urgency=medium diff -pruN 1.8.0~rc2/debian/gbp.conf 1.8.0~rc3/debian/gbp.conf --- 1.8.0~rc2/debian/gbp.conf 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/debian/gbp.conf 2019-02-11 08:33:46.000000000 +0000 @@ -3,7 +3,7 @@ ;preexport = ./prepare-release pre-export prebuild = ./prepare-release pre-build postbuild = ./prepare-release post-build -debian-branch = master +debian-branch = 1.8.y debian-tag = %(version)s export-dir = ../build-area sign-tags = True diff -pruN 1.8.0~rc2/doc/apt-get.8.xml 1.8.0~rc3/doc/apt-get.8.xml --- 1.8.0~rc2/doc/apt-get.8.xml 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/apt-get.8.xml 2019-02-11 08:33:46.000000000 +0000 @@ -356,7 +356,7 @@ 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 apt-get will abort. Configuration Item: APT::Get::Assume-Yes. @@ -413,7 +413,7 @@ Allow installing new packages when used in conjunction with upgrade. 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 upgrade will upgrade the package and install the new dependencies. Note that upgrade with this option will never remove packages, diff -pruN 1.8.0~rc2/doc/apt-verbatim.ent 1.8.0~rc3/doc/apt-verbatim.ent --- 1.8.0~rc2/doc/apt-verbatim.ent 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/apt-verbatim.ent 2019-02-11 08:33:46.000000000 +0000 @@ -268,7 +268,7 @@ "> - + diff -pruN 1.8.0~rc2/doc/design.dbk 1.8.0~rc3/doc/design.dbk --- 1.8.0~rc2/doc/design.dbk 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/design.dbk 2019-02-11 08:33:46.000000000 +0000 @@ -262,7 +262,7 @@ dependencies) 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). diff -pruN 1.8.0~rc2/doc/dpkg-tech.dbk 1.8.0~rc3/doc/dpkg-tech.dbk --- 1.8.0~rc2/doc/dpkg-tech.dbk 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/dpkg-tech.dbk 2019-02-11 08:33:46.000000000 +0000 @@ -271,7 +271,7 @@ successful. half-installed -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. @@ -803,7 +803,7 @@ These files are created internally by dp cleaned up when dpkg exits cleanly. -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 -pruN 1.8.0~rc2/doc/guide.dbk 1.8.0~rc3/doc/guide.dbk --- 1.8.0~rc2/doc/guide.dbk 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/guide.dbk 2019-02-11 08:33:46.000000000 +0000 @@ -231,7 +231,7 @@ use packages on your CD-ROM before downl The Sources 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. diff -pruN 1.8.0~rc2/doc/json-hooks-protocol.md 1.8.0~rc3/doc/json-hooks-protocol.md --- 1.8.0~rc2/doc/json-hooks-protocol.md 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/json-hooks-protocol.md 2019-02-11 08:33:46.000000000 +0000 @@ -105,7 +105,7 @@ install. Each package has the following - *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 -pruN 1.8.0~rc2/doc/libapt-pkg2_to_3.txt 1.8.0~rc3/doc/libapt-pkg2_to_3.txt --- 1.8.0~rc2/doc/libapt-pkg2_to_3.txt 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/libapt-pkg2_to_3.txt 2019-02-11 08:33:46.000000000 +0000 @@ -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 -pruN 1.8.0~rc2/doc/po/apt-doc.pot 1.8.0~rc3/doc/po/apt-doc.pot --- 1.8.0~rc2/doc/po/apt-doc.pot 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/apt-doc.pot 2019-02-11 08:33:46.000000000 +0000 @@ -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 \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 \n" "Language-Team: LANGUAGE \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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1229,7 +1229,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade with this option " @@ -8003,7 +8003,7 @@ msgstr "" #: guide.dbk msgid "" "The Sources 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 -pruN 1.8.0~rc2/doc/po/de.po 1.8.0~rc3/doc/po/de.po --- 1.8.0~rc2/doc/po/de.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/de.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1692,7 +1692,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade with this option " @@ -11523,7 +11523,7 @@ msgstr "" #: guide.dbk msgid "" "The Sources 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 Quellen beginnt durch das Erfragen " diff -pruN 1.8.0~rc2/doc/po/es.po 1.8.0~rc3/doc/po/es.po --- 1.8.0~rc2/doc/po/es.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/es.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1752,7 +1752,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade 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. No-Cache indica al " +"con proxy cachés conformes an HTTP/1.1. No-Cache indica al " "proxy que nunca utilice la respuesta cacheada. Max-Age " "define la máxima antigüedad permitida (en segundos) de un fichero de índice " "en la caché de un proxy. No-Store define que el proxy no " @@ -11008,7 +11008,7 @@ msgstr "" #: guide.dbk msgid "" "The Sources 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 fuentes comienza preguntando la " diff -pruN 1.8.0~rc2/doc/po/fr.po 1.8.0~rc3/doc/po/fr.po --- 1.8.0~rc2/doc/po/fr.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/fr.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1693,7 +1693,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade with this option " @@ -11480,7 +11480,7 @@ msgstr "" #: guide.dbk msgid "" "The Sources 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 Sources débute par l'indication de " diff -pruN 1.8.0~rc2/doc/po/it.po 1.8.0~rc3/doc/po/it.po --- 1.8.0~rc2/doc/po/it.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/it.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1732,7 +1732,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade 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. No-Cache indica al proxy di " +"cache conformi an HTTP/1.1. No-Cache indica al proxy di " "non usare la sua risposta in cache in nessuna circostanza. Max-Age imposta l'età massima consentita (in secondi) di un file indice " "nella cache del proxy. No-Store specifica che il proxy " @@ -11188,7 +11188,7 @@ msgstr "" #: guide.dbk msgid "" "The Sources 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 fonti inizia chiedendo la base " diff -pruN 1.8.0~rc2/doc/po/ja.po 1.8.0~rc3/doc/po/ja.po --- 1.8.0~rc2/doc/po/ja.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/ja.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1677,7 +1677,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade with this option " @@ -10782,7 +10782,7 @@ msgstr "" #: guide.dbk msgid "" "The Sources 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 "" "ソースの準備は基礎となる Debian アーカイブの質問から始ま" diff -pruN 1.8.0~rc2/doc/po/nl.po 1.8.0~rc3/doc/po/nl.po --- 1.8.0~rc2/doc/po/nl.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/nl.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 , 2015, 2016, 2017, 2018. +# Frans Spiesschaert , 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 \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 \n" "Language-Team: Debian Dutch l10n Team \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 apt-get will abort. " "Configuration Item: APT::Get::Assume-Yes." msgstr "" @@ -1765,7 +1765,7 @@ msgstr "" #: apt-get.8.xml msgid "" "Allow installing new packages when used in conjunction with " -"upgrade. This is useful if the update of a installed " +"upgrade. This is useful if the update of an installed " "package requires new dependencies to be installed. Instead of holding the " "package back upgrade will upgrade the package and install " "the new dependencies. Note that upgrade with this option " @@ -3170,11 +3170,6 @@ msgstr "" #. type: Content of: #: apt-mark.8.xml -#, fuzzy -#| msgid "" -#| "auto 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 "" "minimize-manual 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 "" -"auto 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." +"minimize-manual 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: #: 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 PATH " +"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: #: apt.conf.5.xml @@ -10049,19 +10049,15 @@ msgstr "" #. type: Content of: #: apt_auth.conf.5.xml -#, fuzzy -#| msgid "" -#| "The APT auth.conf file /etc/apt/auth.conf can be " -#| "used to store login information in a netrc-like format with restrictive " -#| "file permissions." msgid "" "The APT auth.conf file /etc/apt/auth.conf, and .conf " "files inside /etc/apt/auth.conf.d can be used to store " "login information in a netrc-like format with restrictive file permissions." msgstr "" -"Het bestand auth.conf van APT, /etc/apt/auth.conf, 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, /etc/apt/auth.conf, en ." +"conf-bestanden in de map /etc/apt/auth.conf.d kunnen " +"gebruikt worden om er login-informatie in op te slaan in een netrc-achtige " +"indeling met restrictieve bestandspermissies." #. type: Content of: #: 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 -pruN 1.8.0~rc2/doc/po/pl.po 1.8.0~rc3/doc/po/pl.po --- 1.8.0~rc2/doc/po/pl.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/pl.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 -pruN 1.8.0~rc2/doc/po/pt_BR.po 1.8.0~rc3/doc/po/pt_BR.po --- 1.8.0~rc2/doc/po/pt_BR.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/pt_BR.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 "" diff -pruN 1.8.0~rc2/doc/po/pt.po 1.8.0~rc3/doc/po/pt.po --- 1.8.0~rc2/doc/po/pt.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/doc/po/pt.po 2019-02-11 08:33:46.000000000 +0000 @@ -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 -pruN 1.8.0~rc2/methods/aptmethod.h 1.8.0~rc3/methods/aptmethod.h --- 1.8.0~rc2/methods/aptmethod.h 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/methods/aptmethod.h 2019-02-11 08:33:46.000000000 +0000 @@ -339,11 +339,18 @@ protected: constexpr const char *str1 = "\n **** Seccomp prevented execution of syscall "; constexpr const char *str2 = " on architecture "; constexpr const char *str3 = " ****\n"; +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" +#endif write(2, str1, strlen(str1)); write(2, buffer, sizeof(buffer)); write(2, str2, strlen(str2)); write(2, COMMON_ARCH, strlen(COMMON_ARCH)); write(2, str3, strlen(str3)); +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif _exit(31); }; action.sa_flags = SA_SIGINFO; diff -pruN 1.8.0~rc2/po/apt-all.pot 1.8.0~rc3/po/apt-all.pot --- 1.8.0~rc2/po/apt-all.pot 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/po/apt-all.pot 2019-02-11 08:33:46.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.8.0~rc1\n" +"Project-Id-Version: apt 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" diff -pruN 1.8.0~rc2/po/nl.po 1.8.0~rc3/po/nl.po --- 1.8.0~rc2/po/nl.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/po/nl.po 2019-02-11 08:33:46.000000000 +0000 @@ -6,14 +6,14 @@ # Wannes Soenen <wannes@wannes.cjb.net>, 2002. # Frans Pop <elendil@planet.nl>, 2010. # Jeroen Schot <schot@a-eskwadraat.nl>, 2011. -# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2016, 2017, 2018. +# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2016, 2017, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: apt 1.7.0\n" +"Project-Id-Version: apt 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-10-09 16:26+0200\n" +"POT-Creation-Date: 2019-02-10 13:19+0100\n" +"PO-Revision-Date: 2019-01-29 17:31+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" @@ -2748,31 +2748,31 @@ msgstr "" #: cmdline/apt-cache.cc msgid "Show source records" -msgstr "Toon een rapport over de broncode" +msgstr "Een rapport over de broncode tonen" #: cmdline/apt-cache.cc msgid "Search the package list for a regex pattern" -msgstr "Doorzoek pakkettenlijst a.d.h.v. een regex-patroon" +msgstr "De pakkettenlijst a.d.h.v. een regex-patroon doorzoeken" #: cmdline/apt-cache.cc msgid "Show raw dependency information for a package" -msgstr "Toon de afhankelijkheden van een pakket" +msgstr "De ruwe vereisteninformatie van een pakket tonen" #: cmdline/apt-cache.cc msgid "Show reverse dependency information for a package" -msgstr "Toon de pakketten die afhankelijk zijn van een pakket" +msgstr "De pakketten die van een pakket afhankelijk zijn, tonen" #: cmdline/apt-cache.cc msgid "Show a readable record for the package" -msgstr "Toon een leesbaar rapport over het pakket" +msgstr "Een leesbaar rapport over het pakket tonen" #: cmdline/apt-cache.cc msgid "List the names of all packages in the system" -msgstr "Toon de namen van alle pakketten op het systeem" +msgstr "De naam van alle pakketten op het systeem tonen" #: cmdline/apt-cache.cc msgid "Show policy settings" -msgstr "Toon beleidsinstellingen" +msgstr "Beleidsinstellingen tonen" #: cmdline/apt-cdrom.cc msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" @@ -2844,7 +2844,7 @@ msgstr "configuratiewaarden via shell-ev #: cmdline/apt-config.cc msgid "show the active configuration setting" -msgstr "toon de actieve configuratie-instelling" +msgstr "de actieve configuratie-instelling tonen" #: cmdline/apt-dump-solver.cc msgid "" @@ -2926,33 +2926,33 @@ msgstr "" #: cmdline/apt-get.cc msgid "Retrieve new lists of packages" -msgstr "Haal een nieuwe lijst van pakketten op" +msgstr "Een nieuwe lijst van pakketten ophalen" #: cmdline/apt-get.cc msgid "Perform an upgrade" -msgstr "Voer een opwaardering uit" +msgstr "Een opwaardering uitvoeren" #: cmdline/apt-get.cc msgid "Install new packages (pkg is libc6 not libc6.deb)" -msgstr "Installeer nieuwe pakketten (pakket is bijv. libc6, niet libc6.deb)" +msgstr "Nieuwe pakketten installeren (pakket is bijv. libc6, niet libc6.deb)" #: cmdline/apt-get.cc #, fuzzy #| msgid "Install new packages (pkg is libc6 not libc6.deb)" msgid "Reinstall packages (pkg is libc6 not libc6.deb)" -msgstr "Installeer nieuwe pakketten (pakket is bijv. libc6, niet libc6.deb)" +msgstr "Nieuwe pakketten installeren (pakket is bijv. libc6, niet libc6.deb)" #: cmdline/apt-get.cc msgid "Remove packages" -msgstr "Verwijder pakketten" +msgstr "Pakketten verwijderen" #: cmdline/apt-get.cc msgid "Remove packages and config files" -msgstr "Verwijder pakketten en hun configuratiebestanden" +msgstr "Pakketten en hun configuratiebestanden verwijderen" #: cmdline/apt-get.cc cmdline/apt.cc msgid "Remove automatically all unused packages" -msgstr "Verwijder automatisch alle ongebruikte pakketten" +msgstr "Automatisch alle ongebruikte pakketten verwijderen" #: cmdline/apt-get.cc msgid "Distribution upgrade, see apt-get(8)" @@ -2964,31 +2964,31 @@ msgstr "Opwaardering volgens dselect-sel #: cmdline/apt-get.cc msgid "Configure build-dependencies for source packages" -msgstr "Installeer de pakketten vereist voor het bouwen van een bronpakket" +msgstr "De bouwvereisten van een bronpakket configureren" #: cmdline/apt-get.cc msgid "Erase downloaded archive files" -msgstr "Verwijder opgehaalde archiefbestanden" +msgstr "Opgehaalde archiefbestanden verwijderen" #: cmdline/apt-get.cc msgid "Erase old downloaded archive files" -msgstr "Verwijder verouderde opgehaalde archiefbestanden" +msgstr "Verouderde opgehaalde archiefbestanden verwijderen" #: cmdline/apt-get.cc msgid "Verify that there are no broken dependencies" -msgstr "Controleer op onvoldane vereisten" +msgstr "Verifiëren dat er geen defecte vereisten zijn" #: cmdline/apt-get.cc msgid "Download source archives" -msgstr "Haal bronarchieven op" +msgstr "Bronarchieven downloaden" #: cmdline/apt-get.cc msgid "Download the binary package into the current directory" -msgstr "Haal het binaire pakket op en plaats het in de werkmap" +msgstr "Het binaire pakket naar de huidige map downloaden" #: cmdline/apt-get.cc msgid "Download and display the changelog for the given package" -msgstr "Haal log op van wijzigingen aan een bepaald pakket en toon die" +msgstr "De log van wijzigingen aan het opgegeven pakket downloaden en tonen" #: cmdline/apt-helper.cc msgid "Need one URL as argument" @@ -3026,15 +3026,15 @@ msgstr "" #: cmdline/apt-helper.cc msgid "download the given uri to the target-path" -msgstr "haal opgegeven uri op en plaats in doelpad" +msgstr "het opgegeven uri ophalen en in het doelpad plaatsen" #: cmdline/apt-helper.cc msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" -msgstr "zoek een SRV-record (bijv. _http._tcp.ftp.debian.org) op" +msgstr "een SRV-record (bijv. _http._tcp.ftp.debian.org) opzoeken" #: cmdline/apt-helper.cc msgid "concatenate files, with automatic decompression" -msgstr "voeg bestanden samen, met automatische decompressie" +msgstr "bestanden samenvoegen, met automatische decompressie" #: cmdline/apt-helper.cc msgid "detect proxy using apt.conf" @@ -3042,12 +3042,12 @@ msgstr "proxy opzoeken met behulp van ap #: cmdline/apt-helper.cc msgid "wait for system to be online" -msgstr "wacht tot het systeem online is" +msgstr "wachten tot het systeem online is" #: cmdline/apt-helper.cc msgid "drop privileges before running given command" msgstr "" -"laat bijzondere rechten vallen voordat het gegeven commando uitgevoerd wordt" +"bijzondere rechten laten vallen voordat het gegeven commando uitgevoerd wordt" #: cmdline/apt-internal-planner.cc msgid "" @@ -3094,13 +3094,12 @@ msgstr "%s was reeds ingesteld als autom #: cmdline/apt-mark.cc msgid "No changes necessary" -msgstr "" +msgstr "Er zijn geen wijzigingen nodig" #: cmdline/apt-mark.cc -#, fuzzy -#| msgid "The following NEW packages will be installed:" msgid "The following packages will be marked as automatically installed:" -msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" +msgstr "" +"De volgende pakketten zullen gemarkeerd worden als automatisch geïnstalleerd:" #: cmdline/apt-mark.cc #, c-format @@ -3160,37 +3159,36 @@ msgstr "" #: cmdline/apt-mark.cc msgid "Mark the given packages as automatically installed" -msgstr "Markeer het vermelde pakket als automatisch geïnstalleerd" +msgstr "Het vermelde pakket als automatisch geïnstalleerd markeren" #: cmdline/apt-mark.cc msgid "Mark the given packages as manually installed" -msgstr "Markeer het vermelde pakket als manueel geïnstalleerd" +msgstr "Het vermelde pakket als manueel geïnstalleerd markeren" #: cmdline/apt-mark.cc -#, fuzzy -#| msgid "Mark the given packages as automatically installed" msgid "Mark all dependencies of meta packages as automatically installed." -msgstr "Markeer het vermelde pakket als automatisch geïnstalleerd" +msgstr "" +"Alle vereisten van meta-pakketten als automatisch geïnstalleerd markeren." #: cmdline/apt-mark.cc msgid "Mark a package as held back" -msgstr "Markeer een pakket als gehandhaafd" +msgstr "Een pakket als gehandhaafd markeren" #: cmdline/apt-mark.cc msgid "Unset a package set as held back" -msgstr "Markeer een pakket niet langer als gehandhaafd" +msgstr "Een pakket niet langer als gehandhaafd markeren" #: cmdline/apt-mark.cc msgid "Print the list of automatically installed packages" -msgstr "Toon de lijst van automatisch geïnstalleerde pakketten" +msgstr "De lijst van automatisch geïnstalleerde pakketten tonen" #: cmdline/apt-mark.cc msgid "Print the list of manually installed packages" -msgstr "Toon de lijst van manueel geïnstalleerde pakketten" +msgstr "De lijst van manueel geïnstalleerde pakketten tonen" #: cmdline/apt-mark.cc msgid "Print the list of packages on hold" -msgstr "Toon de lijst van te handhaven pakketten" +msgstr "De lijst van te handhaven pakketten tonen" #: cmdline/apt-sortpkgs.cc msgid "Unknown package record!" @@ -3233,50 +3231,50 @@ msgstr "" #. query #: cmdline/apt.cc msgid "list packages based on package names" -msgstr "geef een lijst van pakketten op basis van hun naam" +msgstr "pakketten tonen op basis van hun naam" #: cmdline/apt.cc msgid "search in package descriptions" -msgstr "zoek in de pakketbeschrijvingen" +msgstr "in de pakketbeschrijvingen zoeken" #: cmdline/apt.cc msgid "show package details" -msgstr "toon gedetailleerde informatie over het pakket" +msgstr "gedetailleerde informatie over het pakket tonen" #. package stuff #: cmdline/apt.cc msgid "install packages" -msgstr "installeer pakketten" +msgstr "pakketten installeren" #: cmdline/apt.cc #, fuzzy #| msgid "install packages" msgid "reinstall packages" -msgstr "installeer pakketten" +msgstr "pakketten installeren" #: cmdline/apt.cc msgid "remove packages" -msgstr "verwijder pakketten" +msgstr "pakketten verwijderen" #. system wide stuff #: cmdline/apt.cc msgid "update list of available packages" -msgstr "werk de lijst van beschikbare pakketten bij" +msgstr "de lijst van beschikbare pakketten bijwerken" #: cmdline/apt.cc msgid "upgrade the system by installing/upgrading packages" -msgstr "waardeer het systeem op door pakketten te installeren/op te waarderen" +msgstr "het systeem opwaarderen door pakketten te installeren/op te waarderen" #: cmdline/apt.cc msgid "upgrade the system by removing/installing/upgrading packages" msgstr "" -"waardeer het systeem op door pakketten te verwijderen/te installeren/op te " +"het systeem opwaarderen door pakketten te verwijderen/te installeren/op te " "waarderen" #. misc #: cmdline/apt.cc msgid "edit the source information file" -msgstr "bewerk het bestand met informatie over de pakketbronnen" +msgstr "het bestand met informatie over de pakketbronnen bewerken" #: dselect/install msgid "Bad default setting!" @@ -3416,14 +3414,14 @@ msgstr "" "\n" "Opties:\n" " -h Deze hulptekst\n" -" --md5 Beheer het aanmaken van de MD5\n" +" --md5 Het aanmaken van de MD5 beheren\n" " -s=? Bronvoorrangsbestand\n" " -q Stille uitvoer\n" -" -d=? Selecteert de optionele caching database\n" -" --no-delink Schakelt de debug-modus voor delinking in\n" -" --contents Beheer het aanmaken van het inhoudsbestand\n" -" -c=? Lees dit configuratiebestand in\n" -" -o=? Stel een willekeurige configuratie optie in" +" -d=? De optionele caching database selecteren\n" +" --no-delink De debug-modus voor delinking inschakelen\n" +" --contents Het aanmaken van het inhoudsbestand beheren\n" +" -c=? Dit configuratiebestand inlezen\n" +" -o=? Een willekeurige configuratieoptie instellen" #: ftparchive/apt-ftparchive.cc msgid "No selections matched" diff -pruN 1.8.0~rc2/po/ru.po 1.8.0~rc3/po/ru.po --- 1.8.0~rc2/po/ru.po 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/po/ru.po 2019-02-11 08:33:46.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: apt 1.8.0\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: 2019-01-29 21:20+0300\n" +"PO-Revision-Date: 2019-02-10 11:50+0300\n" "Last-Translator: Aleksej Shilin <rootlexx@mail.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" "Language: ru\n" @@ -67,17 +67,17 @@ msgstr "Неправильная кон #: apt-inst/contrib/extracttar.cc #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" +msgstr "Неизвестный тип %u, элемент %s в заголовке TAR" #: apt-inst/deb/debfile.cc #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Это неправильный DEB-архив: отсутствует составная часть «%s»" +msgstr "Это неправильный DEB-архив: отсутствует элемент «%s»" #: apt-inst/deb/debfile.cc #, c-format msgid "Internal error, could not locate member %s" -msgstr "Внутренняя ошибка: не удалось найти составную часть %s" +msgstr "Внутренняя ошибка: не удалось найти элемент %s" #: apt-inst/deb/debfile.cc msgid "Unparsable control file" @@ -86,7 +86,7 @@ msgstr "Не удалось разобр #: apt-inst/dirstream.cc #, c-format msgid "Failed to write file %s" -msgstr "Не удалось записать в файл %s" +msgstr "Не удалось записать файл %s" #: apt-inst/dirstream.cc #, c-format @@ -144,7 +144,7 @@ msgstr "Путь слишком длин #: apt-inst/extract.cc #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Файлы заменяются содержимым пакета %s без версии" +msgstr "У пакета %s, файлы которого заменяются, отсутствует версия" #: apt-inst/extract.cc #, c-format @@ -217,7 +217,7 @@ msgid "" "See apt-secure(8) manpage for repository creation and user configuration " "details." msgstr "" -"Информацию о создании репозитория и настройке пользователя смотрите в " +"Информацию о создании репозитория и настройках пользователя смотрите в " "справочной странице apt-secure(8)." #: apt-pkg/acquire-item.cc @@ -290,7 +290,7 @@ msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -"Некорректный подписанный файл: получено «%s» (возможно, в сети требуется " +"Подписанный файл некорректен: получено «%s» (возможно, в сети требуется " "аутентификация?)" #: apt-pkg/acquire-item.cc @@ -435,6 +435,9 @@ msgid "" "The method '%s' is unsupported and disabled by default. Consider switching " "to http(s). Set Dir::Bin::Methods::%s to \"%s\" to enable it again." msgstr "" +"Метод «%s» не поддерживается и по умолчанию отключён. Рассмотрите " +"возможность перехода на использование http(s). Чтобы включить его снова, " +"установите параметр Dir::Bin::Methods::%s в значение «%s»." #: apt-pkg/acquire-worker.cc #, c-format @@ -667,8 +670,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -"Не удалось найти ни одного файла пакетов; возможно, это не диск Debian или с " -"не той архитектурой?" +"Не удалось найти ни одного файла пакетов; возможно, это не диск Debian или " +"не с той архитектурой?" #: apt-pkg/cdrom.cc #, c-format @@ -774,7 +777,7 @@ msgstr "Неверная операци #: apt-pkg/contrib/configuration.cc #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Неизвестная аббревиатура типа: «%c»" +msgstr "Неизвестное сокращение типа: «%c»" #: apt-pkg/contrib/configuration.cc #, c-format @@ -1621,6 +1624,8 @@ msgstr "Неизвестный тип п msgid "" "%s: The special 'Pin-Priority: %s' can only be used for 'Package: *' records" msgstr "" +"%s: специальная привязка «Pin-Priority: %s» может использоваться только для " +"записей вида «Package: *»" #: apt-pkg/policy.cc #, c-format @@ -1764,8 +1769,7 @@ msgstr " Готово" #: apt-private/private-cachefile.cc apt-private/private-install.cc msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt --fix-" -"broken install»." +"Вы можете запустить «apt --fix-broken install» для исправления этих ошибок." #: apt-private/private-cachefile.cc apt-private/private-install.cc msgid "" @@ -1872,7 +1876,7 @@ msgid "" msgstr "" "Параметры настройки и синтаксис описаны в apt.conf(5).\n" "Информацию о том, как настроить источники, можно найти в sources.list(5).\n" -"Выбор пакетов и версий описывается через apt_preferences(5).\n" +"Выбор пакетов и версий описывается в apt_preferences(5).\n" "Информация о безопасности доступна в apt-secure(8).\n" #: apt-private/private-cmndline.cc @@ -2923,11 +2927,9 @@ msgstr "" "deb)" #: cmdline/apt-get.cc -#, fuzzy -#| msgid "Install new packages (pkg is libc6 not libc6.deb)" msgid "Reinstall packages (pkg is libc6 not libc6.deb)" msgstr "" -"установить новые пакеты (указывается имя пакета libc6, а не имя файла libc6." +"переустановить пакеты (указывается имя пакета libc6, а не имя файла libc6." "deb)" #: cmdline/apt-get.cc @@ -3213,7 +3215,7 @@ msgstr "" #. query #: cmdline/apt.cc msgid "list packages based on package names" -msgstr "показать список пакетов из указанных имён пакетов" +msgstr "показать список пакетов на основе указанных имён" #: cmdline/apt.cc msgid "search in package descriptions" @@ -3229,10 +3231,8 @@ msgid "install packages" msgstr "установить пакеты" #: cmdline/apt.cc -#, fuzzy -#| msgid "install packages" msgid "reinstall packages" -msgstr "установить пакеты" +msgstr "переустановить пакеты" #: cmdline/apt.cc msgid "remove packages" diff -pruN 1.8.0~rc2/test/integration/test-apt-get-source-authenticated 1.8.0~rc3/test/integration/test-apt-get-source-authenticated --- 1.8.0~rc2/test/integration/test-apt-get-source-authenticated 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/test/integration/test-apt-get-source-authenticated 2019-02-11 08:33:46.000000000 +0000 @@ -2,7 +2,7 @@ # # Regression test for debian bug #749795. Ensure that we fail with # an error if apt-get source foo will download a source that comes -# from a unauthenticated repository +# from an unauthenticated repository # set -e diff -pruN 1.8.0~rc2/test/interactive-helper/aptwebserver.cc 1.8.0~rc3/test/interactive-helper/aptwebserver.cc --- 1.8.0~rc2/test/interactive-helper/aptwebserver.cc 2019-02-04 17:15:07.000000000 +0000 +++ 1.8.0~rc3/test/interactive-helper/aptwebserver.cc 2019-02-11 08:33:46.000000000 +0000 @@ -464,7 +464,7 @@ static bool parseFirstLine(std::ostream closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0; else { - sendError(log, client, 500, request, sendContent, "Not a HTTP/1.{0,1} request", headers); + sendError(log, client, 500, request, sendContent, "Not an HTTP/1.{0,1} request", headers); return false; }