diff --git a/CMake/Misc.cmake b/CMake/Misc.cmake index 6ad0b9479a34c8f6144093a363e3a7895a3ce51e..8cb18b6ac371ce123e829649e29c9308bf1b439c 100644 --- a/CMake/Misc.cmake +++ b/CMake/Misc.cmake @@ -51,17 +51,17 @@ function(add_vendor_file) endfunction() # Add symbolic links to a file -function(add_slaves destination master) - set(slaves "") - foreach(slave ${ARGN}) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${slave} - COMMAND ${CMAKE_COMMAND} -E create_symlink ${master} ${CMAKE_CURRENT_BINARY_DIR}/${slave}) - list(APPEND slaves ${CMAKE_CURRENT_BINARY_DIR}/${slave}) +function(add_links directory target) + set(link_names "") + foreach(link_name ${ARGN}) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${link_name} + COMMAND ${CMAKE_COMMAND} -E create_symlink ${target} ${CMAKE_CURRENT_BINARY_DIR}/${link_name}) + list(APPEND link_names ${CMAKE_CURRENT_BINARY_DIR}/${link_name}) endforeach() - STRING(REPLACE "/" "-" master "${master}") - add_custom_target(${master}-slaves ALL DEPENDS ${slaves}) - install(FILES ${slaves} DESTINATION ${destination}) + STRING(REPLACE "/" "-" target "${target}") + add_custom_target(${target}-link_names ALL DEPENDS ${link_names}) + install(FILES ${link_names} DESTINATION ${directory}) endfunction() # Generates a simple version script versioning everything with current SOVERSION diff --git a/CMake/Translations.cmake b/CMake/Translations.cmake index 54a635ab6c3624fea863ca954a6da6f70b78ac59..24925105c943a6b73ce1294b864d2d828712aafa 100644 --- a/CMake/Translations.cmake +++ b/CMake/Translations.cmake @@ -136,8 +136,8 @@ function(apt_add_update_po) list(APPEND potfiles ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot) endforeach() - get_filename_component(master_name ${output} NAME_WE) - add_custom_target(nls-${master_name} + get_filename_component(primary_name ${output} NAME_WE) + add_custom_target(nls-${primary_name} COMMAND msgcomm --sort-by-file --add-location=file --more-than=0 --output=${output} ${potfiles} @@ -154,11 +154,11 @@ function(apt_add_update_po) endif() add_custom_target(update-po-${langcode} COMMAND msgmerge -q --previous --update --backup=none ${translation} ${output} - DEPENDS nls-${master_name} + DEPENDS nls-${primary_name} ) add_dependencies(update-po update-po-${langcode}) endforeach() - add_dependencies(update-po nls-${master_name}) + add_dependencies(update-po nls-${primary_name}) endfunction() function(apt_add_po_statistics excluded) diff --git a/CMakeLists.txt b/CMakeLists.txt index afd74adb5f801f5468cb4b7595585360e48e3fc5..e9a9008018c397fe7aeb3ad409b2cfeb7526403c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,i # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "2.1.7") +set(PACKAGE_VERSION "2.1.8") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index d956eaf001cf9c0b34397704caa2c4dbdb0bd014..28f3150c3ca56dcc460137d631ead6acf4cca7cc 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -251,6 +251,9 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, setenv("APT_CONFIG", conf.get(), 1); } + // Tell apt-key not to emit warnings + setenv("APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE", "1", 1); + if (releaseSignature == DETACHED) { auto detached = make_unique_FILE(FileGPG, "r"); diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 972472986dbf5c479c6529ec25b8c2f6ee611d12..bd48565262f4c510420430ec0376e0da2672ed67 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1771,7 +1771,7 @@ URI::operator string() { // FIXME: Technically userinfo is permitted even less // characters than these, but this is not conveniently - // expressed with a blacklist. + // expressed with a denylist. Res << QuoteString(User, ":/?#[]@"); if (Password.empty() == false) Res << ":" << QuoteString(Password, ":/?#[]@"); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 817d9de3c844aab0ded7d079b33d81189095fec9..c7ef7a40061fe6843497ed117b8af794454801cb 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1156,6 +1156,7 @@ struct CompareProviders /*{{{*/ /*}}}*/ bool pkgDepCache::MarkInstall_StateChange(pkgCache::PkgIterator const &Pkg, bool AutoInst, bool FromUser) /*{{{*/ { + bool AlwaysMarkAsAuto = _config->FindB("APT::Get::Mark-Auto", false) == true; auto &P = (*this)[Pkg]; if (P.Protect() && P.InstallVer == P.CandidateVer) return true; @@ -1171,7 +1172,7 @@ bool pkgDepCache::MarkInstall_StateChange(pkgCache::PkgIterator const &Pkg, bool P.Mode = pkgDepCache::ModeInstall; P.InstallVer = P.CandidateVer; - if(FromUser) + if(FromUser && !AlwaysMarkAsAuto) { // Set it to manual if it's a new install or already installed, // but only if its not marked by the autoremover (aptitude depend on this behavior) diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 478cb95f12e9ef0590c8d51302ff64f46b305e97..bcafe785bce302579c8df1025b1be7b6ef1ca9b5 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -276,6 +276,7 @@ static bool addArgumentsAPTGet(std::vector &Args, char const addArg(0,"force-yes","APT::Get::force-yes",0); addArg(0,"print-uris","APT::Get::Print-URIs",0); addArg(0,"trivial-only","APT::Get::Trivial-Only",0); + addArg(0,"mark-auto","APT::Get::Mark-Auto",0); addArg(0,"remove","APT::Get::Remove",0); addArg(0,"only-source","APT::Get::Only-Source",0); addArg(0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0); diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index 248f1f36e215a4cbf8b06d44b6e60fd68ffc09b4..affae655df51d242a0673b25fe6d8cb974eab3f1 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -110,7 +110,7 @@ bool DoUpdate(CommandLine &CmdL) if (uri.User.empty() && uri.Password.empty()) continue; // we can't really predict if a +http method supports everything http does, - // so we play it safe and use a whitelist here. + // so we play it safe and use an allowlist here. char const *const affected[] = {"http", "https", "tor+http", "tor+https", "ftp"}; if (std::find(std::begin(affected), std::end(affected), uri.Access) != std::end(affected)) // TRANSLATOR: the first two are manpage references, the last the URI from a sources.list diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt index d82239bee5cc7bd540889fc9ed58cdc4cf123376..91bf9bb0cc96bd2bedd3c0fec75c4dd9fe2d25e5 100644 --- a/cmdline/CMakeLists.txt +++ b/cmdline/CMakeLists.txt @@ -53,7 +53,7 @@ install(TARGETS apt-helper RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/) install(TARGETS apt-dump-solver apt-internal-solver RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/solvers) install(TARGETS apt-internal-planner RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/planners) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/planners ../solvers/dump planners/dump) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/planners ../solvers/dump planners/dump) # Install the not-to-be-compiled programs INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/apt-key DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index e9187b423be898094fe4ae17e66b8e176e4bafb5..baf3df5c35a50b388da97eea2e6901af7439bdb7 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -671,10 +671,10 @@ prepare_gpg_home() { # well as the script hopefully uses apt-key optionally then like e.g. # debian-archive-keyring for (upgrade) cleanup did if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] && [ -z "$APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE" ]; then - if ! dpkg-query --show --showformat '${Pre-Depends}${Depends}${Recommends}\n' "$DPKG_MAINTSCRIPT_PACKAGE" 2>/dev/null | grep -q gnupg; then + if ! dpkg-query --show --showformat '${Pre-Depends}${Depends}${Recommends}\n' "$DPKG_MAINTSCRIPT_PACKAGE" 2>/dev/null | grep -E -q 'gpg|gnupg'; then cat >&2 <&2 "Warning: apt-key should not be used in scripts (called from $DPKG_MAINTSCRIPT_NAME maintainerscript of the package ${DPKG_MAINTSCRIPT_PACKAGE})" - elif [ ! -t 1 ]; then - echo >&2 "Warning: apt-key output should not be parsed (stdout is not a terminal)" + fi + + echo >&2 "Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8))." +} + +warn_outside_maintscript() { + # In del, we want to warn in interactive use, but not inside maintainer + # scripts, so as to give people a chance to migrate keyrings. + # + # FIXME: We should always warn starting in 2022. + if [ -z "$DPKG_MAINTSCRIPT_PACKAGE" ]; then + echo >&2 "Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8))." fi } @@ -760,6 +770,7 @@ case "$command" in ;; del|rm|remove) # no script warning here as removing 'add' usage needs 'del' for cleanup + warn_outside_maintscript requires_root foreach_keyring_do 'remove_key_from_keyring' "$@" aptkey_echo "OK" @@ -772,6 +783,7 @@ case "$command" in merge_back_changes ;; net-update) + warn_on_script_usage requires_root setup_merged_keyring net_update diff --git a/debian/apt.postinst b/debian/apt.postinst index 8d1cdb1b30a7a6e2b8e98f80bcbea65978fc8a8b..0c6b5db9c22e16d8b89a81e24f08d965151438ea 100755 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -60,7 +60,7 @@ case "$1" in chmod -f 0640 /var/log/apt/term.log* || true fi - # create kernel autoremoval blacklist on update + # create kernel autoremoval denylist on update if dpkg --compare-versions "$2" lt 0.9.9.3; then /etc/kernel/postinst.d/apt-auto-removal fi diff --git a/debian/changelog b/debian/changelog index 65c514158a21a1a06725bfa1101865d85a9a8df6..cf3898458ace79f7f5898938e1688ab3b1bf4ae0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +apt (2.1.8+parrot1) rolling-testing; urgency=medium + + * Import new Debian release. + + -- Lorenzo "Palinuro" Faletra Wed, 12 Aug 2020 01:01:03 +0200 + +apt (2.1.8) unstable; urgency=medium + + [ Julian Andres Klode ] + * Fully deprecate apt-key, schedule removal for Q2/2022 + * apt-key: Allow depending on gpg instead of gnupg + * Removal of racist terminology, except for two cases that still need consensus + * Various fixes to http code: + - http: Always Close() the connection in Die() + - http: Die(): Merge flushing code from Flush() + - http: Only return false for EOF if we actually did not read anything + - http: Die(): Do not flush the buffer, error out instead + - http: Finish copying data from server to file before sending stuff to server + - http: On select timeout, error out directly, do not call Die() + - http: Redesign reading of pending data + - http: Always write to the file if there's something to write; this fixes + a regression from removing the buffer flushing code + Overall, there's hope this Closes: #959518. It reproduced a bit, but eventually + snapshot.d.o ratelimiting kicked in and broke the test case. + + [ Nicolas Schier ] + * Support marking all newly installed packages as automatically installed + + -- Julian Andres Klode Tue, 04 Aug 2020 12:41:28 +0200 + apt (2.1.7+parrot1) rolling-testing; urgency=medium * Import new Debian version. diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index e603ec5bbf73b067c71da5c41d23ee2d9028f9a7..38a8c253ae2d035966ca8b7fa5c3bc10cb85e4a4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 2020-01-15T00:00:00Z + 2020-02-27T00:00:00Z @@ -545,6 +545,16 @@ Configuration Item: APT::Get::Trivial-Only. + + + After successful installation, mark all freshly installed packages as + automatically installed, which will cause each of the packages to be + removed when no more manually installed packages depend on this package. + This is equally to running apt-mark auto for all + installed packages. + Configuration Item: APT::Get::Mark-Auto. + + If any packages are to be removed apt-get immediately aborts without prompting. diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 1ab4d784e3b7816df2e11a8fa1ab01e66a48ae31..eace6a02ebd1653a37645e76292432c3c0d70561 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; - 2019-04-04T00:00:00Z + 2020-05-06T00:00:00Z @@ -25,7 +25,7 @@ apt-key - APT key management utility + Deprecated APT key management utility &synopsis-command-apt-key; @@ -37,13 +37,15 @@ authenticated using these keys will be considered trusted. - Note that if usage of apt-key is desired the additional + Use of apt-key is deprecated, except for the use of + apt-key del in maintainer scripts to remove existing + keys from the main keyring. + If such usage of apt-key is desired the additional installation of the GNU Privacy Guard suite (packaged in - gnupg) is required. For this reason alone the programmatic - usage (especially in package maintainer scripts!) is strongly discouraged. - Further more the output format of all commands is undefined and can and does - change whenever the underlying commands change. apt-key will - try to detect such usage and generates warnings on stderr in these cases. + gnupg) is required. + + + apt-key(8) will last be available in Debian 11 and Ubuntu 22.04. @@ -63,7 +65,7 @@ Commands - + (deprecated) Add a new key to the list of trusted keys. @@ -85,7 +87,7 @@ - + (mostly deprecated) @@ -96,7 +98,7 @@ - + (deprecated) @@ -107,7 +109,7 @@ - + (deprecated) @@ -118,7 +120,7 @@ - , + , (deprecated) @@ -129,7 +131,7 @@ - + (deprecated) Pass advanced options to gpg. With adv --recv-key you @@ -160,7 +162,7 @@ - + (deprecated) @@ -183,7 +185,7 @@ Options Note that options need to be defined before the commands described in the previous section. - + (deprecated) With this option it is possible to specify a particular keyring file the command should operate on. The default is that a command is executed on the trusted.gpg file as well as on all parts in the diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index c691d1de8d4b458bb7c5543c6b92a243e87057c8..b1c8a21b232f6c2811919a13dcfa540275d1f2d8 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -274,7 +274,7 @@ "> - + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f04e32502fc149bf4f1f1ddf0ec3a7039f7f65b0..d9f269344f06e528d81c15c324af8916c19d8824 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -73,6 +73,7 @@ APT Assume-Yes ""; // not as dangerous, but use with care still Assume-No ""; Trivial-Only ""; + Mark-Auto ""; Remove ""; AllowUnauthenticated ""; // skip security diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index f0bf7bdf1bc1bce3cbfa4829b4dce37b0084f6cf..dee3265e286430bc629f3a959742b0a5c9ca6c1a 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 2.1.7\n" +"Project-Id-Version: apt-doc 2.1.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2020-07-08 09:40+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1411,6 +1411,16 @@ msgid "" "APT::Get::Trivial-Only." msgstr "" +#. type: Content of: +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running apt-mark auto for all installed " +"packages. Configuration Item: APT::Get::Mark-Auto." +msgstr "" + #. type: Content of: #: apt-get.8.xml msgid "" @@ -2014,7 +2024,7 @@ msgstr "" #. type: Content of: #: apt-key.8.xml -msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "" #. type: Content of: @@ -2028,14 +2038,16 @@ msgstr "" #. type: Content of: #: apt-key.8.xml msgid "" -"Note that if usage of apt-key is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in " -"gnupg) is required. For this reason alone the " -"programmatic usage (especially in package maintainer scripts!) is strongly " -"discouraged. Further more the output format of all commands is undefined " -"and can and does change whenever the underlying commands " -"change. apt-key will try to detect such usage and " -"generates warnings on stderr in these cases." +"Use of apt-key is deprecated, except for the use of " +"apt-key del in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of apt-key is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in gnupg) is required." +msgstr "" + +#. type: Content of: +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." msgstr "" #. type: Content of: @@ -2067,6 +2079,11 @@ msgstr "" msgid "Commands" msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2092,6 +2109,11 @@ msgid "" "\"<literal>asc</literal>\" as file extension." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(mostly deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2122,11 +2144,6 @@ msgid "" "care." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" diff --git a/doc/po/de.po b/doc/po/de.po index 5d471a61d8b546c30dfb57708f774035779be0d9..f6014bc908c7eae44975f1cabeb02a1c8f9e36e4 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.0.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-03-24 11:53+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2020-04-04 08:45+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -730,8 +730,8 @@ msgstr "," msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" "führt die angefragte Aktion für eines oder mehrere Pakete durch, die über " "®ex;, &glob; oder exakten Treffer angegeben wurden. Die angefragte Aktion " @@ -1206,8 +1206,8 @@ msgid "" msgstr "" "In APT 2.0 ist ein Rückgriff auf reguläre Ausdrücke missbilligt und wurde in " "&apt; entfernt, außer für verankerte Ausdrücke. Es wird auch in einer " -"zukünftigen Version von &apt-get; entfernt. Nutzen Sie stattdessen " -"&apt-patterns;." +"zukünftigen Version von &apt-get; entfernt. Nutzen Sie stattdessen &apt-" +"patterns;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1975,6 +1975,16 @@ msgstr "" "option> »ja« auf Fragen antwortet, antwortet <option>--trivial-only</option> " "»Nein«. Konfigurationselement: <literal>APT::Get::Trivial-Only</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2848,7 +2858,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "APT-Schlüsselverwaltungsdienstprogramm" #. type: Content of: <refentry><refsect1><para> @@ -2866,24 +2878,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." -msgstr "" -"Falls die Benutzung von <command>apt-key</command> gewünscht wird, beachten " -"Sie, dass die Installation der GNU-Privacy-Guard-Programmsammlung (paketiert " -"in <package>gnupg</package>) erforderlich ist. Allein aus diesem Grund wird " -"vom programmatischen Gebrauch (insbesondere in Betreuerskripten) " -"eindringlich abgeraten. Darüberhinaus ist das Ausgabeformat aller Befehle " -"undefiniert und kann und wird sich immer dann ändern, wenn sich die " -"darunterliegenden Befehle ändern. <command>apt-key</command> wird versuchen, " -"derartige Benutzung zu erkennen und in diesen Fällen Warnungen auf der " -"Standardfehlerausgabe erzeugen." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." +msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2925,6 +2930,11 @@ msgstr "" msgid "Commands" msgstr "Befehle" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "(missbilligt)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2960,6 +2970,13 @@ msgstr "" "literal>« oder »<literal>asc</literal>« als Dateinamenserweiterung direkt im " "Verzeichnis <filename>/etc/apt/trusted.gpg.d/</filename> abgelegt werden." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +#, fuzzy +#| msgid "(deprecated)" +msgid "(mostly deprecated)" +msgstr "(missbilligt)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2996,11 +3013,6 @@ msgstr "" "einfach, die &apt-secure;-Infrastruktur komplett auszuhöhlen, falls dies " "ohne Sorgfalt benutzt wird." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "(missbilligt)" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -6834,9 +6846,8 @@ msgid "" "For example, to pin all binaries produced by the apt source package of this " "APT's version to 990, you can do:" msgstr "" -"Um zum Beispiel ein Pinning für alle von einem Apt-Quellpaket dieser " -"APT-Version erzeugten Programme auf 990 durchzuführen, können Sie Folgendes " -"tun:" +"Um zum Beispiel ein Pinning für alle von einem Apt-Quellpaket dieser APT-" +"Version erzeugten Programme auf 990 durchzuführen, können Sie Folgendes tun:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> #: apt_preferences.5.xml @@ -10112,8 +10123,8 @@ msgstr "" msgid "" "If protocol is not specified, the entry only matches https and tor+https." msgstr "" -"Falls kein Protokoll angegeben wurde, passt der Eintrag nur auf https und " -"tor+https." +"Falls kein Protokoll angegeben wurde, passt der Eintrag nur auf https und tor" +"+https." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt_auth.conf.5.xml @@ -10257,9 +10268,10 @@ msgid "" "for the redirect destination can be supplied." msgstr "" "Anmeldeinformationen in auth.conf sind flexibler als die in sources.list. " -"Anmeldeinformationen können zum Beispiel nur für Teile eines Depots angegeben " -"werden oder wenn der Eintrag der sources.list woanders hin verweist, können " -"die Anmeldeinformationen für das Verweisziel bereitgestellt werden." +"Anmeldeinformationen können zum Beispiel nur für Teile eines Depots " +"angegeben werden oder wenn der Eintrag der sources.list woanders hin " +"verweist, können die Anmeldeinformationen für das Verweisziel bereitgestellt " +"werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt_auth.conf.5.xml @@ -11240,9 +11252,9 @@ msgid "" "complex expressions, as well as <code>?true</code> and <code>?false</code> " "patterns." msgstr "" -"Diese Muster stellen die grundlegenden Mittel zur Verfügung, um andere Muster " -"zu komplexeren Ausdrücken zu kombinieren, sowohl zu <code>?true</code>- als " -"auch zu <code>?false</code>-Mustern." +"Diese Muster stellen die grundlegenden Mittel zur Verfügung, um andere " +"Muster zu komplexeren Ausdrücken zu kombinieren, sowohl zu <code>?true</" +"code>- als auch zu <code>?false</code>-Mustern." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml @@ -11372,9 +11384,9 @@ msgid "" "<code>?and</code> to act on the same version." msgstr "" "Während beispielsweise <code>?and(?version(1),?version(2))</code> auf Pakete " -"passt, die eine Version haben, die 1 enthält und eine Version, die 2 enthält, " -"beschränkt <code>?any-version(?and(?version(1),?version(2)))</code> das " -"<code>?and</code> auf dieselbe Version." +"passt, die eine Version haben, die 1 enthält und eine Version, die 2 " +"enthält, beschränkt <code>?any-version(?and(?version(1),?version(2)))</code> " +"das <code>?and</code> auf dieselbe Version." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml @@ -11416,8 +11428,8 @@ msgid "" "Selects packages matching the specified architecture, which may contain " "wildcards using any." msgstr "" -"wählt Pakete aus, die auf die angegebene Architektur passen, darf Platzhalter " -"mit »any« enthalten." +"wählt Pakete aus, die auf die angegebene Architektur passen, darf " +"Platzhalter mit »any« enthalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml @@ -11642,8 +11654,8 @@ msgid "" "<command>apt-cache policy</command>." msgstr "" "wählt Versionen aus, deren Ursprung auf den regulären Ausdruck passt. " -"Ursprung bedeutet hier, die Werte nach <code>o=</code> in " -"<command>apt-cache policy</command>." +"Ursprung bedeutet hier, die Werte nach <code>o=</code> in <command>apt-cache " +"policy</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-patterns.7.xml @@ -11774,8 +11786,8 @@ msgid "" "Syntax is uniform: If there is an opening parenthesis after a term, it is " "always assumed to be the beginning of an argument list." msgstr "" -"Die Syntax ist einheitlich: Falls es nach einem Begriff eine öffnende Klammer " -"gibt, wird immer vom Anfang einer Argumentenliste ausgegangen." +"Die Syntax ist einheitlich: Falls es nach einem Begriff eine öffnende " +"Klammer gibt, wird immer vom Anfang einer Argumentenliste ausgegangen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-patterns.7.xml @@ -11784,9 +11796,9 @@ msgid "" "and(?foo,bar)\"</code> if foo does not take an argument. In APT, this will " "cause an error." msgstr "" -"In Aptitude kann eine syntaktische Form <code>»?foo(bar)«</code> " -"<code>»?and(?foo,bar)«</code> bedeuten, falls es kein Argument entgegen " -"nimmt. In APT verursacht dies einen Fehler." +"In Aptitude kann eine syntaktische Form <code>»?foo(bar)«</code> <code>»?" +"and(?foo,bar)«</code> bedeuten, falls es kein Argument entgegen nimmt. In " +"APT verursacht dies einen Fehler." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-patterns.7.xml @@ -11829,9 +11841,9 @@ msgstr "" "<code>foo</code> kann nicht als Kurzschreibweise für <code>?name(foo)</code> " "benutzt werden, da dies unbemerkte Tippfehler verursachen kann. Betrachten " "Sie <code>?and(…,~poptional)</code>: Dies erfordert, dass das Paket die " -"Priorität <code>required</code> hat, wenn Sie jedoch nicht das <code>~</code> " -"eintippen, würde es erfordern, dass der Paketname <code>poptional</code> " -"enthält." +"Priorität <code>required</code> hat, wenn Sie jedoch nicht das <code>~</" +"code> eintippen, würde es erfordern, dass der Paketname <code>poptional</" +"code> enthält." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-patterns.7.xml @@ -11840,10 +11852,10 @@ msgid "" "as <code>A|B</code> are not supported. We do not believe that the use of " "<code>|</code> is that common, and the grouping is not necessary without it." msgstr "" -"Bündelnde Muster mit <code>(…)</code> oder der Schreibweise " -"<code>A|B</code> für <code>?or(A,B)</code> werden nicht unterstützt. Wir " -"gehen nicht davon aus, dass die Verwendung von <code>|</code> üblich ist und " -"ohne diese ist eine Bündelung unnötig." +"Bündelnde Muster mit <code>(…)</code> oder der Schreibweise <code>A|B</code> " +"für <code>?or(A,B)</code> werden nicht unterstützt. Wir gehen nicht davon " +"aus, dass die Verwendung von <code>|</code> üblich ist und ohne diese ist " +"eine Bündelung unnötig." #. type: Content of: <refentry><refsect1><para> #: apt-patterns.7.xml @@ -13488,3 +13500,24 @@ msgid "Which will use the already fetched archives on the disc." msgstr "" "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive " "benutzt werden." + +#~ msgid "" +#~ "Note that if usage of <command>apt-key</command> is desired the " +#~ "additional installation of the GNU Privacy Guard suite (packaged in " +#~ "<package>gnupg</package>) is required. For this reason alone the " +#~ "programmatic usage (especially in package maintainer scripts!) is " +#~ "strongly discouraged. Further more the output format of all commands is " +#~ "undefined and can and does change whenever the underlying commands " +#~ "change. <command>apt-key</command> will try to detect such usage and " +#~ "generates warnings on stderr in these cases." +#~ msgstr "" +#~ "Falls die Benutzung von <command>apt-key</command> gewünscht wird, " +#~ "beachten Sie, dass die Installation der GNU-Privacy-Guard-" +#~ "Programmsammlung (paketiert in <package>gnupg</package>) erforderlich " +#~ "ist. Allein aus diesem Grund wird vom programmatischen Gebrauch " +#~ "(insbesondere in Betreuerskripten) eindringlich abgeraten. Darüberhinaus " +#~ "ist das Ausgabeformat aller Befehle undefiniert und kann und wird sich " +#~ "immer dann ändern, wenn sich die darunterliegenden Befehle ändern. " +#~ "<command>apt-key</command> wird versuchen, derartige Benutzung zu " +#~ "erkennen und in diesen Fällen Warnungen auf der Standardfehlerausgabe " +#~ "erzeugen." diff --git a/doc/po/es.po b/doc/po/es.po index d1fdfef95aea779952842f9af16370d0d72240fa..b8e126b850a521dea34411b112363db1436c063c 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-02-26 21:29+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -790,8 +790,8 @@ msgstr "" msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2029,6 +2029,16 @@ msgstr "" "only</option> responderá negativamente. Opción de configuración: " "<literal>APT::Get::Trivial-Only</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2886,7 +2896,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "Herramienta para gestionar las claves de APT" #. type: Content of: <refentry><refsect1><para> @@ -2903,14 +2915,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." msgstr "" #. type: Content of: <refentry><refsect1><title> @@ -2942,6 +2956,11 @@ msgstr "" msgid "Commands" msgstr "Órdenes" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2970,6 +2989,11 @@ msgid "" "\"<literal>asc</literal>\" as file extension." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(mostly deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -3001,11 +3025,6 @@ msgid "" "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" diff --git a/doc/po/fr.po b/doc/po/fr.po index bf2b794292b02759131584dc29879e8efe3c1be8..26160cef2e41e52560bb15e9de490c27073b9019 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.8.0\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-02-26 21:29+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2019-05-01 17:00+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -728,8 +728,8 @@ msgstr "," msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" "La commande réalise l'action requise sur un ou plusieurs paquets spécifiés " "avec ®ex;, &glob; ou avec la correspondance exacte. Les actions requises " @@ -1944,6 +1944,16 @@ msgstr "" "trivial-only</option> répond non. Élément de configuration : <literal>APT::" "Get::Trivial-Only</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2826,7 +2836,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "Utilitaire de gestion des clés d'APT" #. type: Content of: <refentry><refsect1><para> @@ -2842,24 +2854,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." -msgstr "" -"Notez que si vous souhaitez utiliser <command>apt-key</command>, " -"l'installation complémentaire de la suite GNU Privacy Guard (paquet " -"<package>gnupg</package>) est requise. Pour cette raison uniquement, " -"l'utilisation programmée (en particulier dans les scripts des responsables " -"des paquets !) est fortement déconseillée. En outre, le format de sortie de " -"toutes les commandes est indéfini et de plus il peut changer, et il change " -"réellement chaque fois que les commandes sous-jacentes changent. " -"<command>apt-key</command> essaiera de détecter un tel usage et, dans ces " -"cas, enverra des alertes sur l'erreur standard." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." +msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2902,6 +2907,11 @@ msgstr "" msgid "Commands" msgstr "Commandes" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "(obsolète)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2939,6 +2949,13 @@ msgstr "" "« <literal>gpg</literal> » soit « <literal>asc</literal> » comme extension " "de fichier." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +#, fuzzy +#| msgid "(deprecated)" +msgid "(mostly deprecated)" +msgstr "(obsolète)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2974,11 +2991,6 @@ msgstr "" "facile de compromettre complètement l'infrastructure &apt-secure;, si la " "commande est utilisée sans précaution." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "(obsolète)" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -13353,6 +13365,26 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n" msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." +#~ msgid "" +#~ "Note that if usage of <command>apt-key</command> is desired the " +#~ "additional installation of the GNU Privacy Guard suite (packaged in " +#~ "<package>gnupg</package>) is required. For this reason alone the " +#~ "programmatic usage (especially in package maintainer scripts!) is " +#~ "strongly discouraged. Further more the output format of all commands is " +#~ "undefined and can and does change whenever the underlying commands " +#~ "change. <command>apt-key</command> will try to detect such usage and " +#~ "generates warnings on stderr in these cases." +#~ msgstr "" +#~ "Notez que si vous souhaitez utiliser <command>apt-key</command>, " +#~ "l'installation complémentaire de la suite GNU Privacy Guard (paquet " +#~ "<package>gnupg</package>) est requise. Pour cette raison uniquement, " +#~ "l'utilisation programmée (en particulier dans les scripts des " +#~ "responsables des paquets !) est fortement déconseillée. En outre, le " +#~ "format de sortie de toutes les commandes est indéfini et de plus il peut " +#~ "changer, et il change réellement chaque fois que les commandes sous-" +#~ "jacentes changent. <command>apt-key</command> essaiera de détecter un tel " +#~ "usage et, dans ces cas, enverra des alertes sur l'erreur standard." + #~ msgid "" #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP " #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:" diff --git a/doc/po/it.po b/doc/po/it.po index ca6e8e62b162f729e34bfc61cc925caab1e5d73f..b7c42d690ea4f7ad657040073cbfdcc6e7005b59 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-02-26 21:29+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2017-03-27 19:05+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -778,8 +778,8 @@ msgstr "," msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" "Effettua l'azione richiesta su uno o più pacchetti specificati attraverso " "®ex;, &glob; o una corrispondenza esatta. L'azione richiesta può essere " @@ -1993,6 +1993,16 @@ msgstr "" "risponde «no». Voce di configurazione: <literal>APT::Get::Trivial-Only</" "literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2846,7 +2856,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "strumento APT per la gestione delle chiavi" #. type: Content of: <refentry><refsect1><para> @@ -2863,23 +2875,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." -msgstr "" -"Notare che si desidera usare <command>apt-key</command> è necessaria " -"l'installazione aggiuntiva della suite GNU Privacy Guard (pacchettizzata in " -"<package>gnupg</package>). Espressamente per questo motivo l'uso " -"programmatico (specialmente in script del manutentore per i pacchetti!) è " -"fortemente sconsigliato. Inoltre il formato di output di tutti i comandi non " -"è definito e può cambiare, e lo fa, ogni volta che cambiano i comandi " -"sottostanti. <command>apt-key</command> cerca di rilevare questi usi e " -"genera in questi casi avvertimenti sullo stderr." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." +msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2920,6 +2926,11 @@ msgstr "" msgid "Commands" msgstr "Comandi" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "(deprecato)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2956,6 +2967,13 @@ msgstr "" "etc/apt/trusted.gpg.d/</filename> con un nome descrittivo e con " "«<literal>gpg</literal>» o «<literal>asc</literal>» come estensione di file." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +#, fuzzy +#| msgid "(deprecated)" +msgid "(mostly deprecated)" +msgstr "(deprecato)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2991,11 +3009,6 @@ msgstr "" "effettuato alcun controllo, perciò è facile minare completamente " "l'infrastruttura &apt-secure; se viene usato senza cautela." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "(deprecato)" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -13112,6 +13125,25 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n" msgid "Which will use the already fetched archives on the disc." msgstr "che userà gli archivi già scaricati e presenti sul disco." +#~ msgid "" +#~ "Note that if usage of <command>apt-key</command> is desired the " +#~ "additional installation of the GNU Privacy Guard suite (packaged in " +#~ "<package>gnupg</package>) is required. For this reason alone the " +#~ "programmatic usage (especially in package maintainer scripts!) is " +#~ "strongly discouraged. Further more the output format of all commands is " +#~ "undefined and can and does change whenever the underlying commands " +#~ "change. <command>apt-key</command> will try to detect such usage and " +#~ "generates warnings on stderr in these cases." +#~ msgstr "" +#~ "Notare che si desidera usare <command>apt-key</command> è necessaria " +#~ "l'installazione aggiuntiva della suite GNU Privacy Guard (pacchettizzata " +#~ "in <package>gnupg</package>). Espressamente per questo motivo l'uso " +#~ "programmatico (specialmente in script del manutentore per i pacchetti!) è " +#~ "fortemente sconsigliato. Inoltre il formato di output di tutti i comandi " +#~ "non è definito e può cambiare, e lo fa, ogni volta che cambiano i comandi " +#~ "sottostanti. <command>apt-key</command> cerca di rilevare questi usi e " +#~ "genera in questi casi avvertimenti sullo stderr." + #~ msgid "" #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP " #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:" diff --git a/doc/po/ja.po b/doc/po/ja.po index b760afc6bd4583f557020606159ba7421b6c3f63..576f872c945cb82aaecb94a80b35445171b0b95e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-02-26 21:29+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -774,8 +774,8 @@ msgstr "," msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" "®ex;、&glob; または 完全な一致で指定された 1 つ以上のパッケージに対して要" "求された処理を実行します。要求された処理は、特定のパッケージに対してパッケー" @@ -1929,6 +1929,16 @@ msgstr "" "と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項" "目: <literal>APT::Get::Trivial-Only</literal>" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2745,7 +2755,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "APT キー管理ユーティリティ" #. type: Content of: <refentry><refsect1><para> @@ -2762,22 +2774,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." -msgstr "" -"<command>apt-key</command> を利用するためには GNU Privacy Guard suite " -"(<package>gnupg</package> に収録) を追加でインストールする必要があることに注" -"意してください。そのため、プログラム単体での用途に (特にパッケージのメンテナ" -"スクリプトで!) 使うことは全く勧められません。さらに、このプログラムのコマンド" -"の出力形式はどれも規定されておらず、根本となるコマンドに変更があればこちらも" -"変わるということになります。<command>apt-key</command> はそういった使い方の検" -"出を試み、その場合には標準エラーに警告を出します。" +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." +msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2818,6 +2825,11 @@ msgstr "" msgid "Commands" msgstr "コマンド" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "(非推奨)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2854,6 +2866,13 @@ msgstr "" "literal>」として <filename>/etc/apt/trusted.gpg.d/</filename> ディレクトリに" "直接配置する方法もあります。" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +#, fuzzy +#| msgid "(deprecated)" +msgid "(mostly deprecated)" +msgstr "(非推奨)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2894,11 +2913,6 @@ msgstr "" "できます。チェックが<emphasis>行われない</emphasis>ことに注意してください。注" "意せず使用するなら、容易に &apt-secure; インフラを完全に傷つけます。" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "(非推奨)" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -12605,6 +12619,24 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n" msgid "Which will use the already fetched archives on the disc." msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。" +#~ msgid "" +#~ "Note that if usage of <command>apt-key</command> is desired the " +#~ "additional installation of the GNU Privacy Guard suite (packaged in " +#~ "<package>gnupg</package>) is required. For this reason alone the " +#~ "programmatic usage (especially in package maintainer scripts!) is " +#~ "strongly discouraged. Further more the output format of all commands is " +#~ "undefined and can and does change whenever the underlying commands " +#~ "change. <command>apt-key</command> will try to detect such usage and " +#~ "generates warnings on stderr in these cases." +#~ msgstr "" +#~ "<command>apt-key</command> を利用するためには GNU Privacy Guard suite " +#~ "(<package>gnupg</package> に収録) を追加でインストールする必要があることに" +#~ "注意してください。そのため、プログラム単体での用途に (特にパッケージのメン" +#~ "テナスクリプトで!) 使うことは全く勧められません。さらに、このプログラムの" +#~ "コマンドの出力形式はどれも規定されておらず、根本となるコマンドに変更があれ" +#~ "ばこちらも変わるということになります。<command>apt-key</command> はそう" +#~ "いった使い方の検出を試み、その場合には標準エラーに警告を出します。" + #~ msgid "" #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP " #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:" diff --git a/doc/po/nl.po b/doc/po/nl.po index 53145ebae22d4d2f066d79665ebe4d4657445466..e555bbb706ebf2060ea340a351f121904da34669 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 2.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-24 21:07+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2020-05-24 16:39+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -2037,6 +2037,16 @@ msgstr "" "option> op elke vraag ja antwoordt, zal <option>--trivial-only</option> nee " "antwoorden. Configuratie-item: <literal>APT::Get::Trivial-Only</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2913,7 +2923,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "Hulpprogramma voor het beheer van de sleutels van APT" #. type: Content of: <refentry><refsect1><para> @@ -2931,24 +2943,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." -msgstr "" -"Merk op dat als het gebruik van het commando <command>apt-key</command> " -"gewenst is, dan ook de installatie van de GNU Privacy Guard suite (verpakt " -"in het pakket <package>gnupg</package>) vereist is. Enkel omwille daarvan al " -"wordt het gebruik ervan in programma's (zeker in scripts voor " -"pakketonderhoud) sterk afgeraden. Daarenboven wordt de indeling van de " -"uitvoer van alle commando's onvoorspelbaar en kan die wijzigen telkens " -"wanneer de achterliggende commando's wijzigen. <command>apt-key</command> " -"zal een dergelijk gebruik trachten te detecteren en geeft in dergelijke " -"gevallen waarschuwingen op de standaard foutuitvoer." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." +msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2991,6 +2996,11 @@ msgstr "" msgid "Commands" msgstr "Commando's" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "(verouderd)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -3029,6 +3039,13 @@ msgstr "" "filename> moeten plaatsen met een descriptieve naam en ofwel \"<literal>gpg</" "literal>\" of \"<literal>asc</literal>\" als bestandsextensie." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +#, fuzzy +#| msgid "(deprecated)" +msgid "(mostly deprecated)" +msgstr "(verouderd)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -3064,11 +3081,6 @@ msgstr "" "secure;-infrastructuur volledig ondermijnen als het onzorgvuldig gebruikt " "wordt." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "(verouderd)" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -13654,3 +13666,24 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n" msgid "Which will use the already fetched archives on the disc." msgstr "" "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf." + +#~ msgid "" +#~ "Note that if usage of <command>apt-key</command> is desired the " +#~ "additional installation of the GNU Privacy Guard suite (packaged in " +#~ "<package>gnupg</package>) is required. For this reason alone the " +#~ "programmatic usage (especially in package maintainer scripts!) is " +#~ "strongly discouraged. Further more the output format of all commands is " +#~ "undefined and can and does change whenever the underlying commands " +#~ "change. <command>apt-key</command> will try to detect such usage and " +#~ "generates warnings on stderr in these cases." +#~ msgstr "" +#~ "Merk op dat als het gebruik van het commando <command>apt-key</command> " +#~ "gewenst is, dan ook de installatie van de GNU Privacy Guard suite " +#~ "(verpakt in het pakket <package>gnupg</package>) vereist is. Enkel " +#~ "omwille daarvan al wordt het gebruik ervan in programma's (zeker in " +#~ "scripts voor pakketonderhoud) sterk afgeraden. Daarenboven wordt de " +#~ "indeling van de uitvoer van alle commando's onvoorspelbaar en kan die " +#~ "wijzigen telkens wanneer de achterliggende commando's wijzigen. " +#~ "<command>apt-key</command> zal een dergelijk gebruik trachten te " +#~ "detecteren en geeft in dergelijke gevallen waarschuwingen op de standaard " +#~ "foutuitvoer." diff --git a/doc/po/pl.po b/doc/po/pl.po index 478fa8b3c1d0482b59b55a5f869c5e0c26067de1..d4045f1cbb7e1a92b25c87c703ef1831372aac9f 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-02-26 21:29+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -750,8 +750,8 @@ msgstr "" msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" # @@ -2028,6 +2028,16 @@ msgstr "" "option> odpowie \"nie\". Pozycja w pliku konfiguracyjnym: <literal>APT::" "Get::Trivial-Only</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -2933,7 +2943,9 @@ msgstr "" # #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "Narzędzie zarządzanie kluczami APT" #. type: Content of: <refentry><refsect1><para> @@ -2951,14 +2963,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." msgstr "" #. type: Content of: <refentry><refsect1><title> @@ -2990,6 +3004,11 @@ msgstr "" msgid "Commands" msgstr "Polecenia" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -3018,6 +3037,11 @@ msgid "" "\"<literal>asc</literal>\" as file extension." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(mostly deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -3049,11 +3073,6 @@ msgid "" "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 1d30c9b31787309c33890267f191ad14f0295fc0..38de01002f05e654301b8fba4ade59e250852511 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.1.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-06-14 10:17+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2020-06-08 17:06+0000\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <>\n" @@ -1982,6 +1982,16 @@ msgstr "" "option> irá responder 'não'. Item de Configuração: <literal>APT::Get::" "Trivial-Only</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2844,7 +2854,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +#, fuzzy +#| msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "Utilitário de gestão de chaves do APT" #. type: Content of: <refentry><refsect1><para> @@ -2861,23 +2873,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." -msgstr "" -"Note que se a utilização do <command>apt-key</command> for desejada, é " -"necessária a instalação adicional da suite GNU Privacy Guard (empacotada no " -"<package>gnupg</package>). Apenas por esta razão a utilização programática é " -"fortemente desencorajada (especialmente no pacote maintainerscripts!). Mais " -"ainda o formato de saída de todos os comandos não está definido e pode " -"alterar (e altera mesmo) sempre que os comandos subjacentes mudam. O " -"<command>apt-key</command> irá tentar detectar tal utilização e gerar avisos " -"no stderr nestes casos." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." +msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2919,6 +2925,11 @@ msgstr "" msgid "Commands" msgstr "Comandos" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "(descontinuado)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2955,6 +2966,13 @@ msgstr "" "filename> com um nome descritivo e com \"<literal>gpg</literal>\" ou " "\"<literal>asc</literal>\" como extensão de ficheiro." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +#, fuzzy +#| msgid "(deprecated)" +msgid "(mostly deprecated)" +msgstr "(descontinuado)" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2989,11 +3007,6 @@ msgstr "" "são feitas verificações, portanto é fácil enfraquecer completamente a " "infraestrutura &apt-secure; se for usado sem cuidado." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "(descontinuado)" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -13273,6 +13286,25 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n" msgid "Which will use the already fetched archives on the disc." msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." +#~ msgid "" +#~ "Note that if usage of <command>apt-key</command> is desired the " +#~ "additional installation of the GNU Privacy Guard suite (packaged in " +#~ "<package>gnupg</package>) is required. For this reason alone the " +#~ "programmatic usage (especially in package maintainer scripts!) is " +#~ "strongly discouraged. Further more the output format of all commands is " +#~ "undefined and can and does change whenever the underlying commands " +#~ "change. <command>apt-key</command> will try to detect such usage and " +#~ "generates warnings on stderr in these cases." +#~ msgstr "" +#~ "Note que se a utilização do <command>apt-key</command> for desejada, é " +#~ "necessária a instalação adicional da suite GNU Privacy Guard (empacotada " +#~ "no <package>gnupg</package>). Apenas por esta razão a utilização " +#~ "programática é fortemente desencorajada (especialmente no pacote " +#~ "maintainerscripts!). Mais ainda o formato de saída de todos os comandos " +#~ "não está definido e pode alterar (e altera mesmo) sempre que os comandos " +#~ "subjacentes mudam. O <command>apt-key</command> irá tentar detectar tal " +#~ "utilização e gerar avisos no stderr nestes casos." + #~ msgid "" #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP " #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index c9ffe0c2dd154437ccd3fd9cd96fb9a9bbeaf260..33c8ece75842687fa27c458bcde3f621698b8390 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-02-26 21:29+0100\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -570,8 +570,8 @@ msgstr "" msgid "" "Performs the requested action on one or more packages specified via ®ex;, " "&glob; or exact match. The requested action can be overridden for specific " -"packages by appending a plus (+) to the package name to install this package or " -"a minus (-) to remove it." +"packages by appending a plus (+) to the package name to install this package " +"or a minus (-) to remove it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1387,6 +1387,16 @@ msgid "" "answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" +"After successful installation, mark all freshly installed packages as " +"automatically installed, which will cause each of the packages to be removed " +"when no more manually installed packages depend on this package. This is " +"equally to running <command>apt-mark auto</command> for all installed " +"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -1982,7 +1992,7 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml -msgid "APT key management utility" +msgid "Deprecated APT key management utility" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -1996,14 +2006,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml msgid "" -"Note that if usage of <command>apt-key</command> is desired the additional " -"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</" -"package>) is required. For this reason alone the programmatic usage " -"(especially in package maintainer scripts!) is strongly discouraged. " -"Further more the output format of all commands is undefined and can and does " -"change whenever the underlying commands change. <command>apt-key</command> " -"will try to detect such usage and generates warnings on stderr in these " -"cases." +"Use of <command>apt-key</command> is deprecated, except for the use of " +"<command>apt-key del</command> in maintainer scripts to remove existing keys " +"from the main keyring. If such usage of <command>apt-key</command> is " +"desired the additional installation of the GNU Privacy Guard suite (packaged " +"in <package>gnupg</package>) is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml +msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04." msgstr "" #. type: Content of: <refentry><refsect1><title> @@ -2035,6 +2047,11 @@ msgstr "" msgid "Commands" msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" @@ -2060,6 +2077,11 @@ msgid "" "\"<literal>asc</literal>\" as file extension." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml +msgid "(mostly deprecated)" +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "Remove a key from the list of trusted keys." @@ -2089,11 +2111,6 @@ msgid "" "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml -msgid "(deprecated)" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt index 8589484cfe8e5968ef2cf8aacfcfcaa39862a4b8..d575382f772d9514bfdb697e1457609f3b941464 100644 --- a/methods/CMakeLists.txt +++ b/methods/CMakeLists.txt @@ -27,8 +27,8 @@ target_link_libraries(ftp ${GNUTLS_LIBRARIES}) install(TARGETS file copy store gpgv cdrom http ftp rred rsh mirror RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/methods) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https) diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 1ca62557cddfb6c72c0cdf821abda107ed838e3d..5597e7cffdd3a71f3c344a9380a839317671fe8b 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -307,13 +307,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (exactKey == false) { - auto const master = SubKeyMapping.find(l); - if (master == SubKeyMapping.end()) + auto const primary = SubKeyMapping.find(l); + if (primary == SubKeyMapping.end()) continue; - auto const validsubkeysig = std::find_if(master->second.cbegin(), master->second.cend(), [&](auto const subkey) { + auto const validsubkeysig = std::find_if(primary->second.cbegin(), primary->second.cend(), [&](auto const subkey) { return IsTheSameKey(subkey, good) && std::find(Signers.Valid.cbegin(), Signers.Valid.cend(), subkey) != Signers.Valid.cend(); }); - if (validsubkeysig != master->second.cend()) + if (validsubkeysig != primary->second.cend()) { found = true; Signers.SignedBy.push_back(l); diff --git a/methods/http.cc b/methods/http.cc index 1d2c41337bae672acc5c47c5f7e65ed5b71644fb..77348d7608a7cf685e733e3f463fb2adbcaa7610 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -94,6 +94,7 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(std::unique_ptr<MethodFd> const &Fd) { + size_t ReadThisCycle = 0; while (1) { // Woops, buffer is full @@ -131,7 +132,7 @@ bool CircleBuf::Read(std::unique_ptr<MethodFd> const &Fd) CircleBuf::BwTickReadData += Res; if (Res == 0) - return false; + return ReadThisCycle != 0; if (Res < 0) { if (errno == EAGAIN) @@ -140,6 +141,7 @@ bool CircleBuf::Read(std::unique_ptr<MethodFd> const &Fd) } InP += Res; + ReadThisCycle += Res; } } /*}}}*/ @@ -204,8 +206,6 @@ bool CircleBuf::Write(std::unique_ptr<MethodFd> const &Fd) ssize_t Res; Res = Fd->Write(Buf + (OutP % Size), LeftWrite()); - if (Res == 0) - return false; if (Res < 0) { if (errno == EAGAIN) @@ -215,7 +215,7 @@ bool CircleBuf::Write(std::unique_ptr<MethodFd> const &Fd) } TotalWriten += Res; - + if (Hash != NULL) Hash->Add(Buf + (OutP%Size),Res); @@ -700,26 +700,18 @@ ResultState HttpServerState::Die(RequestState &Req) { unsigned int LErrno = errno; + Close(); + // Dump the buffer to the file if (Req.State == RequestState::Data) { - if (Req.File.IsOpen() == false) - return ResultState::SUCCESSFUL; // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking // can't be set if (Req.File.Name() != "/dev/null") SetNonBlock(Req.File.Fd(),false); - while (In.WriteSpace() == true) - { - if (In.Write(MethodFd::FromFd(Req.File.Fd())) == false) - { - _error->Errno("write", _("Error writing to the file")); - return ResultState::TRANSIENT_ERROR; - } - - // Done - if (In.IsLimit() == true) - return ResultState::SUCCESSFUL; + if (In.WriteSpace()) { + _error->Error(_("Data left in buffer")); + return ResultState::TRANSIENT_ERROR; } } @@ -727,7 +719,6 @@ ResultState HttpServerState::Die(RequestState &Req) if (In.IsLimit() == false && Req.State != RequestState::Header && Persistent == true) { - Close(); if (LErrno == 0) { _error->Error(_("Error reading from server. Remote end closed connection")); @@ -746,7 +737,6 @@ ResultState HttpServerState::Die(RequestState &Req) return ResultState::TRANSIENT_ERROR; // We may have got multiple responses back in one packet.. - Close(); return ResultState::SUCCESSFUL; } @@ -793,13 +783,11 @@ ResultState HttpServerState::Go(bool ToFile, RequestState &Req) ToFile == false)) return ResultState::TRANSIENT_ERROR; - // Handle server IO - if (ServerFd->HasPending() && In.ReadSpace() == true) - { - errno = 0; - if (In.Read(ServerFd) == false) - return Die(Req); - } + // Record if we have data pending to read in the server, so that we can + // skip the wait in select(). This can happen if data has already been + // read into a methodfd's buffer - the TCP queue might be empty at that + // point. + bool ServerPending = ServerFd->HasPending(); fd_set rfds,wfds; FD_ZERO(&rfds); @@ -831,7 +819,7 @@ ResultState HttpServerState::Go(bool ToFile, RequestState &Req) // Select struct timeval tv; - tv.tv_sec = TimeOut; + tv.tv_sec = ServerPending ? 0 : TimeOut; tv.tv_usec = 0; int Res = 0; if ((Res = select(MaxFd+1,&rfds,&wfds,0,&tv)) < 0) @@ -842,29 +830,23 @@ ResultState HttpServerState::Go(bool ToFile, RequestState &Req) return ResultState::TRANSIENT_ERROR; } - if (Res == 0) + if (Res == 0 && not ServerPending) { _error->Error(_("Connection timed out")); - return Die(Req); + return ResultState::TRANSIENT_ERROR; } // Handle server IO - if (ServerFd->Fd() != -1 && FD_ISSET(ServerFd->Fd(), &rfds)) + if (ServerPending || (ServerFd->Fd() != -1 && FD_ISSET(ServerFd->Fd(), &rfds))) { errno = 0; if (In.Read(ServerFd) == false) return Die(Req); } - if (ServerFd->Fd() != -1 && FD_ISSET(ServerFd->Fd(), &wfds)) - { - errno = 0; - if (Out.Write(ServerFd) == false) - return Die(Req); - } - // Send data to the file - if (FileFD->Fd() != -1 && FD_ISSET(FileFD->Fd(), &wfds)) + if (FileFD->Fd() != -1 && ((In.WriteSpace() == true && ToFile == true) || + FD_ISSET(FileFD->Fd(), &wfds))) { if (In.Write(FileFD) == false) { @@ -873,6 +855,13 @@ ResultState HttpServerState::Go(bool ToFile, RequestState &Req) } } + if (ServerFd->Fd() != -1 && FD_ISSET(ServerFd->Fd(), &wfds)) + { + errno = 0; + if (Out.Write(ServerFd) == false) + return Die(Req); + } + if (Req.MaximumSize > 0 && Req.File.IsOpen() && Req.File.Failed() == false && Req.File.Tell() > Req.MaximumSize) { Owner->SetFailReason("MaximumSizeExceeded"); diff --git a/po/apt-all.pot b/po/apt-all.pot index 395e52cee1c9ec396af148433539ea7836e36b6a..30919a0a0792df178f451b5f136129d6645c30e0 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.1.7\n" +"Project-Id-Version: apt 2.1.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-07-08 09:40+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\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" @@ -3545,7 +3545,7 @@ msgid "" msgstr "" #: methods/http.cc -msgid "Error writing to the file" +msgid "Data left in buffer" msgstr "" #: methods/http.cc diff --git a/po/ar.po b/po/ar.po index 5bd17b77b8d85e3ea7b4d6c50391557f78d7cb02..4ec32e10053902326fc7871d710b02d04be60909 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -3616,8 +3616,8 @@ msgid "" msgstr "" #: methods/http.cc -msgid "Error writing to the file" -msgstr "خطأ في الكتابة إلى الملف" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3655,6 +3655,9 @@ msgstr "" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "خطأ في الكتابة إلى الملف" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "توقيع الأرشيف غير صالح" diff --git a/po/ast.po b/po/ast.po index ec6fe1940b8227a0ae02b7d96713ad553038da8f..306373821790f0240ed02b3d0377eb55e8f0f24f 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (ast)\n" @@ -3793,8 +3793,8 @@ msgstr "" "ta a mano:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Fallu al escribir nel ficheru" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3832,6 +3832,9 @@ msgstr "Conexón encaboxada prematuramente" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Fallu al escribir nel ficheru" + #~ msgid "Invalid archive member header %s" #~ msgstr "Testera de miembru del archivu %s inválida" diff --git a/po/bg.po b/po/bg.po index b230bd70a02cb8e436dda67eef8f1f7275346043..e6b4d296c98b949f25999da2fe13220ff0db97cd 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -3849,8 +3849,8 @@ msgstr "" "наличен:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Грешка при записа на файла" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3888,6 +3888,9 @@ msgstr "Връзката прекъсна преждевременно" msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" +#~ msgid "Error writing to the file" +#~ msgstr "Грешка при записа на файла" + #~ msgid "Invalid archive member header %s" #~ msgstr "Невалидна заглавна част %s на елемента на архива" diff --git a/po/bs.po b/po/bs.po index 2830d0c634d7cc1fc4c802b9880ba7b2732879b0..d09b6afb1549a13df1db67cd840814152d64807d 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -3600,7 +3600,7 @@ msgid "" msgstr "" #: methods/http.cc -msgid "Error writing to the file" +msgid "Data left in buffer" msgstr "" #: methods/http.cc diff --git a/po/ca.po b/po/ca.po index e2b08c70d420dbfab3e54df8c5817b593e01905a..26bd5294b9c4c46904d47d631b3c1c1fc1d10308 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2016-12-05 21:09+0100\n" "Last-Translator: Oriol Debian <oriol.debian@gmail.com>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -3938,8 +3938,8 @@ msgstr "" "està disponible:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "S'ha produït un error en escriure al fitxer" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3978,6 +3978,9 @@ msgstr "La connexió s'ha tancat prematurament" msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" +#~ msgid "Error writing to the file" +#~ msgstr "S'ha produït un error en escriure al fitxer" + #~ msgid "Invalid archive member header %s" #~ msgstr "La capçalera %s del membre de l'arxiu no és vàlida" diff --git a/po/cs.po b/po/cs.po index bf89e12a439f480d71f07a333bb4b01428a0c655..33045f8916ff1ac676cf83fc8de4403091edbec2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2017-05-06 11:08+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -3836,8 +3836,8 @@ msgstr "" "klíč:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Chyba zápisu do souboru" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3875,6 +3875,9 @@ msgstr "Spojení bylo předčasně ukončeno" msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" +#~ msgid "Error writing to the file" +#~ msgstr "Chyba zápisu do souboru" + #~ msgid "Invalid archive member header %s" #~ msgstr "Neplatné záhlaví prvku archivu %s" diff --git a/po/cy.po b/po/cy.po index 181482d033e6b7c1f67c9e98b27015f87c58cd1f..f046fa38275ce3607209b3677762a5829162e455 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -3814,8 +3814,8 @@ msgid "" msgstr "" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Gwall wrth ysgrifennu at y ffeil" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc #, fuzzy @@ -3854,6 +3854,9 @@ msgstr "Caewyd y cysylltiad yn gynnar" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Gwall wrth ysgrifennu at y ffeil" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Pennawd aelod archif annilys" diff --git a/po/da.po b/po/da.po index c34248cbda62b1cc202dd35c7d5d24bd79ca2d93..140501713517bd99ca2954a35ee7e0c966c5b035 100644 --- a/po/da.po +++ b/po/da.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2017-03-02 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -3875,8 +3875,8 @@ msgstr "" "tilgængelig:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Fejl ved skrivning til filen" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3914,6 +3914,9 @@ msgstr "Forbindelsen lukkedes for hurtigt" msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" +#~ msgid "Error writing to the file" +#~ msgstr "Fejl ved skrivning til filen" + #~ msgid "Invalid archive member header %s" #~ msgstr "Ugyldigt arkivelementhoved %s" diff --git a/po/de.po b/po/de.po index 6ee3c3e49c838dcb368d7fb4e48c515604a87d76..68df05188c50d429e42b816c899c3f922b7492d4 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2018-01-11 21:11+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -4022,8 +4022,8 @@ msgstr "" "Schlüssel nicht verfügbar ist:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Fehler beim Schreiben der Datei" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -4063,6 +4063,9 @@ msgstr "Verbindung vorzeitig beendet" msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." +#~ msgid "Error writing to the file" +#~ msgstr "Fehler beim Schreiben der Datei" + #~ msgid "Invalid archive member header %s" #~ msgstr "Ungültige Archivbestandteil-Kopfzeile %s" diff --git a/po/dz.po b/po/dz.po index d3975f07a9c1e5d8b8b53be5922847a5bc806626..38cff875be44aac2e02d861f425ab5815fcd688f 100644 --- a/po/dz.po +++ b/po/dz.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -3760,8 +3760,8 @@ msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3799,6 +3799,9 @@ msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལ msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" diff --git a/po/el.po b/po/el.po index b5fc40c97e52788e9bacb9c2733c3fd2d1142769..bde8818c94b43afd482d5a297a7e373ea723fc5c 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -3788,8 +3788,8 @@ msgstr "" "διαθέσιμο το δημόσιο κλειδί:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Σφάλμα στην εγγραφή στο αρχείο" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3828,6 +3828,9 @@ msgstr "Η σύνδεση έκλεισε πρόωρα" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Σφάλμα στην εγγραφή στο αρχείο" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" diff --git a/po/es.po b/po/es.po index b4ea163dab58c5abcda99ff2c411cced165fa10c..f817ac2e9ffa9a57dde1afffc23924f06d2e29f0 100644 --- a/po/es.po +++ b/po/es.po @@ -34,7 +34,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox." "org>\n" @@ -4001,8 +4001,8 @@ msgstr "" "está disponible:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Error escribiendo al archivo" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -4040,6 +4040,9 @@ msgstr "La conexión se cerró prematuramente" msgid "Empty files can't be valid archives" msgstr "Los ficheros vacíos no pueden ser archivos válidos" +#~ msgid "Error writing to the file" +#~ msgstr "Error escribiendo al archivo" + #~ msgid "Invalid archive member header %s" #~ msgstr "Cabecera de miembro del archivo inválida %s" diff --git a/po/eu.po b/po/eu.po index 5e67d30120b5b2a75b29bfc09d7dcf23da0f2a71..48845cac3dd2be4c178cefd7050757dcccb708d4 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -3756,8 +3756,8 @@ msgstr "" "eskuragarri:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Errorea fitxategian idaztean" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3795,6 +3795,9 @@ msgstr "Konexioa behar baino lehenago itxi da" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Errorea fitxategian idaztean" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Artxiboko kidearen goiburua baliogabea da" diff --git a/po/fi.po b/po/fi.po index 8564da7065607d99cb1addbd97657ee178d5fd5d..c5ca58377c6e76b78184460c3592df38ffe1ef8e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -3748,8 +3748,8 @@ msgstr "" "saatavilla:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3787,6 +3787,9 @@ msgstr "Yhteys katkesi ennenaikaisesti" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Arkiston tiedoston otsikko on virheellinen" diff --git a/po/fr.po b/po/fr.po index 9ed7646b4f79a2e2848fb453eb491544308ba185..e1a054a683ec60f1d3a045734bbc88b02fb10225 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2019-01-21 09:19+0100\n" "Last-Translator: Julien Patriarca <leatherface@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -4022,8 +4022,8 @@ msgstr "" "n'est pas disponible :\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Erreur d'écriture sur le fichier" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -4061,6 +4061,9 @@ msgstr "Connexion fermée prématurément" msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" +#~ msgid "Error writing to the file" +#~ msgstr "Erreur d'écriture sur le fichier" + #~ msgid "Invalid archive member header %s" #~ msgstr "En-tête du membre d'archive %s non valable" diff --git a/po/gl.po b/po/gl.po index 456b5416881a70f87e38d8e99ae8c826c584ad84..fbf157db5e06ad760bae9805fe4b5873e45115b5 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -3829,8 +3829,8 @@ msgstr "" "está dispoñíbel:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Produciuse un erro ao escribir no ficheiro" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3869,6 +3869,9 @@ msgstr "A conexión pechouse prematuramente" msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" +#~ msgid "Error writing to the file" +#~ msgstr "Produciuse un erro ao escribir no ficheiro" + #~ msgid "Invalid archive member header %s" #~ msgstr "Cabeceira do membro do arquivo incorrecta %s" diff --git a/po/hu.po b/po/hu.po index 15ac9238db1eec2686cf27ecc1dc85dce3033fb9..a0de3407c80083c6658f54c920351867cd18b319 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n" "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n" @@ -3899,8 +3899,8 @@ msgstr "" "el:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Hiba a fájl írásakor" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3938,6 +3938,9 @@ msgstr "A kapcsolat idő előtt lezárult" msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" +#~ msgid "Error writing to the file" +#~ msgstr "Hiba a fájl írásakor" + #~ msgid "Invalid archive member header %s" #~ msgstr "Érvénytelen archívumtag-fejléc: %s" diff --git a/po/it.po b/po/it.po index 09c7d8943e6b4e053edc472851248bc87aa2fbc0..efa70d804c0a81a2b824307fb13fe5a3d86362d6 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2019-03-04 11:05+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -3966,8 +3966,8 @@ msgstr "" "disponibile:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Errore nello scrivere sul file" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -4005,6 +4005,9 @@ msgstr "Connessione chiusa prematuramente" msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" +#~ msgid "Error writing to the file" +#~ msgstr "Errore nello scrivere sul file" + #~ msgid "Invalid archive member header %s" #~ msgstr "Intestazione membro dell'archivio %s non valida" diff --git a/po/ja.po b/po/ja.po index ad828d51a231809e8e0bf3c8510f6d85840bf000..5bb356200d9ae37cba866278671106f4e3cc33b4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -3883,8 +3883,8 @@ msgid "" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "ファイルへの書き込みでエラーが発生しました" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3922,6 +3922,9 @@ msgstr "途中で接続がクローズされました" msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" +#~ msgid "Error writing to the file" +#~ msgstr "ファイルへの書き込みでエラーが発生しました" + #~ msgid "Invalid archive member header %s" #~ msgstr "不正なアーカイブメンバーヘッダ %s" diff --git a/po/km.po b/po/km.po index 984fd2f3f3e8794498a16286295286a306d0ade5..869a327b38009a8871043fe5ef097494d556d261 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -3732,8 +3732,8 @@ msgid "" msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3771,6 +3771,9 @@ msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" diff --git a/po/ko.po b/po/ko.po index db36b606617f6838d7704a3fc73e0e5fcb639755..0b6b90e74e90cd8ce7ed7dbe30c04a059aca4c4b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -3752,8 +3752,8 @@ msgid "" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "해당 파일에 쓰는데 오류가 발생했습니다" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3791,6 +3791,9 @@ msgstr "연결이 너무 빨리 끊어졌습니다" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "해당 파일에 쓰는데 오류가 발생했습니다" + #~ msgid "Invalid archive member header %s" #~ msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다" diff --git a/po/ku.po b/po/ku.po index 754fde815d677504950f784e891c4f0b77170cea..00c615710d8b1e8d21e2a7e4f69c8d07a119cbcd 100644 --- a/po/ku.po +++ b/po/ku.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -3617,8 +3617,8 @@ msgid "" msgstr "" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Dema li pelî dihate nivîsîn çewtî" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3657,6 +3657,9 @@ msgstr "Girêdan zû hatiye girtin" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Dema li pelî dihate nivîsîn çewtî" + #~ msgid "The path %s is too long" #~ msgstr "Rêça %s zêde dirêj e" diff --git a/po/lt.po b/po/lt.po index aac0e54c2d23ad3c53f48c3102421d3c9127b256..87a80d0fdb646f3da72b7e9a58f244ffca0ccaf4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -3722,7 +3722,7 @@ msgid "" msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n" #: methods/http.cc -msgid "Error writing to the file" +msgid "Data left in buffer" msgstr "" #: methods/http.cc diff --git a/po/mr.po b/po/mr.po index 13e0eecd098b3eaa2971315100e4f06277725f2f..7a7ec053eeaae8090f8fec71e796c21380d1f4ac 100644 --- a/po/mr.po +++ b/po/mr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -3731,8 +3731,8 @@ msgid "" msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3770,6 +3770,9 @@ msgstr "जोडणी अकाली बंद झाली" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" diff --git a/po/nb.po b/po/nb.po index 6c438cc4b6230c106eae7ff23192696fbb14d496..d14cd6c8d3d506ab8ff96060fd95d46e7a308f15 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2018-10-30 20:53+0100\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n" @@ -3820,8 +3820,8 @@ msgstr "" "ikke er tilgjengelig:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Feil ved skriving til fila" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3859,6 +3859,9 @@ msgstr "Forbindelsen ble uventet stengt" msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" +#~ msgid "Error writing to the file" +#~ msgstr "Feil ved skriving til fila" + #~ msgid "Invalid archive member header %s" #~ msgstr "Ugyldig arkivmedlemshode %s" diff --git a/po/ne.po b/po/ne.po index fd37ff259cabac08e0f1163357e56e13b10d1ba3..8d6c5c2b543ced8e16cb85e13bc33d3a435b960d 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -3731,8 +3731,8 @@ msgid "" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "फाइलमा त्रुटि लेखिदैछ" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3770,6 +3770,9 @@ msgstr "जडान असमायिक बन्द भयो" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "फाइलमा त्रुटि लेखिदैछ" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "अवैध संग्रह सदस्य हेडर" diff --git a/po/nl.po b/po/nl.po index a5a2d7f1d6d73f4dec42c935d4fe9a75762b34a8..2d0a8fa24e5b873b9e2de64d4f08d5823fc1fdc4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2020-05-24 14:43+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -3948,8 +3948,8 @@ msgstr "" "publieke sleutel niet beschikbaar is:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Fout bij het schrijven naar het bestand" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3987,3 +3987,6 @@ msgstr "Verbinding werd voortijdig afgebroken" #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Lege bestanden kunnen geen geldige archieven zijn" + +#~ msgid "Error writing to the file" +#~ msgstr "Fout bij het schrijven naar het bestand" diff --git a/po/nn.po b/po/nn.po index 52b184f5a5bd9551fee3ab677436d235cb5f18b8..46d342cb66eb67901828e623cb649ea591a2c55b 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -3745,8 +3745,8 @@ msgid "" msgstr "" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Feil ved skriving til fila" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3784,6 +3784,9 @@ msgstr "Sambandet vart uventa stengd" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Feil ved skriving til fila" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Ugyldig arkivmedlemshovud" diff --git a/po/pl.po b/po/pl.po index 061b79ac83083554f2281be31a1c8ec8b3ee74b1..f0135b0bb0886d6b47c7488ac50e8d761a494f68 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -3877,8 +3877,8 @@ msgstr "" "publicznego:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Błąd przy pisaniu do pliku" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3916,6 +3916,9 @@ msgstr "Połączenie zostało przedwcześnie zamknięte" msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" +#~ msgid "Error writing to the file" +#~ msgstr "Błąd przy pisaniu do pliku" + #~ msgid "Invalid archive member header %s" #~ msgstr "Nieprawidłowy nagłówek składnika archiwum: %s" diff --git a/po/pt.po b/po/pt.po index b91f6584854ff06aacf4cb6b11d005f6146c8dbe..b4e87de5f97d7e5dc1150ff8c298fea9c445967c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -3853,8 +3853,8 @@ msgstr "" "não está disponível:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Erro ao escrever para o ficheiro" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3892,6 +3892,9 @@ msgstr "Ligação encerrada prematuramente" msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" +#~ msgid "Error writing to the file" +#~ msgstr "Erro ao escrever para o ficheiro" + #~ msgid "Invalid archive member header %s" #~ msgstr "Cabeçalho membro de arquivo inválido %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index c8c43278b64eb7dd0a6132dd65367f4cb0635288..5073264246a4b7d7ddd1505bca7c217370b6d6ff 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -3775,8 +3775,8 @@ msgstr "" "não estar disponível:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Erro escrevendo para o arquivo" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3814,6 +3814,9 @@ msgstr "Conexão encerrada prematuramente" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Erro escrevendo para o arquivo" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Cabeçalho membro de arquivo inválido" diff --git a/po/ro.po b/po/ro.po index db2adc32c3baa2f69b1da5dbb121f2a36affc351..58efb36b0800432cb82576d6b1fac41f57607b03 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -3785,8 +3785,8 @@ msgstr "" "este disponibilă:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Eroare la scrierea în fișierul" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3825,6 +3825,9 @@ msgstr "Conexiune închisă prematur" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Eroare la scrierea în fișierul" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Antet de membru de arhivă necorespunzător" diff --git a/po/ru.po b/po/ru.po index 1f03ffc5533522ba086b07e2e92bab099125da88..9bfe7e979c9a1ded77379f4cd883cc916b17e14a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.0.0\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2020-03-09 22:43+0300\n" "Last-Translator: Алексей Шилин <rootlexx@mail.ru>\n" "Language-Team: русский <debian-l10n-russian@lists.debian.org>\n" @@ -3938,8 +3938,8 @@ msgstr "" "ключ:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Ошибка записи в файл" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3977,6 +3977,9 @@ msgstr "Соединение закрыто преждевременно" msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" +#~ msgid "Error writing to the file" +#~ msgstr "Ошибка записи в файл" + #~ msgid "Invalid archive member header %s" #~ msgstr "Неправильный заголовок элемента архива %s" diff --git a/po/sk.po b/po/sk.po index d03b3cfce92a1e20ef91a064671d648aaf5693ab..966b17c873df1ba1a7f564677a8be83e46e05340 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -3812,8 +3812,8 @@ msgstr "" "kľúč:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Chyba zápisu do tohto súboru" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3851,6 +3851,9 @@ msgstr "Spojenie bolo predčasne ukončené" msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" +#~ msgid "Error writing to the file" +#~ msgstr "Chyba zápisu do tohto súboru" + #~ msgid "Invalid archive member header %s" #~ msgstr "Neplatná hlavička prvku archívu %s" diff --git a/po/sl.po b/po/sl.po index b442d4671975ec0424b8d24001b1112a9e3e0ca5..ff58747e628b867befd90289ddec81ca583f3dea 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -3818,8 +3818,8 @@ msgstr "" "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Napaka med pisanjem v datoteko" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3857,6 +3857,9 @@ msgstr "Povezava se je prezgodaj zaprla" msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" +#~ msgid "Error writing to the file" +#~ msgstr "Napaka med pisanjem v datoteko" + #~ msgid "Invalid archive member header %s" #~ msgstr "Neveljavna glava arhiva člana %s" diff --git a/po/sv.po b/po/sv.po index 29c639997e54ed32ce37a68e03de1355979bf6d3..c2d8f2ad060a21147a55c1267627508fa70d1e74 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -3855,8 +3855,8 @@ msgstr "" "tillgänglig:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Fel vid skrivning till filen" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3894,6 +3894,9 @@ msgstr "Anslutningen stängdes i förtid" msgid "Empty files can't be valid archives" msgstr "Tomma filer kan inte vara giltiga arkiv" +#~ msgid "Error writing to the file" +#~ msgstr "Fel vid skrivning till filen" + #~ msgid "Invalid archive member header %s" #~ msgstr "Ogiltig arkivdelsrubrik %s" diff --git a/po/th.po b/po/th.po index b8a98cebb9bcb2973664e1e7fdef077f1635b7fa..c69a610286472cf367468c2a86a9e627afa2f2c1 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -3736,8 +3736,8 @@ msgid "" msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3775,6 +3775,9 @@ msgstr "การเชื่อมต่อถูกปิดก่อนเว msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" +#~ msgid "Error writing to the file" +#~ msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" + #~ msgid "Invalid archive member header %s" #~ msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" diff --git a/po/tl.po b/po/tl.po index 4d8866d18334dd8435cb6a3127e0730570aee873..9b87c03e851b3df1536a46fc3601631b37061834 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -3768,8 +3768,8 @@ msgstr "" "available:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Error sa pagsusulat sa talaksan" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3807,6 +3807,9 @@ msgstr "Nagsara ng maaga ang koneksyon" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "Error sa pagsusulat sa talaksan" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Hindi tanggap na header ng miyembro ng arkibo" diff --git a/po/tr.po b/po/tr.po index b720e4b7f08d0d581235613a8438241195509931..4a25e04a8718d2794084d45c389a91ad47a5a143 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2018-01-03 16:32+0300\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -3889,8 +3889,8 @@ msgid "" msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Dosyaya yazılamadı" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3928,6 +3928,9 @@ msgstr "Bağlantı vaktinden önce kapandı" msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" +#~ msgid "Error writing to the file" +#~ msgstr "Dosyaya yazılamadı" + #~ msgid "Invalid archive member header %s" #~ msgstr "Geçersiz arşiv üyesi başlığı %s" diff --git a/po/uk.po b/po/uk.po index a3ba2eb05495798eaef86099a2e2be240ffeab4b..6c0eda189977d2f9c0b8828203ac46395297fe29 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -3873,8 +3873,8 @@ msgstr "" "відсутній:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Помилка запису у файл" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3912,6 +3912,9 @@ msgstr "З'єднання завершено передчасно" msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" +#~ msgid "Error writing to the file" +#~ msgstr "Помилка запису у файл" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "Невірний заголовок 'member' %s в архіві" diff --git a/po/vi.po b/po/vi.po index 8a2dba72331cc7911644a3ab75fb4d81d4f09b7d..4c7c2528a9d181f12c2ac9668be9fc327ae25e15 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -3846,8 +3846,8 @@ msgstr "" "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "Gặp lỗi khi ghi vào tập tin" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3885,6 +3885,9 @@ msgstr "Kết nối bị đóng bất ngờ" msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" +#~ msgid "Error writing to the file" +#~ msgstr "Gặp lỗi khi ghi vào tập tin" + #~ msgid "Invalid archive member header %s" #~ msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index f8f51062253f97d4adeec9d7fd9264058fd6232d..b4c4e86a805f853508d3470f5bef66ba88d0ef18 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.0.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2020-03-26 17:38-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n" @@ -3718,8 +3718,8 @@ msgid "" msgstr "由于没有公钥，无法验证下列签名：\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "写入文件出错" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3757,6 +3757,9 @@ msgstr "连接被永久关闭" msgid "Empty files can't be valid archives" msgstr "空文件不是有效归档" +#~ msgid "Error writing to the file" +#~ msgstr "写入文件出错" + #~ msgid "Invalid archive member header %s" #~ msgstr "归档文件中成员文件头 %s 无效" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4a8128058a792490f9e8500c452a9bba7cb3aa2b..a487138aa95d70d7d62a6b0d5e58b95455e198ef 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.2.X\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-12 22:50+0200\n" +"POT-Creation-Date: 2020-08-04 12:40+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -3710,8 +3710,8 @@ msgid "" msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n" #: methods/http.cc -msgid "Error writing to the file" -msgstr "在寫入該檔時發生錯誤" +msgid "Data left in buffer" +msgstr "" #: methods/http.cc msgid "Error reading from server. Remote end closed connection" @@ -3749,6 +3749,9 @@ msgstr "連線突然終止" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Error writing to the file" +#~ msgstr "在寫入該檔時發生錯誤" + #, fuzzy #~ msgid "Invalid archive member header %s" #~ msgstr "無效的套件檔成員標頭" diff --git a/test/integration/status-bug-lp1347721-dpkg-ordering b/test/integration/status-bug-lp1347721-dpkg-ordering index 62e545c55ad4eab3fc587668dd05bf7f13781bec..eaea10b2db6764a1a83624f96933a382fc669d55 100644 --- a/test/integration/status-bug-lp1347721-dpkg-ordering +++ b/test/integration/status-bug-lp1347721-dpkg-ordering @@ -684,14 +684,14 @@ Depends: libc6 (>= 2.17), libkmod2, sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16 Breaks: module-init-tools (<< 4) Conffiles: /etc/init/kmod.conf 2686532745c8b71d6d3df91c3a53aef3 - /etc/modprobe.d/blacklist-framebuffer.conf 097e2142ae3e4dd2911eda7844ce0c18 - /etc/modprobe.d/blacklist-rare-network.conf 8fb4b96124e461f53adceba9ca91f09a - /etc/modprobe.d/blacklist.conf bc6754fa320733c6d239a4bb0148ffd7 + /etc/modprobe.d/denylist-framebuffer.conf 097e2142ae3e4dd2911eda7844ce0c18 + /etc/modprobe.d/denylist-rare-network.conf 8fb4b96124e461f53adceba9ca91f09a + /etc/modprobe.d/denylist.conf bc6754fa320733c6d239a4bb0148ffd7 /etc/modprobe.d/iwlwifi.conf f27bc645e93e20c8e532325d190ac8ee - /etc/modprobe.d/blacklist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b + /etc/modprobe.d/denylist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b /etc/modprobe.d/mlx4.conf b2a0bedb7461daeb0138270639581bbf - /etc/modprobe.d/blacklist-firewire.conf 9cc07a17e8e64f9cd35ff59c29debe69 - /etc/modprobe.d/blacklist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1 + /etc/modprobe.d/denylist-firewire.conf 9cc07a17e8e64f9cd35ff59c29debe69 + /etc/modprobe.d/denylist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1 /etc/init.d/kmod e6d43abead3714ceb8aca68dd77e1dad /etc/depmod.d/ubuntu.conf 7c8439ef36b12e5f226b5dbfa20b8c2d Description: tools for managing Linux kernel modules @@ -1884,7 +1884,7 @@ Conffiles: /etc/init/udev-finish.conf 5c953c5b98ccfbb2a02985bfa2f80aed /etc/init/udev.conf 41c0081f3a830e0902aaff76a53edf98 /etc/init/udevmonitor.conf b541dfb5aa4958e9a5336ecaec00ca15 - /etc/modprobe.d/fbdev-blacklist.conf 01cd03c88ce6821c03baf904f7dfcbd0 + /etc/modprobe.d/fbdev-denylist.conf 01cd03c88ce6821c03baf904f7dfcbd0 /etc/udev/rules.d/README 3b6de9f3f911176734c66903b4f8735c obsolete Description: /dev/ and hotplug management daemon udev is a daemon which dynamically creates and removes device nodes from diff --git a/test/integration/status-ubuntu-bug-614993 b/test/integration/status-ubuntu-bug-614993 index 99de51d123202e36c4cc1ed089328e11e0a2a9cf..1e95b51e67f82db3a34320faa21353baaf5b16ea 100644 --- a/test/integration/status-ubuntu-bug-614993 +++ b/test/integration/status-ubuntu-bug-614993 @@ -488,11 +488,11 @@ Depends: libc6 (>= 2.8), upstart-job Breaks: initramfs-tools (<< 0.92bubuntu23) Conffiles: /etc/depmod.d/ubuntu.conf 7c8439ef36b12e5f226b5dbfa20b8c2d - /etc/modprobe.d/blacklist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b - /etc/modprobe.d/blacklist-firewire.conf cb8a4c10a5dddd1d67092198b1ae415f - /etc/modprobe.d/blacklist-framebuffer.conf b46c9509180b5a76145f08be46b1aff5 - /etc/modprobe.d/blacklist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1 - /etc/modprobe.d/blacklist.conf bc6754fa320733c6d239a4bb0148ffd7 + /etc/modprobe.d/denylist-ath_pci.conf d1da9bb08c2b0f56f3be93fd0e37946b + /etc/modprobe.d/denylist-firewire.conf cb8a4c10a5dddd1d67092198b1ae415f + /etc/modprobe.d/denylist-framebuffer.conf b46c9509180b5a76145f08be46b1aff5 + /etc/modprobe.d/denylist-watchdog.conf 55327f9270c8a6257a833c4d127a39e1 + /etc/modprobe.d/denylist.conf bc6754fa320733c6d239a4bb0148ffd7 /etc/init/module-init-tools.conf 48db1b767c3148fd83eba59d12fc9a5e Description: tools for managing Linux kernel modules This package contains a set of programs for loading, inserting, and @@ -4886,7 +4886,7 @@ Version: 2.11.1-0ubuntu7 Replaces: libc0.1, libc0.3, libc6, libc6.1 Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10) Conffiles: - /etc/bindresvport.blacklist 154db0e55fa99051ff1bd99e5b2c0584 + /etc/bindresvport.denylist 154db0e55fa99051ff1bd99e5b2c0584 /etc/ld.so.conf.d/libc.conf d4d833fd095fb7b90e1bb4a547f16de6 /etc/gai.conf 4b3389be7132a6a8805f3df8d0ff00f6 Description: Embedded GNU C Library: Binaries diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 0398a12b6fb244ea2781b0b7f4553354bdb18bfa..f074cd14834ea91a6e602ab63ac038d39991caea 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -960,7 +960,8 @@ int main(int const argc, const char * argv[]) // create socket, bind and listen to it {{{ // ignore SIGPIPE, this can happen on write() if the socket closes connection signal(SIGPIPE, SIG_IGN); - // we don't care for our slaves, so ignore their death + // ignore worker processes exiting, as we don't want to cause them to stay + // around as zombies because we're busy. signal(SIGCHLD, SIG_IGN); int sock = socket(AF_INET6, SOCK_STREAM, 0); @@ -1051,9 +1052,9 @@ int main(int const argc, const char * argv[]) std::clog << "Serving ANY file on port: " << port << std::endl; - int const slaves = _config->FindI("aptwebserver::slaves", SOMAXCONN); - std::cerr << "SLAVES: " << slaves << std::endl; - listen(sock, slaves); + int const workers = _config->FindI("aptwebserver::workers", SOMAXCONN); + std::cerr << "WORKERS: " << workers << std::endl; + listen(sock, workers); /*}}}*/ _config->CndSet("aptwebserver::response-header::Server", "APT webserver");